1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encodings: Also check FT_STRINGZ

Browse Source
This commit is contained in:
Martin Mathieson 2025-06-21 09:52:01 +01:00
parent f24a3af301
commit 811b934391
23 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/file-btsnoop.c
View File

@ -117,7 +117,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
header_item = proto_tree_add_item(main_tree, hf_btsnoop_header, tvb, offset, sizeof(magic) + 4 + 4, ENC_NA); header_item = proto_tree_add_item(main_tree, hf_btsnoop_header, tvb, offset, sizeof(magic) + 4 + 4, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_btsnoop_header); header_tree = proto_item_add_subtree(header_item, ett_btsnoop_header);
proto_tree_add_item(header_tree, hf_btsnoop_magic_bytes, tvb, offset, sizeof(magic), ENC_ASCII | ENC_NA); proto_tree_add_item(header_tree, hf_btsnoop_magic_bytes, tvb, offset, sizeof(magic), ENC_ASCII);
offset += (int)sizeof(magic); offset += (int)sizeof(magic);
proto_tree_add_item(header_tree, hf_btsnoop_version, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(header_tree, hf_btsnoop_version, tvb, offset, 4, ENC_BIG_ENDIAN);

2
epan/dissectors/file-elf.c
View File

@ -1689,7 +1689,7 @@ dissect_elf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
i = 1; i = 1;
while (next_offset < (int) (segment_offset + segment_size)) { while (next_offset < (int) (segment_offset + segment_size)) {
len = tvb_strsize(tvb, next_offset); len = tvb_strsize(tvb, next_offset);
entry_item = proto_tree_add_item(segment_tree, hf_elf_string, tvb, next_offset, len, ENC_ASCII | ENC_NA); entry_item = proto_tree_add_item(segment_tree, hf_elf_string, tvb, next_offset, len, ENC_ASCII);
proto_item_append_text(entry_item, " (Number: %u, Index: %u, Length: %u)", (unsigned) i, (unsigned) (next_offset - segment_offset), len - 1); proto_item_append_text(entry_item, " (Number: %u, Index: %u, Length: %u)", (unsigned) i, (unsigned) (next_offset - segment_offset), len - 1);
next_offset += len; next_offset += len;
i += 1; i += 1;

12
epan/dissectors/packet-asphodel.c
View File

@ -455,7 +455,7 @@ dissect_asphodel_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
offset = 9; offset = 9;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_serial_number, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_serial_number, tvb, offset, len, ENC_UTF_8);
serial_number = tvb_get_string_enc(pinfo->pool, tvb, offset, len, ENC_UTF_8); serial_number = tvb_get_string_enc(pinfo->pool, tvb, offset, len, ENC_UTF_8);
col_add_fstr(pinfo->cinfo, COL_INFO, "Asphodel Response (%s)", serial_number); col_add_fstr(pinfo->cinfo, COL_INFO, "Asphodel Response (%s)", serial_number);
offset += len; offset += len;
@ -464,23 +464,23 @@ dissect_asphodel_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
offset += 1; offset += 1;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_board_type, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_board_type, tvb, offset, len, ENC_UTF_8);
offset += len; offset += len;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_build_info, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_build_info, tvb, offset, len, ENC_UTF_8);
offset += len; offset += len;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_build_date, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_build_date, tvb, offset, len, ENC_UTF_8);
offset += len; offset += len;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_user_tag1, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_user_tag1, tvb, offset, len, ENC_UTF_8);
offset += len; offset += len;
len = tvb_strsize(tvb, offset); len = tvb_strsize(tvb, offset);
proto_tree_add_item(asphodel_tree, hf_asphodel_user_tag2, tvb, offset, len, ENC_UTF_8 | ENC_NA); proto_tree_add_item(asphodel_tree, hf_asphodel_user_tag2, tvb, offset, len, ENC_UTF_8);
offset += len; offset += len;
if (protocol_type & ASPHODEL_PROTOCOL_TYPE_RADIO) if (protocol_type & ASPHODEL_PROTOCOL_TYPE_RADIO)

2
epan/dissectors/packet-bthci_cmd.c
View File

@ -4215,7 +4215,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
break; break;
case 0x0013: /* Change Local Name */ case 0x0013: /* Change Local Name */
proto_tree_add_item(tree, hf_bthci_cmd_device_name, tvb, offset, 248, ENC_UTF_8 | ENC_NA); proto_tree_add_item(tree, hf_bthci_cmd_device_name, tvb, offset, 248, ENC_UTF_8);
if (!pinfo->fd->visited && bthci_cmd_data) { if (!pinfo->fd->visited && bthci_cmd_data) {
bthci_cmd_data->data.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, 248, ENC_UTF_8); bthci_cmd_data->data.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, 248, ENC_UTF_8);
} }

12
epan/dissectors/packet-cdp.c
View File

@ -827,10 +827,10 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
proto_tree_add_item(tlv_tree, hf_cdp_encrypted_data, tvb, offset + 4, 20, ENC_NA); proto_tree_add_item(tlv_tree, hf_cdp_encrypted_data, tvb, offset + 4, 20, ENC_NA);
proto_tree_add_item(tlv_tree, hf_cdp_seen_sequence, tvb, offset + 24, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_seen_sequence, tvb, offset + 24, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_sequence_number, tvb, offset + 28, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_sequence_number, tvb, offset + 28, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_model_number, tvb, offset + 32, 16, ENC_NA|ENC_ASCII); proto_tree_add_item(tlv_tree, hf_cdp_model_number, tvb, offset + 32, 16, ENC_ASCII);
proto_tree_add_item(tlv_tree, hf_cdp_unknown_pad, tvb, offset + 48, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_unknown_pad, tvb, offset + 48, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_hardware_version_id, tvb, offset + 50, 3, ENC_NA|ENC_ASCII); proto_tree_add_item(tlv_tree, hf_cdp_hardware_version_id, tvb, offset + 50, 3, ENC_ASCII);
proto_tree_add_item(tlv_tree, hf_cdp_system_serial_number, tvb, offset + 53, 11, ENC_NA|ENC_ASCII); proto_tree_add_item(tlv_tree, hf_cdp_system_serial_number, tvb, offset + 53, 11, ENC_ASCII);
proto_tree_add_item(tlv_tree, hf_cdp_nrgyz_unknown_values, tvb, offset + 64, 8, ENC_NA); proto_tree_add_item(tlv_tree, hf_cdp_nrgyz_unknown_values, tvb, offset + 64, 8, ENC_NA);
proto_tree_add_item(tlv_tree, hf_cdp_len_tlv_table, tvb, offset + 72, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_len_tlv_table, tvb, offset + 72, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_num_tlvs_table, tvb, offset + 74, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_num_tlvs_table, tvb, offset + 74, 2, ENC_BIG_ENDIAN);
@ -1238,13 +1238,13 @@ dissect_nrgyz_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, uint16_t length
proto_tree_add_item(etree, hf_cdp_nrgyz_tlvlength, tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(etree, hf_cdp_nrgyz_tlvlength, tvb, offset + 4, 4, ENC_BIG_ENDIAN);
switch (tlvt) { switch (tlvt) {
case TYPE_NRGYZ_ROLE: case TYPE_NRGYZ_ROLE:
proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_role, tvb, offset + 8, tlvl - 8, ENC_NA|ENC_ASCII); proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_role, tvb, offset + 8, tlvl - 8, ENC_ASCII);
break; break;
case TYPE_NRGYZ_DOMAIN: case TYPE_NRGYZ_DOMAIN:
proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_domain, tvb, offset + 8, tlvl - 8, ENC_NA|ENC_ASCII); proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_domain, tvb, offset + 8, tlvl - 8, ENC_ASCII);
break; break;
case TYPE_NRGYZ_NAME: case TYPE_NRGYZ_NAME:
proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_name, tvb, offset + 8, tlvl - 8, ENC_NA|ENC_ASCII); proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_name, tvb, offset + 8, tlvl - 8, ENC_ASCII);
break; break;
case TYPE_NRGYZ_REPLYTO: case TYPE_NRGYZ_REPLYTO:
proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_unknown_field, tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(etree, hf_cdp_nrgyz_reply_to_unknown_field, tvb, offset + 8, 2, ENC_BIG_ENDIAN);

6
epan/dissectors/packet-drbd.c
View File

@ -1256,11 +1256,11 @@ static void decode_payload_sync_param(tvbuff_t *tvb, proto_tree *tree, drbd_conv
proto_tree_add_item(tree, hf_drbd_resync_rate, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_drbd_resync_rate, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4; offset += 4;
proto_tree_add_item(tree, hf_drbd_verify_alg, tvb, offset, DRBD_STRING_MAX, ENC_ASCII | ENC_NA); proto_tree_add_item(tree, hf_drbd_verify_alg, tvb, offset, DRBD_STRING_MAX, ENC_ASCII);
offset += DRBD_STRING_MAX; offset += DRBD_STRING_MAX;
if (length >= offset + DRBD_STRING_MAX) { if (length >= offset + DRBD_STRING_MAX) {
proto_tree_add_item(tree, hf_drbd_csums_alg, tvb, offset, DRBD_STRING_MAX, ENC_ASCII | ENC_NA); proto_tree_add_item(tree, hf_drbd_csums_alg, tvb, offset, DRBD_STRING_MAX, ENC_ASCII);
offset += DRBD_STRING_MAX; offset += DRBD_STRING_MAX;
} }
@ -1280,7 +1280,7 @@ static void decode_payload_protocol(tvbuff_t *tvb, proto_tree *tree, drbd_conv *
proto_tree_add_item(tree, hf_drbd_after_sb_2p, tvb, 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_drbd_after_sb_2p, tvb, 12, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_drbd_conn_flags, tvb, 16, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_drbd_conn_flags, tvb, 16, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_drbd_two_primaries, tvb, 20, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_drbd_two_primaries, tvb, 20, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_drbd_integrity_alg, tvb, 24, -1, ENC_ASCII | ENC_NA); proto_tree_add_item(tree, hf_drbd_integrity_alg, tvb, 24, -1, ENC_ASCII);
} }
static void decode_payload_uuids(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data _U_) static void decode_payload_uuids(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data _U_)

2
epan/dissectors/packet-fefd.c
View File

@ -145,7 +145,7 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb,
offset + TLV_LENGTH, 2, length); offset + TLV_LENGTH, 2, length);
proto_tree_add_item(tlv_tree, hf_fefd_device_id, tvb, offset + 4, proto_tree_add_item(tlv_tree, hf_fefd_device_id, tvb, offset + 4,
length - 4, ENC_NA|ENC_ASCII); length - 4, ENC_ASCII);
} }
offset += length; offset += length;
break; break;

4
epan/dissectors/packet-gadu-gadu.c
View File

@ -1498,7 +1498,7 @@ dissect_gadu_gadu_pubdir50_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
while ((pos = tvb_find_uint8(tvb, offset, -1, '\0')) > 0) { while ((pos = tvb_find_uint8(tvb, offset, -1, '\0')) > 0) {
/* XXX, display it better, field=value */ /* XXX, display it better, field=value */
proto_tree_add_item(tree, hf_gadu_gadu_pubdir_request_str, tvb, offset, (pos - offset) + 1, ENC_NA | ENC_WINDOWS_1250); proto_tree_add_item(tree, hf_gadu_gadu_pubdir_request_str, tvb, offset, (pos - offset) + 1, ENC_WINDOWS_1250);
offset = pos + 1; offset = pos + 1;
} }
@ -1521,7 +1521,7 @@ dissect_gadu_gadu_pubdir50_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
while ((pos = tvb_find_uint8(tvb, offset, -1, '\0')) > 0) { while ((pos = tvb_find_uint8(tvb, offset, -1, '\0')) > 0) {
/* XXX, display it better, field=value */ /* XXX, display it better, field=value */
proto_tree_add_item(tree, hf_gadu_gadu_pubdir_reply_str, tvb, offset, (pos - offset) + 1, ENC_NA | ENC_WINDOWS_1250); proto_tree_add_item(tree, hf_gadu_gadu_pubdir_reply_str, tvb, offset, (pos - offset) + 1, ENC_WINDOWS_1250);
offset = pos + 1; offset = pos + 1;
} }

30
epan/dissectors/packet-gearman.c
View File

@ -298,11 +298,11 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_ERROR: case GEARMAN_COMMAND_ERROR:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_err_code, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_err_code, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
proto_tree_add_item(content_tree, hf_gearman_err_text, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_err_text, tvb, curr_offset, len, ENC_ASCII);
break; break;
case GEARMAN_COMMAND_WORK_DATA: case GEARMAN_COMMAND_WORK_DATA:
@ -311,7 +311,7 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_WORK_EXCEPTION: case GEARMAN_COMMAND_WORK_EXCEPTION:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
@ -321,19 +321,19 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_STATUS_RES: case GEARMAN_COMMAND_STATUS_RES:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_known_status, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_known_status, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_running_status, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_running_status, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
@ -475,7 +475,7 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_reducer, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_reducer, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
@ -485,11 +485,11 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_WORK_STATUS: case GEARMAN_COMMAND_WORK_STATUS:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
@ -499,7 +499,7 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_CAN_DO_TIMEOUT: case GEARMAN_COMMAND_CAN_DO_TIMEOUT:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_func_namez, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_func_namez, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strnlen( tvb, curr_offset, -1 ); len = tvb_strnlen( tvb, curr_offset, -1 );
@ -509,19 +509,19 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
case GEARMAN_COMMAND_STATUS_RES_UNIQUE: case GEARMAN_COMMAND_STATUS_RES_UNIQUE:
if (!tree) break; if (!tree) break;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_job_handlez, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_known_status, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_known_status, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_running_status, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_running_status, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);
proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_NA|ENC_ASCII); proto_tree_add_item(content_tree, hf_gearman_complete_numerator, tvb, curr_offset, len, ENC_ASCII);
curr_offset += len; curr_offset += len;
len = tvb_strsize(tvb, curr_offset); len = tvb_strsize(tvb, curr_offset);

20
epan/dissectors/packet-imap.c
View File

@ -233,7 +233,7 @@ dissect_imap_fetch(tvbuff_t *tvb, packet_info *pinfo,
need_more = false; need_more = false;
// Put the line into the protocol tree. // Put the line into the protocol tree.
proto_item *ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, *next_offset - offset, ENC_ASCII | ENC_NA); proto_item *ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, *next_offset - offset, ENC_ASCII);
*reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp); *reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp);
//no need to overwrite column information since subdissector was called //no need to overwrite column information since subdissector was called
@ -257,7 +257,7 @@ dissect_imap_fetch(tvbuff_t *tvb, packet_info *pinfo,
need_more = false; need_more = false;
// Put the line into the protocol tree. // Put the line into the protocol tree.
proto_item *ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, *next_offset - offset, ENC_ASCII | ENC_NA); proto_item *ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, *next_offset - offset, ENC_ASCII);
*reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp); *reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp);
} }
} }
@ -441,7 +441,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
} }
if (show_line) if (show_line)
proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, next_offset - offset, ENC_ASCII | ENC_NA); proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, next_offset - offset, ENC_ASCII);
} else { } else {
@ -451,7 +451,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
} }
// Put the line into the protocol tree. // Put the line into the protocol tree.
ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, next_offset - offset, ENC_ASCII | ENC_NA); ti = proto_tree_add_item(imap_tree, hf_imap_line, tvb, offset, next_offset - offset, ENC_ASCII);
reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp); reqresp_tree = proto_item_add_subtree(ti, ett_imap_reqresp);
/* /*
@ -503,7 +503,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
uid_tokenlen = tvb_get_token_len(tvb, next_token, uidlen, &uid_next_token, false); uid_tokenlen = tvb_get_token_len(tvb, next_token, uidlen, &uid_next_token, false);
if (uid_tokenlen != 0) { if (uid_tokenlen != 0) {
proto_tree_add_item(reqresp_tree, hf_imap_request_command, tvb, uid_offset, uid_tokenlen, ENC_ASCII); proto_tree_add_item(reqresp_tree, hf_imap_request_command, tvb, uid_offset, uid_tokenlen, ENC_ASCII);
hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII | ENC_NA); hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII);
proto_item_set_hidden(hidden_item); proto_item_set_hidden(hidden_item);
/* /*
@ -523,7 +523,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
*/ */
proto_tree_add_item(reqresp_tree, (is_request) ? hf_imap_request_command : hf_imap_response_status, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); proto_tree_add_item(reqresp_tree, (is_request) ? hf_imap_request_command : hf_imap_response_status, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
if (is_request) { if (is_request) {
hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII | ENC_NA); hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, offset, tokenlen, ENC_ASCII);
proto_item_set_hidden(hidden_item); proto_item_set_hidden(hidden_item);
/* /*
@ -556,7 +556,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
* so parse out the folder name. * so parse out the folder name.
*/ */
if (folder_tokenlen != 0) if (folder_tokenlen != 0)
proto_tree_add_item(reqresp_tree, hf_imap_request_folder, tvb, folder_offset, folder_tokenlen, ENC_ASCII | ENC_NA); proto_tree_add_item(reqresp_tree, hf_imap_request_folder, tvb, folder_offset, folder_tokenlen, ENC_ASCII);
} }
else if ((linelen > 0) && strncmp(command_token, "copy", commandlen) == 0) { else if ((linelen > 0) && strncmp(command_token, "copy", commandlen) == 0) {
/* /*
@ -568,7 +568,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
folder_tokenlen = tvb_get_token_len(tvb, folder_offset, folderlen, &folder_next_token, false); folder_tokenlen = tvb_get_token_len(tvb, folder_offset, folderlen, &folder_next_token, false);
if (folder_tokenlen != 0) if (folder_tokenlen != 0)
proto_tree_add_item(reqresp_tree, hf_imap_request_folder, tvb, folder_offset, folder_tokenlen, ENC_ASCII | ENC_NA); proto_tree_add_item(reqresp_tree, hf_imap_request_folder, tvb, folder_offset, folder_tokenlen, ENC_ASCII);
} }
else if (strncmp(command_token, "starttls", commandlen) == 0) { else if (strncmp(command_token, "starttls", commandlen) == 0) {
/* If next response is OK, then TLS should be commenced. */ /* If next response is OK, then TLS should be commenced. */
@ -604,8 +604,8 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
commandlen = linelen - (next_token-offset); commandlen = linelen - (next_token-offset);
commandlen = tvb_get_token_len(tvb, next_token, commandlen, &command_next_token, false); commandlen = tvb_get_token_len(tvb, next_token, commandlen, &command_next_token, false);
if (commandlen > 0) { if (commandlen > 0) {
proto_tree_add_item(reqresp_tree, hf_imap_response_command, tvb, command_offset, commandlen, ENC_ASCII | ENC_NA); proto_tree_add_item(reqresp_tree, hf_imap_response_command, tvb, command_offset, commandlen, ENC_ASCII);
hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, command_offset, commandlen, ENC_ASCII | ENC_NA); hidden_item = proto_tree_add_item(reqresp_tree, hf_imap_command, tvb, command_offset, commandlen, ENC_ASCII);
proto_item_set_hidden(hidden_item); proto_item_set_hidden(hidden_item);
} }
} }

4
epan/dissectors/packet-logcat.c
View File

@ -144,7 +144,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
check_length = 1; check_length = 1;
string_length = tvb_strsize(tvb, offset); string_length = tvb_strsize(tvb, offset);
proto_tree_add_item(maintree, hf_logcat_tag, tvb, offset, string_length, ENC_UTF_8 | ENC_NA); proto_tree_add_item(maintree, hf_logcat_tag, tvb, offset, string_length, ENC_UTF_8);
set_address_tvb(&pinfo->src, AT_STRINGZ, string_length + 1, tvb, offset); set_address_tvb(&pinfo->src, AT_STRINGZ, string_length + 1, tvb, offset);
set_address(&pinfo->dst, AT_STRINGZ, 7, "Logcat"); set_address(&pinfo->dst, AT_STRINGZ, 7, "Logcat");
@ -163,7 +163,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
*c = ' '; *c = ' ';
} }
subitem = proto_tree_add_item(maintree, hf_logcat_log, tvb, offset, string_length, ENC_UTF_8 | ENC_NA); subitem = proto_tree_add_item(maintree, hf_logcat_log, tvb, offset, string_length, ENC_UTF_8);
subtree = proto_item_add_subtree(subitem, ett_logcat_log); subtree = proto_item_add_subtree(subitem, ett_logcat_log);
next_tvb = tvb_new_subset_length(tvb, offset, string_length - 1); next_tvb = tvb_new_subset_length(tvb, offset, string_length - 1);

2
epan/dissectors/packet-nvme-tcp.c
View File

@ -1037,7 +1037,7 @@ void proto_register_nvme_tcp(void) {
NULL, HFILL } }, NULL, HFILL } },
{ &hf_nvme_tcp_icresp_cpda, { &hf_nvme_tcp_icresp_cpda,
{ "Controller Pdu data alignment", "nvme-tcp.icresp.cpda", { "Controller Pdu data alignment", "nvme-tcp.icresp.cpda",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_nvme_tcp_icresp_digest, { &hf_nvme_tcp_icresp_digest,
{ "Digest types enabled", "nvme-tcp.icresp.digest", { "Digest types enabled", "nvme-tcp.icresp.digest",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },

4
epan/dissectors/packet-nvme.c
View File

@ -1371,7 +1371,7 @@ dissect_nvme_rwc_common_word_10_11_12_14_15(tvbuff_t *cmd_tvb, proto_tree *cmd_t
50, 2, ENC_LITTLE_ENDIAN); 50, 2, ENC_LITTLE_ENDIAN);
ti = proto_tree_add_item(cmd_tree, hf_nvme_cmd_prinfo, cmd_tvb, 50, ti = proto_tree_add_item(cmd_tree, hf_nvme_cmd_prinfo, cmd_tvb, 50,
1, ENC_NA); 2, ENC_LITTLE_ENDIAN);
prinfo_tree = proto_item_add_subtree(ti, ett_data); prinfo_tree = proto_item_add_subtree(ti, ett_data);
proto_tree_add_item(prinfo_tree, hf_nvme_cmd_prinfo_prchk_lbrtag, cmd_tvb, proto_tree_add_item(prinfo_tree, hf_nvme_cmd_prinfo_prchk_lbrtag, cmd_tvb,
@ -5046,7 +5046,7 @@ proto_register_nvme(void)
{ &hf_nvme_cmd_prinfo, { &hf_nvme_cmd_prinfo,
{ "Protection info fields", { "Protection info fields",
"nvme.cmd.prinfo", "nvme.cmd.prinfo",
FT_UINT16, BASE_HEX, NULL, 0x0400, NULL, HFILL} FT_UINT16, BASE_HEX, NULL, 0x3c00, NULL, HFILL}
}, },
{ &hf_nvme_cmd_prinfo_prchk_lbrtag, { &hf_nvme_cmd_prinfo_prchk_lbrtag,
{ "check Logical block reference tag", { "check Logical block reference tag",

2
epan/dissectors/packet-obex.c
View File

@ -1922,7 +1922,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
} }
break; break;
case 0x42: /* Type */ case 0x42: /* Type */
proto_tree_add_item(hdr_tree, hf_type, tvb, offset, value_length, ENC_ASCII | ENC_NA); proto_tree_add_item(hdr_tree, hf_type, tvb, offset, value_length, ENC_ASCII);
proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(pinfo->pool, tvb, offset, value_length, ENC_ASCII)); proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(pinfo->pool, tvb, offset, value_length, ENC_ASCII));
if (!pinfo->fd->visited && obex_last_opcode_data && (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)) { if (!pinfo->fd->visited && obex_last_opcode_data && (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)) {
obex_last_opcode_data->data.get_put.type = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_ASCII | ENC_NA); obex_last_opcode_data->data.get_put.type = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_ASCII | ENC_NA);

2
epan/dissectors/packet-ppp.c
View File

@ -3926,7 +3926,7 @@ dissect_cbcp_callback_opt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
expert_add_info(pinfo, ti, &ei_cbcp_address); expert_add_info(pinfo, ti, &ei_cbcp_address);
break; break;
} }
proto_tree_add_item(addr_tree, hf_cbcp_address, tvb, offset, addr_len, ENC_NA|ENC_ASCII); proto_tree_add_item(addr_tree, hf_cbcp_address, tvb, offset, addr_len, ENC_ASCII);
offset += addr_len; offset += addr_len;
length -= addr_len; length -= addr_len;
} }

4
epan/dissectors/packet-sapenqueue.c
View File

@ -270,7 +270,7 @@ dissect_sapenqueue_server_admin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
pattern_length = (uint8_t)tvb_reported_length_remaining(tvb, offset); pattern_length = (uint8_t)tvb_reported_length_remaining(tvb, offset);
expert_add_info(pinfo, trace_request_pattern, &ei_sapenqueue_pattern_invalid_length); expert_add_info(pinfo, trace_request_pattern, &ei_sapenqueue_pattern_invalid_length);
} }
proto_tree_add_item(trace_request_pattern_tree, hf_sapenqueue_server_admin_trace_pattern_value, tvb, offset, pattern_length, ENC_ASCII|ENC_NA); proto_tree_add_item(trace_request_pattern_tree, hf_sapenqueue_server_admin_trace_pattern_value, tvb, offset, pattern_length, ENC_ASCII);
offset += pattern_length; offset += pattern_length;
/* Set the right size for the pattern tree */ /* Set the right size for the pattern tree */
@ -333,7 +333,7 @@ dissect_sapenqueue_conn_admin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
case 0x03:{ /* Set Name parameter */ case 0x03:{ /* Set Name parameter */
name_length = tvb_strsize(tvb, offset); name_length = tvb_strsize(tvb, offset);
if (name_length > 0) { if (name_length > 0) {
proto_tree_add_item(param_tree, hf_sapenqueue_conn_admin_param_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); proto_tree_add_item(param_tree, hf_sapenqueue_conn_admin_param_name, tvb, offset, name_length, ENC_ASCII);
offset += name_length; offset += name_length;
length += name_length; length += name_length;
} }

6
epan/dissectors/packet-sapms.c
View File

@ -966,7 +966,7 @@ dissect_sapms_property(tvbuff_t *tvb, proto_tree *tree, uint32_t offset){
break; break;
} }
case 0x07:{ /* Release Information */ case 0x07:{ /* Release Information */
proto_tree_add_item(value_tree, hf_sapms_property_release, tvb, offset, 10, ENC_ASCII|ENC_NA); proto_tree_add_item(value_tree, hf_sapms_property_release, tvb, offset, 10, ENC_ASCII);
offset+=10; offset+=10;
proto_tree_add_item(value_tree, hf_sapms_property_release_patchno, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(value_tree, hf_sapms_property_release_patchno, tvb, offset, 4, ENC_BIG_ENDIAN);
offset+=4; offset+=4;
@ -1258,11 +1258,11 @@ dissect_sapms_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32
offset+=2; offset+=2;
length-=2; length-=2;
string_length = tvb_strnlen(tvb, offset, length) + 1; string_length = tvb_strnlen(tvb, offset, length) + 1;
proto_tree_add_item(tree, hf_sapms_check_acl_acl, tvb, offset, string_length, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_sapms_check_acl_acl, tvb, offset, string_length, ENC_ASCII);
offset+=string_length; offset+=string_length;
length-=string_length; length-=string_length;
string_length = tvb_strnlen(tvb, offset, length) + 1; string_length = tvb_strnlen(tvb, offset, length) + 1;
proto_tree_add_item(tree, hf_sapms_check_acl_acl, tvb, offset, string_length, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_sapms_check_acl_acl, tvb, offset, string_length, ENC_ASCII);
break; break;
} }
default:{ default:{

4
epan/dissectors/packet-scsi.c
View File

@ -4300,8 +4300,8 @@ dissect_scsi_mmc5_modepage(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_scsi_mmc5_modepage_session_format, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_session_format, tvb, offset+8, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_scsi_mmc5_modepage_packet_size, tvb, offset+10, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_packet_size, tvb, offset+10, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_scsi_mmc5_modepage_audio_pause_length, tvb, offset+14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_audio_pause_length, tvb, offset+14, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_scsi_mmc5_modepage_media_catalog_number, tvb, offset+16, 16, ENC_NA|ENC_ASCII); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_media_catalog_number, tvb, offset+16, 16, ENC_ASCII);
proto_tree_add_item(tree, hf_scsi_mmc5_modepage_international_standard_recording_code, tvb, offset+32, 16, ENC_NA|ENC_ASCII); proto_tree_add_item(tree, hf_scsi_mmc5_modepage_international_standard_recording_code, tvb, offset+32, 16, ENC_ASCII);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
flags = tvb_get_uint8(tvb, offset+48+i); flags = tvb_get_uint8(tvb, offset+48+i);
proto_tree_add_uint_format(tree, hf_scsi_mmc5_modepage_sub_header_byte, tvb, offset+48+i, 1, flags, proto_tree_add_uint_format(tree, hf_scsi_mmc5_modepage_sub_header_byte, tvb, offset+48+i, 1, flags,

10
epan/dissectors/packet-shicp.c
View File

@ -258,10 +258,10 @@ dissect_shicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(shicp_tree, hf_shicp_auth_req, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN); proto_tree_add_item(shicp_tree, hf_shicp_auth_req, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN);
break; break;
case SHICP_DISCOVER_MODULE_VERSION_KEY: case SHICP_DISCOVER_MODULE_VERSION_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_module_version, tvb, offset, keyvalue_length, ENC_ASCII | ENC_NA); proto_tree_add_item(shicp_tree, hf_shicp_module_version, tvb, offset, keyvalue_length, ENC_ASCII);
break; break;
case SHICP_DISCOVER_MODULE_DESC_KEY: case SHICP_DISCOVER_MODULE_DESC_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_module_desc, tvb, offset, keyvalue_length, ENC_ASCII | ENC_NA); proto_tree_add_item(shicp_tree, hf_shicp_module_desc, tvb, offset, keyvalue_length, ENC_ASCII);
break; break;
case SHICP_DISCOVER_SUPPORTED_MSG_KEY: case SHICP_DISCOVER_SUPPORTED_MSG_KEY:
keyvalue_end = offset + keyvalue_length; keyvalue_end = offset + keyvalue_length;
@ -295,7 +295,7 @@ dissect_shicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(shicp_tree, hf_shicp_dhcp, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN); proto_tree_add_item(shicp_tree, hf_shicp_dhcp, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN);
break; break;
case SHICP_DISCOVER_HN_KEY: case SHICP_DISCOVER_HN_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_hn, tvb, offset, keyvalue_length, ENC_ASCII | ENC_NA); proto_tree_add_item(shicp_tree, hf_shicp_hn, tvb, offset, keyvalue_length, ENC_ASCII);
break; break;
case SHICP_DISCOVER_HN_MAX_LEN_KEY: case SHICP_DISCOVER_HN_MAX_LEN_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_hn_max_len, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN); proto_tree_add_item(shicp_tree, hf_shicp_hn_max_len, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN);
@ -351,10 +351,10 @@ dissect_shicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(shicp_tree, hf_shicp_dhcp, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN); proto_tree_add_item(shicp_tree, hf_shicp_dhcp, tvb, offset, keyvalue_length, ENC_LITTLE_ENDIAN);
break; break;
case SHICP_CONFIG_HN_KEY: case SHICP_CONFIG_HN_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_hn, tvb, offset, keyvalue_length, ENC_ASCII | ENC_NA); proto_tree_add_item(shicp_tree, hf_shicp_hn, tvb, offset, keyvalue_length, ENC_ASCII);
break; break;
case SHICP_CONFIG_PSWD_KEY: case SHICP_CONFIG_PSWD_KEY:
proto_tree_add_item(shicp_tree, hf_shicp_pswd, tvb, offset, keyvalue_length, ENC_ASCII | ENC_NA); proto_tree_add_item(shicp_tree, hf_shicp_pswd, tvb, offset, keyvalue_length, ENC_ASCII);
break; break;
default: default:
break; break;

2
epan/dissectors/packet-smb-pipe.c
View File

@ -403,7 +403,7 @@ add_stringz_pointer_param(tvbuff_t *tvb, int offset, int count _U_,
proto_tree_add_item(tree, hf_index, tvb, cptr, proto_tree_add_item(tree, hf_index, tvb, cptr,
string_len, ENC_ASCII|ENC_NA); /* XXX - code page? */ string_len, ENC_ASCII|ENC_NA); /* XXX - code page? */
} else { } else {
proto_tree_add_item(tree, hf_smb_pipe_stringz_param, tvb, cptr, string_len, ENC_NA|ENC_ASCII); proto_tree_add_item(tree, hf_smb_pipe_stringz_param, tvb, cptr, string_len, ENC_ASCII);
} }
} else { } else {
if (hf_index > 0) { if (hf_index > 0) {

2
epan/dissectors/packet-tds.c
View File

@ -4256,7 +4256,7 @@ dissect_tds7_prelogin_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
} }
case TDS7_PRELOGIN_OPTION_INSTOPT: { case TDS7_PRELOGIN_OPTION_INSTOPT: {
proto_item_append_text(option_item, ": InstOpt"); proto_item_append_text(option_item, ": InstOpt");
proto_tree_add_item(option_tree, hf_tds_prelogin_option_instopt, tvb, tokenoffset, tokenlen, ENC_ASCII | ENC_NA); proto_tree_add_item(option_tree, hf_tds_prelogin_option_instopt, tvb, tokenoffset, tokenlen, ENC_ASCII);
break; break;
} }
case TDS7_PRELOGIN_OPTION_THREADID: { case TDS7_PRELOGIN_OPTION_THREADID: {

6
plugins/epan/unistim/packet-unistim.c
View File

@ -333,7 +333,7 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t
offset+=1; offset+=1;
/* Get filename */ /* Get filename */
str_len = tvb_reported_length_remaining(tvb, offset); str_len = tvb_reported_length_remaining(tvb, offset);
proto_tree_add_item(msg_tree,hf_uftp_filename,tvb,offset,str_len,ENC_ASCII|ENC_NA); proto_tree_add_item(msg_tree,hf_uftp_filename,tvb,offset,str_len,ENC_ASCII);
offset += str_len; offset += str_len;
break; break;
@ -1592,10 +1592,10 @@ dissect_network_switch(proto_tree *msg_tree,
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,ENC_NA); proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,ENC_NA);
offset+=1;msg_len-=1; offset+=1;msg_len-=1;
string_len=tvb_strsize(tvb,offset); string_len=tvb_strsize(tvb,offset);
proto_tree_add_item(msg_tree,hf_net_full_pathname,tvb,offset,string_len,ENC_ASCII|ENC_NA); proto_tree_add_item(msg_tree,hf_net_full_pathname,tvb,offset,string_len,ENC_ASCII);
offset+=string_len;msg_len-=string_len; offset+=string_len;msg_len-=string_len;
string_len=tvb_strsize(tvb,offset); string_len=tvb_strsize(tvb,offset);
proto_tree_add_item(msg_tree,hf_net_file_identifier,tvb,offset,string_len,ENC_ASCII|ENC_NA); proto_tree_add_item(msg_tree,hf_net_file_identifier,tvb,offset,string_len,ENC_ASCII);
offset+=string_len;msg_len-=string_len; offset+=string_len;msg_len-=string_len;
proto_tree_add_item(msg_tree,hf_net_file_server_port,tvb,offset,2,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_net_file_server_port,tvb,offset,2,ENC_BIG_ENDIAN);
offset+=2;msg_len-=2; offset+=2;msg_len-=2;

6
tools/check_typed_item_calls.py
View File

@ -154,6 +154,7 @@ compatible_encoding_args = {
'ENC_EUC_KR', 'ENC_EUC_KR',
'ENC_DECT_STANDARD_8BITS', 'ENC_DECT_STANDARD_8BITS',
'ENC_DECT_STANDARD_4BITS_TBCD', 'ENC_DECT_STANDARD_4BITS_TBCD',
'ENC_STR_HEX' # Should also have at least one ENC_SEP_* flag!
]), ]),
'FT_CHAR' : set(['ENC_ASCII', 'ENC_VARIANT_QUIC', 'ENC_ASCII_7BITS']), # TODO: others? 'FT_CHAR' : set(['ENC_ASCII', 'ENC_VARIANT_QUIC', 'ENC_ASCII_7BITS']), # TODO: others?
@ -196,6 +197,9 @@ compatible_encoding_args = {
'ENC_TIME_MSECS', 'ENC_TIME_USECS', 'ENC_TIME_NSECS']) 'ENC_TIME_MSECS', 'ENC_TIME_USECS', 'ENC_TIME_NSECS'])
} }
compatible_encoding_args['FT_STRINGZ'] = compatible_encoding_args['FT_STRING']
compatible_encoding_multiple_flags_allowed = set(['FT_ABSOLUTE_TIME', 'FT_RELATIVE_TIME', 'FT_STRING']) compatible_encoding_multiple_flags_allowed = set(['FT_ABSOLUTE_TIME', 'FT_RELATIVE_TIME', 'FT_STRING'])
class EncodingCheckerBasic: class EncodingCheckerBasic:
@ -225,6 +229,8 @@ class EncodingCheckerBasic:
warnings_found += 1 warnings_found += 1
self.encodings_seen += 1 self.encodings_seen += 1
# TODO: separate checker for string types?
# Factory for appropriate checker object # Factory for appropriate checker object
def create_enc_checker(type): def create_enc_checker(type):
if type in compatible_encoding_args: if type in compatible_encoding_args: