diff options
| author | João Valverde <j@v6e.pt> | 2022-02-15 02:45:20 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2022-02-15 11:38:16 +0000 |
| commit | 8efad466c4e62b0371659c8fd1d909038c36da27 (patch) | |
| tree | 30fd6d3f87988d8b65dd52afcbcc88fbf0e28cc9 | |
| parent | 8198dd51cd6c731f620c1c7edf370c9c70966a44 (diff) | |
Tools: Fix fix-encoding-args.pl ASCII string validation
Do not require a useless ENC_NA parameter for string encodings.
FT_STRING and FT_STRINGZ types don't have any ndianness.
Follow-up to 6ec429622c9258eefd388caf21ce92ab5b9f54b4.
392 files changed, 2357 insertions, 2357 deletions
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index c998e6faff..1d59250fe8 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -686,7 +686,7 @@ process_comment_header(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_comment, tvb, 4, len-2, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_comment, tvb, 4, len-2, ENC_ASCII); } @@ -719,7 +719,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint3 proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); str = (char *)tvb_get_stringz_enc(pinfo->pool, tvb, 4, &str_size, ENC_ASCII); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII); if (strcmp(str, "JFIF") == 0) { /* Version */ ti = proto_tree_add_none_format(subtree, hf_version, @@ -1005,7 +1005,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint3 offset += 2; str = (char*)tvb_get_stringz_enc(pinfo->pool, tvb, offset, &str_size, ENC_ASCII); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, ENC_ASCII); offset += str_size; if (show_first_identifier_not_jfif && strcmp(str, "JFIF") != 0) { @@ -1049,7 +1049,7 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint3 proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); str = (char*)tvb_get_stringz_enc(pinfo->pool, tvb, 4, &str_size, ENC_ASCII); - ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII); if (strcmp(str, "FPXR") == 0) { proto_tree_add_item(tree, hf_exif_flashpix_marker, tvb, 0, -1, ENC_NA); } else { diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c index e661170817..71dc47d6a0 100644 --- a/epan/dissectors/file-mp4.c +++ b/epan/dissectors/file-mp4.c @@ -416,7 +416,7 @@ dissect_mp4_ftyp_body(tvbuff_t *tvb, gint offset, gint len, offset_start = offset; proto_tree_add_item(tree, hf_mp4_ftyp_brand, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_mp4_ftyp_ver, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -424,7 +424,7 @@ dissect_mp4_ftyp_body(tvbuff_t *tvb, gint offset, gint len, while ((offset-offset_start) < len) { proto_tree_add_item(tree, hf_mp4_ftyp_add_brand, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; } @@ -532,7 +532,7 @@ dissect_mp4_hdlr_body(tvbuff_t *tvb, gint offset, gint len _U_, offset += 4; /* four reserved 0 bytes */ proto_tree_add_item(tree, hf_mp4_hdlr_type, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; offset += 12; /* 3x32bit reserved */ @@ -857,7 +857,7 @@ dissect_mp4_box(guint32 parent_box_type _U_, guint depth, offset += 4; proto_tree_add_item(box_tree, hf_mp4_box_type_str, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; if (box_size == BOX_SIZE_EXTENDED) { diff --git a/epan/dissectors/file-png.c b/epan/dissectors/file-png.c index b595a0ae6a..005bbb8f3f 100644 --- a/epan/dissectors/file-png.c +++ b/epan/dissectors/file-png.c @@ -345,7 +345,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *da } proto_tree_add_item(chunk_tree, hf_png_chunk_type_str, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); proto_tree_add_item(chunk_tree, hf_png_chunk_flag_anc, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_png_chunk_flag_priv, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/file-rbm.c b/epan/dissectors/file-rbm.c index 804721879b..aaa620b1b0 100644 --- a/epan/dissectors/file-rbm.c +++ b/epan/dissectors/file-rbm.c @@ -310,7 +310,7 @@ static void dissect_rbm_struct_data(tvbuff_t* tvb, packet_info* pinfo, proto_tre rbm_set_info(pinfo, "Struct"); get_rbm_integer(tvb, *offset, &value, &len); - proto_tree_add_item(tree, hf_rbm_struct, tvb, *offset + 1, value, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_rbm_struct, tvb, *offset + 1, value, ENC_ASCII); *offset += 1 + value; if (value_str) *value_str = wmem_strdup_printf(pinfo->pool, "%d", value); diff --git a/epan/dissectors/file-rfc7468.c b/epan/dissectors/file-rfc7468.c index 47315e7f2b..221604754f 100644 --- a/epan/dissectors/file-rfc7468.c +++ b/epan/dissectors/file-rfc7468.c @@ -200,7 +200,7 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data */ label = wmem_strndup(pinfo->pool, labelp, labellen); proto_tree_add_item(preeb_tree, hf_rfc7468_preeb_label, tvb, - offset + (int)preeb_prefix_len, labellen, ENC_ASCII|ENC_NA); + offset + (int)preeb_prefix_len, labellen, ENC_ASCII); col_add_fstr(pinfo->cinfo, COL_INFO, "Label: %s", label); @@ -350,7 +350,7 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data * Extract the label, and put it in that subtree. */ proto_tree_add_item(posteb_tree, hf_rfc7468_posteb_label, tvb, - offset + (int)posteb_prefix_len, labellen, ENC_ASCII|ENC_NA); + offset + (int)posteb_prefix_len, labellen, ENC_ASCII); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 371b96999d..b47c736420 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -471,7 +471,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) case NJACK_CMD_PRODUCTNAME: case NJACK_CMD_SERIALNO: proto_tree_add_item(tlv_tree, hf_njack_tlv_typestring, - tvb, offset, tlv_length, ENC_ASCII|ENC_NA); + tvb, offset, tlv_length, ENC_ASCII); offset += tlv_length; break; case NJACK_CMD_PORT1: @@ -574,7 +574,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U njack_tree = proto_item_add_subtree(ti, ett_njack); proto_tree_add_item(njack_tree, hf_njack_magic, tvb, offset, 5, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 5; proto_tree_add_item(njack_tree, hf_njack_type, tvb, offset, 1, diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index da21489691..285e888774 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -1447,7 +1447,7 @@ static int dissect_9P_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (_9p_version == _9P2000_u) { _9p_len = tvb_get_letohs(tvb, offset); - proto_tree_add_item(ninep_tree, hf_9P_extension, tvb, offset+2, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(ninep_tree, hf_9P_extension, tvb, offset+2, 4, ENC_ASCII); offset += 2 + _9p_len; } diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c index 3b0bf1924d..77e99b12be 100644 --- a/epan/dissectors/packet-aastra-aasp.c +++ b/epan/dissectors/packet-aastra-aasp.c @@ -198,7 +198,7 @@ dissect_a_binary_command(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree { proto_tree_add_item(subtree, hf_a_data, tvb, 1, 3, ENC_NA); proto_tree_add_item(subtree, hf_a_length, tvb, 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_a_text, tvb, 5, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_a_text, tvb, 5, -1, ENC_ASCII); pstr = tvb_get_string_enc(pinfo->pool, tvb, 5, tvb_get_guint8(tvb, 4), ENC_ASCII|ENC_NA); if(pstr) @@ -333,7 +333,7 @@ dissect_a_binary_command(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree { proto_tree_add_item(subtree, hf_a_line, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_a_length, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_a_cdpn, tvb, 3, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_a_cdpn, tvb, 3, -1, ENC_ASCII); pstr = tvb_get_string_enc(pinfo->pool, tvb, 3, tvb_get_guint8(tvb, 2), ENC_ASCII|ENC_NA); if(pstr) @@ -423,7 +423,7 @@ dissect_aasp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } else { - proto_tree_add_item(aasp_tree, hf_a_text, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(aasp_tree, hf_a_text, tvb, 0, -1, ENC_ASCII); } } diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 82fc6fe607..89dc567f7a 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -6180,7 +6180,7 @@ dissect_broker_client_entry_pdu(tvbuff_t *tvb, proto_tree *tree, guint32 offset, offset += 4; /* protocol string */ - proto_tree_add_item(pdu_tree, hf_rdmnet_broker_client_ept_protocol_string, tvb, data_offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_broker_client_ept_protocol_string, tvb, data_offset, 32, ENC_ASCII); data_offset += 32; } break; @@ -6200,7 +6200,7 @@ dissect_broker_connect(tvbuff_t *tvb, proto_tree *tree, int offset, acn_pdu_offs proto_tree *flag_tree; /* client scope */ - proto_tree_add_item(tree, hf_rdmnet_broker_connect_client_scope, tvb, offset, 63, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_rdmnet_broker_connect_client_scope, tvb, offset, 63, ENC_ASCII); offset += 63; /* e133 version */ @@ -6208,7 +6208,7 @@ dissect_broker_connect(tvbuff_t *tvb, proto_tree *tree, int offset, acn_pdu_offs offset += 2; /* search domain */ - proto_tree_add_item(tree, hf_rdmnet_broker_connect_search_domain, tvb, offset, 231, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_rdmnet_broker_connect_search_domain, tvb, offset, 231, ENC_ASCII); offset += 231; /* connection flags */ @@ -6596,37 +6596,37 @@ dissect_rpt_status(tvbuff_t *tvb, proto_tree *tree, int offset, acn_pdu_offsets switch (vector) { case RDMNET_RPT_VECTOR_STATUS_UNKNOWN_RPT_UID: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_rpt_uid_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_rpt_uid_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_RDM_TIMEOUT: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_rdm_timeout_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_rdm_timeout_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_RDM_INVALID_RESPONSE: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_rdm_invalid_response_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_rdm_invalid_response_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_UNKNOWN_RDM_UID: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_rdm_uid_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_rdm_uid_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_UNKNOWN_ENDPOINT: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_endpoint_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_endpoint_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_BROADCAST_COMPLETE: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_broadcast_complete_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_broadcast_complete_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_UNKNOWN_VECTOR: if (pdu_end > data_offset) { - proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_vector_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_rpt_status_unknown_vector_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); } break; case RDMNET_RPT_VECTOR_STATUS_INVALID_MESSAGE: @@ -6888,7 +6888,7 @@ dissect_ept_status(tvbuff_t *tvb, proto_tree *tree, int offset, acn_pdu_offsets /* status string */ pdu_end = pdu_start + pdu_length; - proto_tree_add_item(pdu_tree, hf_rdmnet_ept_status_status_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_ept_status_status_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); break; case RDMNET_EPT_VECTOR_UNKNOWN_VECTOR: /* unknown cid (4 bytes) */ @@ -6897,7 +6897,7 @@ dissect_ept_status(tvbuff_t *tvb, proto_tree *tree, int offset, acn_pdu_offsets /* vector string */ pdu_end = pdu_start + pdu_length; - proto_tree_add_item(pdu_tree, hf_rdmnet_ept_status_vector_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pdu_tree, hf_rdmnet_ept_status_vector_string, tvb, data_offset, (pdu_end - data_offset), ENC_ASCII); break; } diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 10dbc35ece..ccbdfbf534 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -185,23 +185,23 @@ dissect_UDPExtStatus(packet_info *pinfo, tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 6, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_pattern, tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_version, tvb, 12, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_description, tvb, 16, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_description, tvb, 16, 16, ENC_ASCII); proto_tree_add_item(adwin_tree, hf_adwin_config_timerresets, tvb, 32, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_socketshutdowns, tvb, 36, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_disk_free, tvb, 40, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_disk_size, tvb, 44, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_date, tvb, 48, 8, ENC_ASCII|ENC_NA); - proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 56, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_date, tvb, 48, 8, ENC_ASCII); + proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 56, 8, ENC_ASCII); /* add the processor type raw values to the tree, to allow filtering */ - proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type_raw, tvb, 64, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type_raw, tvb, 64, 2, ENC_ASCII); /* add the processor type as a pretty printed string */ processor_type = tvb_get_string_enc(pinfo->pool, tvb, 64, 2, ENC_ASCII|ENC_NA); processor_type = str_to_str(processor_type, processor_type_mapping, "Unknown (%s)"); proto_tree_add_string(adwin_tree, hf_adwin_config_processor_type, tvb, 64, 2, processor_type); /* add system type as raw value and pretty printed string */ - proto_tree_add_item(adwin_tree, hf_adwin_config_system_type_raw, tvb, 66, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_system_type_raw, tvb, 66, 2, ENC_ASCII); system_type = tvb_get_string_enc(pinfo->pool, tvb, 66, 2, ENC_ASCII|ENC_NA); system_type = str_to_str(system_type, system_type_mapping, "Unknown (%s)"); proto_tree_add_string(adwin_tree, hf_adwin_config_system_type, tvb, 66, 2, system_type); @@ -229,22 +229,22 @@ dissect_UDPMessage(packet_info *pinfo, tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 36, 4, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_dhcp, tvb, 40, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_port32, tvb, 44, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_password, tvb, 48, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_password, tvb, 48, 10, ENC_ASCII); proto_tree_add_item(adwin_tree, hf_adwin_config_bootloader, tvb, 58, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 59, 5, ENC_NA); - proto_tree_add_item(adwin_tree, hf_adwin_config_description, tvb, 64, 16, ENC_ASCII|ENC_NA); - proto_tree_add_item(adwin_tree, hf_adwin_config_date, tvb, 80, 8, ENC_ASCII|ENC_NA); - proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 88, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_description, tvb, 64, 16, ENC_ASCII); + proto_tree_add_item(adwin_tree, hf_adwin_config_date, tvb, 80, 8, ENC_ASCII); + proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 88, 8, ENC_ASCII); /* add the processor type raw values to the tree, to allow filtering */ - proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type_raw, tvb, 96, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type_raw, tvb, 96, 2, ENC_ASCII); /* add the processor type as a pretty printed string */ processor_type = tvb_get_string_enc(pinfo->pool, tvb, 96, 2, ENC_ASCII|ENC_NA); processor_type = str_to_str(processor_type, processor_type_mapping, "Unknown"); proto_tree_add_string(adwin_tree, hf_adwin_config_processor_type, tvb, 96, 2, processor_type); /* add system type as raw value and pretty printed string */ - proto_tree_add_item(adwin_tree, hf_adwin_config_system_type_raw, tvb, 98, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_system_type_raw, tvb, 98, 2, ENC_ASCII); system_type = tvb_get_string_enc(pinfo->pool, tvb, 98, 2, ENC_ASCII|ENC_NA); system_type = str_to_str(system_type, system_type_mapping, "Unknown"); proto_tree_add_string(adwin_tree, hf_adwin_config_system_type, tvb, 98, 2, system_type); @@ -276,7 +276,7 @@ dissect_UDPIXP425FlashUpdate(tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_scan_id, tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_status, tvb, 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_timeout, tvb, 16, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 20, 24, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 20, 24, ENC_ASCII); proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 44, 6, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 50, 42, ENC_NA); } @@ -332,10 +332,10 @@ dissect_TCPFlashUpdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi proto_tree_add_boolean(adwin_tree, hf_adwin_config_eeprom_support, tvb, offset, length, FALSE); return offset+length; } - proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 4, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 4, length, ENC_ASCII); offset += length; length = tvb_strnlen(tvb, 4 + length, -1) + 1; - proto_tree_add_item(adwin_tree, hf_adwin_config_path, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_path, tvb, offset, length, ENC_ASCII); offset += length; proto_tree_add_item(adwin_tree, hf_adwin_config_filesize, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index b5b9b7ea1d..dcc4c50024 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -608,7 +608,7 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(adwin_tree, hf_adwin_instruction, tvb, 0, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_packet_index, tvb, 4, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_password, tvb, 8, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_password, tvb, 8, 10, ENC_ASCII); proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 18, 2, ENC_NA); switch(instructionID) { diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index b1cb5b5c0d..5ef76e4bd5 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -2667,7 +2667,7 @@ static int dissect_aeron_err(tvbuff_t * tvb, int offset, packet_info * pinfo, pr string_length = frame_length - ofs; if (string_length > 0) { - proto_tree_add_item(subtree, hf_aeron_err_string, tvb, offset + ofs, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_aeron_err_string, tvb, offset + ofs, string_length, ENC_ASCII); } rounded_length = (int) frame_length; if (rounded_length < 0) diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index d4c2bca15e..e4ad77b25b 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -3281,7 +3281,7 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_UTF_8); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3302,7 +3302,7 @@ dissect_query_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre PAD(1); proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_icon_index, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3319,7 +3319,7 @@ dissect_reply_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3340,10 +3340,10 @@ dissect_query_afp_add_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr PAD(1); proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3384,7 +3384,7 @@ dissect_query_afp_add_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PAD(1); offset = decode_dt_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -3405,7 +3405,7 @@ dissect_query_afp_rmv_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PAD(1); offset = decode_dt_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -3422,7 +3422,7 @@ dissect_query_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_afp_appl_index, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3739,7 +3739,7 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (len) { - proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_ASCII); offset += len; } } diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index 6c18c871a2..81aa5672e4 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -296,7 +296,7 @@ dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags) * XXX - an "octet string" is not necessarily a text string, so * having hf_ostring be FT_STRING is not necessarily appropriate. */ - proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, ENC_ASCII); return p_noct + 4; } diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index ee77d107fb..59f3e5c7c5 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1308,7 +1308,7 @@ dissect_aim_tlv_value_messageblock (proto_item *ti, guint16 valueid _U_, tvbuff_ proto_item_append_text(ti, "Message: %s ", format_text(pinfo->pool, buf, blocklen - 4)); proto_tree_add_item(entry, hf_aim_messageblock_message, tvb, - offset, blocklen-4, ENC_ASCII|ENC_NA); + offset, blocklen-4, ENC_ASCII); offset += blocklen-4; } @@ -3180,7 +3180,7 @@ dissect_aim_rendezvous_extended_message(tvbuff_t *tvb, proto_tree *msg_tree) proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_priority_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; text_length = tvb_get_letohs(tvb, offset); proto_tree_add_item_ret_uint(msg_tree, hf_aim_rendezvous_extended_data_message_text_length, tvb, offset, 2, ENC_BIG_ENDIAN, &text_length); offset+=2; - proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_text, tvb, offset, text_length, ENC_ASCII|ENC_NA); /* offset+=text_length; */ + proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_text, tvb, offset, text_length, ENC_ASCII); /* offset+=text_length; */ offset = tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index d5884d4605..2f8c991cf5 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -540,12 +540,12 @@ handle_message_sasl(tvbuff_t *tvb, col_add_fstr(pinfo->cinfo, COL_INFO, "SASL-%s", command->text); /* Add a subtree/row for the command. */ - proto_tree_add_item(message_tree, hf_alljoyn_sasl_command, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(message_tree, hf_alljoyn_sasl_command, tvb, offset, length, ENC_ASCII); offset += length; length = newline_offset - offset; /* Add a subtree for the parameter. */ - proto_tree_add_item(message_tree, hf_alljoyn_sasl_parameter, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(message_tree, hf_alljoyn_sasl_parameter, tvb, offset, length, ENC_ASCII); return_value = newline_offset; } @@ -1049,7 +1049,7 @@ parse_arg(tvbuff_t *tvb, proto_tree_add_item(field_tree, hf_alljoyn_uint32, tvb, offset, 4, encoding); offset += 4; - proto_tree_add_item(field_tree, hf_alljoyn_string_data, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(field_tree, hf_alljoyn_string_data, tvb, offset, length, ENC_ASCII); offset += length; break; @@ -1761,7 +1761,7 @@ ns_parse_questions(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint8 proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_size_8bit, tvb, *offset, 1, ENC_NA); (*offset) += 1; - proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII); (*offset) += bus_name_size; } @@ -1856,7 +1856,7 @@ ns_parse_answers_v0(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_size_8bit, tvb, *offset, 1, ENC_NA); (*offset) += 1; - proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_data, tvb, *offset, guid_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_data, tvb, *offset, guid_size, ENC_ASCII); (*offset) += guid_size; } @@ -1878,7 +1878,7 @@ ns_parse_answers_v0(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_size_8bit, tvb, *offset, 1, ENC_NA); (*offset) += 1; - proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII); (*offset) += bus_name_size; } } @@ -2021,7 +2021,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_size_8bit, tvb, *offset, 1, ENC_NA); (*offset) += 1; - proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_data, tvb, *offset, guid_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(alljoyn_string_tree, hf_alljoyn_string_data, tvb, *offset, guid_size, ENC_ASCII); (*offset) += guid_size; } @@ -2045,7 +2045,7 @@ ns_parse_answers_v1(tvbuff_t *tvb, gint* offset, proto_tree* alljoyn_tree, guint proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_size_8bit, tvb, *offset, 1, ENC_NA); (*offset) += 1; - proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(alljoyn_bus_name_tree, hf_alljoyn_string_data, tvb, *offset, bus_name_size, ENC_ASCII); (*offset) += bus_name_size; } } diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 2cf1738037..208df6bdf9 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -3080,7 +3080,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb, hf_amqp_0_10_method_connection_open_capabilities, tvb, offset, - arg_length, ENC_ASCII|ENC_NA); + arg_length, ENC_ASCII); dissect_amqp_0_10_array (tvb, pinfo, offset, @@ -4332,7 +4332,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb, if (flag1 & 0x04) { /* binding-key (str8) */ proto_tree_add_item(args_tree, hf_amqp_0_10_method_exchange_binding_key, - tvb, offset, 1, ENC_ASCII|ENC_NA); + tvb, offset, 1, ENC_ASCII); offset += (1 + tvb_get_guint8(tvb, offset)); } if (flag1 & 0x08) { /* arguments (map) */ @@ -4374,7 +4374,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb, if (flag1 & 0x04) { /* binding-key (str8) */ proto_tree_add_item(args_tree, hf_amqp_0_10_method_exchange_binding_key, - tvb, offset, 1, ENC_ASCII|ENC_NA); + tvb, offset, 1, ENC_ASCII); /* offset += (1 + tvb_get_guint8(tvb, offset)); */ } break; @@ -4397,7 +4397,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb, if (flag1 & 0x04) { /* binding-key (str8) */ proto_tree_add_item(args_tree, hf_amqp_0_10_method_exchange_binding_key, - tvb, offset, 1, ENC_ASCII|ENC_NA); + tvb, offset, 1, ENC_ASCII); offset += (1 + tvb_get_guint8(tvb, offset)); } if (flag1 & 0x08) { /* arguments (map) */ @@ -6470,7 +6470,7 @@ dissect_amqp_1_0_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (tree) { ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp_init); - proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII); proto_tree_add_item(amqp_tree, hf_amqp_init_id, tvb, 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_version_minor, tvb, 6, 1, ENC_BIG_ENDIAN); @@ -6548,7 +6548,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi if (tree) { ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp_init); - proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII); proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN); @@ -6819,7 +6819,7 @@ dissect_amqp_0_9_method_connection_open(tvbuff_t *tvb, packet_info *pinfo, /* capabilities (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_capabilities, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* insist (bit) */ @@ -6837,7 +6837,7 @@ dissect_amqp_0_9_method_connection_open_ok(tvbuff_t *tvb, { /* known-hosts (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_ok_known_hosts, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -6856,7 +6856,7 @@ dissect_amqp_0_9_method_connection_redirect(tvbuff_t *tvb, /* known-hosts (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_redirect_known_hosts, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -6914,7 +6914,7 @@ dissect_amqp_0_9_method_connection_blocked(tvbuff_t *tvb, { /* reason (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_connection_blocked_reason, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -6937,7 +6937,7 @@ dissect_amqp_0_9_method_channel_open(tvbuff_t *tvb, { /* out-of-band (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_channel_open_out_of_band, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -7088,7 +7088,7 @@ dissect_amqp_0_9_method_access_request(tvbuff_t *tvb, { /* realm (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_access_request_realm, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* exclusive (bit) */ @@ -7150,7 +7150,7 @@ dissect_amqp_0_9_method_exchange_declare(tvbuff_t *tvb, packet_info *pinfo, /* type (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_exchange_declare_type, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* passive (bit) */ @@ -7615,7 +7615,7 @@ dissect_amqp_0_9_method_basic_consume(tvbuff_t *tvb, packet_info *pinfo, /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* no-local (bit) */ @@ -7653,7 +7653,7 @@ dissect_amqp_0_9_method_basic_consume_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -7667,7 +7667,7 @@ dissect_amqp_0_9_method_basic_cancel(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* nowait (bit) */ @@ -7685,7 +7685,7 @@ dissect_amqp_0_9_method_basic_cancel_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -7767,17 +7767,17 @@ dissect_amqp_0_9_method_basic_return(tvbuff_t *tvb, packet_info *pinfo, /* reply-text (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_return_reply_text, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_return_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_return_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -7794,7 +7794,7 @@ dissect_amqp_0_9_method_basic_deliver(guint16 channel_num, /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_deliver_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* delivery-tag (longlong) */ @@ -7903,7 +7903,7 @@ dissect_amqp_0_9_method_basic_get_empty(tvbuff_t *tvb, { /* cluster-id (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_basic_get_empty_cluster_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8071,12 +8071,12 @@ dissect_amqp_0_9_method_file_consume(tvbuff_t *tvb, packet_info *pinfo, /* queue (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_consume_queue, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_consume_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* no-local (bit) */ @@ -8114,7 +8114,7 @@ dissect_amqp_0_9_method_file_consume_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_consume_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8128,7 +8128,7 @@ dissect_amqp_0_9_method_file_cancel(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* nowait (bit) */ @@ -8146,7 +8146,7 @@ dissect_amqp_0_9_method_file_cancel_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8160,7 +8160,7 @@ dissect_amqp_0_9_method_file_open(tvbuff_t *tvb, { /* identifier (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_open_identifier, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* content-size (longlong) */ @@ -8207,12 +8207,12 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb, /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_publish_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_publish_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* mandatory (bit) */ @@ -8226,7 +8226,7 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb, offset += 1; /* identifier (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_publish_identifier, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8245,17 +8245,17 @@ dissect_amqp_0_9_method_file_return(tvbuff_t *tvb, /* reply-text (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_return_reply_text, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_return_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_return_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8269,7 +8269,7 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* delivery-tag (longlong) */ @@ -8284,17 +8284,17 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb, offset += 1; /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* identifier (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_identifier, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8388,12 +8388,12 @@ dissect_amqp_0_9_method_stream_consume(tvbuff_t *tvb, packet_info *pinfo, /* queue (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_queue, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* no-local (bit) */ @@ -8427,7 +8427,7 @@ dissect_amqp_0_9_method_stream_consume_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8441,7 +8441,7 @@ dissect_amqp_0_9_method_stream_cancel(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* nowait (bit) */ @@ -8459,7 +8459,7 @@ dissect_amqp_0_9_method_stream_cancel_ok(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_ok_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8478,12 +8478,12 @@ dissect_amqp_0_9_method_stream_publish(tvbuff_t *tvb, /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* mandatory (bit) */ @@ -8510,17 +8510,17 @@ dissect_amqp_0_9_method_stream_return(tvbuff_t *tvb, /* reply-text (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_return_reply_text, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_return_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* routing-key (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_return_routing_key, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8534,7 +8534,7 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb, { /* consumer-tag (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_consumer_tag, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* delivery-tag (longlong) */ @@ -8544,12 +8544,12 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb, /* exchange (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_exchange, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); /* queue (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_queue, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8635,7 +8635,7 @@ dissect_amqp_0_9_method_dtx_start(tvbuff_t *tvb, { /* dtx-identifier (shortstr) */ proto_tree_add_item(args_tree, hf_amqp_method_dtx_start_dtx_identifier, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); return offset; @@ -8727,7 +8727,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* content-encoding (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_content_encoding, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); eh_ptr->encoding = ascii_strdown_inplace( tvb_get_string_enc(wmem_file_scope(), tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII)); @@ -8765,7 +8765,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* correlation-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_correlation_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8773,7 +8773,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* reply-to (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_reply_to, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8781,7 +8781,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* expiration (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_expiration, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8789,7 +8789,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* message-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_message_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8807,7 +8807,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* type (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_type, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8815,7 +8815,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* user-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_user_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8823,7 +8823,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* app-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_app_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8831,7 +8831,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* cluster-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_basic_cluster_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } /*prop_flags <<= 1;*/ @@ -8863,7 +8863,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* content-encoding (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_file_content_encoding, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8888,7 +8888,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* reply-to (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_file_reply_to, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8896,7 +8896,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* message-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_file_message_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8904,7 +8904,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* filename (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_file_filename, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -8922,7 +8922,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* cluster-id (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_file_cluster_id, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } /*prop_flags <<= 1;*/ @@ -8954,7 +8954,7 @@ dissect_amqp_0_9_content_header_stream(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* content-encoding (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_stream_content_encoding, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -9012,7 +9012,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* proxy-name (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_proxy_name, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -9020,7 +9020,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo, if (prop_flags & 0x8000) { /* data-name (shortstr) */ proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_data_name, - tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII); offset += 1 + tvb_get_guint8(tvb, offset); } prop_flags <<= 1; @@ -9073,7 +9073,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void if (tree) { ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA); amqp_tree = proto_item_add_subtree(ti, ett_amqp_init); - proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII); proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 430469d771..2054b3c699 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -434,7 +434,7 @@ dissect_ancp_tlv(tvbuff_t *tvb, proto_tree *tlv_tree, gint offset) default: /* Assume TLV value is string - covers ALCID, OAM resp */ proto_tree_add_item(tlv_tree, hf_ancp_ext_tlv_value_str, - tvb, offset, tlen, ENC_ASCII|ENC_NA); + tvb, offset, tlen, ENC_ASCII); offset += tlen; SKIPPADDING(offset, tlen); break; diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index 81fd867561..58cdf3f7a5 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -339,7 +339,7 @@ dissect_aprs_msg( tvbuff_t *tvb, if ( parent_tree ) { proto_tree *tc; - tc = proto_tree_add_item( parent_tree, hf_aprs_msg, tvb, offset, 7, ENC_ASCII|ENC_NA ); + tc = proto_tree_add_item( parent_tree, hf_aprs_msg, tvb, offset, 7, ENC_ASCII ); msg_tree = proto_item_add_subtree( tc, ett_aprs_msg ); } @@ -348,13 +348,13 @@ dissect_aprs_msg( tvbuff_t *tvb, if ( g_ascii_isdigit( ch ) ) { if ( wind ) - proto_tree_add_item( msg_tree, hf_aprs_msg_dir, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_dir, tvb, offset, 3, ENC_ASCII ); else - proto_tree_add_item( msg_tree, hf_aprs_msg_cse, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_cse, tvb, offset, 3, ENC_ASCII ); offset += 3; /* verify the separator */ offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_spd, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_spd, tvb, offset, 3, ENC_ASCII ); offset += 3; } else @@ -363,34 +363,34 @@ dissect_aprs_msg( tvbuff_t *tvb, { case 'D' : /* dfs */ offset += 3; - proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_s, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_s, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_h, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_h, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_g, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_g, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_d, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_dfs_d, tvb, offset, 1, ENC_ASCII ); break; case 'P' : /* phgd */ offset += 3; - proto_tree_add_item( msg_tree, hf_aprs_msg_phg_p, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_phg_p, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_phg_h, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_phg_h, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_phg_g, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_phg_g, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_phg_d, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_phg_d, tvb, offset, 1, ENC_ASCII ); break; case 'R' : /* rng */ - proto_tree_add_item( msg_tree, hf_aprs_msg_rng, tvb, offset, 7, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_rng, tvb, offset, 7, ENC_ASCII ); break; case 'T' : /* aod */ offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_aod_t, tvb, offset, 2, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_aod_t, tvb, offset, 2, ENC_ASCII ); offset += 2; /* step over the /C */ offset += 2; - proto_tree_add_item( msg_tree, hf_aprs_msg_aod_c, tvb, offset, 2, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_aod_c, tvb, offset, 2, ENC_ASCII ); break; default : /* wtf */ break; @@ -398,11 +398,11 @@ dissect_aprs_msg( tvbuff_t *tvb, } if ( brg_nrq ) { - proto_tree_add_item( msg_tree, hf_aprs_msg_brg, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_brg, tvb, offset, 3, ENC_ASCII ); offset += 3; /* verify the separator */ offset += 1; - proto_tree_add_item( msg_tree, hf_aprs_msg_nrq, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( msg_tree, hf_aprs_msg_nrq, tvb, offset, 3, ENC_ASCII ); offset += 3; } @@ -431,7 +431,7 @@ dissect_aprs_compressed_msg( tvbuff_t *tvb, if ( parent_tree ) { - tc = proto_tree_add_item( parent_tree, hf_aprs_msg, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + tc = proto_tree_add_item( parent_tree, hf_aprs_msg, tvb, offset, data_len, ENC_ASCII ); msg_tree = proto_item_add_subtree( tc, ett_aprs_msg ); ch = tvb_get_guint8( tvb, offset ); @@ -642,10 +642,10 @@ dissect_mic_e( tvbuff_t *tvb, proto_tree_add_item( mic_e_tree, hf_aprs_mic_e_spd_se, tvb, offset, 1, ENC_BIG_ENDIAN ); offset += 1; - proto_tree_add_item( mic_e_tree, hf_aprs_sym_code, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( mic_e_tree, hf_aprs_sym_code, tvb, offset, 1, ENC_ASCII ); offset += 1; - proto_tree_add_item( mic_e_tree, hf_aprs_sym_id, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( mic_e_tree, hf_aprs_sym_id, tvb, offset, 1, ENC_ASCII ); offset += 1; if ( offset < new_offset ) @@ -656,7 +656,7 @@ dissect_mic_e( tvbuff_t *tvb, tvb, offset, -1, ENC_NA ); else proto_tree_add_item( mic_e_tree, hf_aprs_mic_e_status, - tvb, offset, -1, ENC_ASCII|ENC_NA ); + tvb, offset, -1, ENC_ASCII ); } } @@ -673,27 +673,27 @@ dissect_aprs_storm( tvbuff_t *tvb, proto_tree *storm_tree; proto_tree *tc; - tc = proto_tree_add_item( parent_tree, hf_aprs_storm, tvb, offset, -1, ENC_ASCII|ENC_NA ); + tc = proto_tree_add_item( parent_tree, hf_aprs_storm, tvb, offset, -1, ENC_ASCII ); storm_tree = proto_item_add_subtree( tc, ett_aprs_storm ); - proto_tree_add_item( storm_tree, hf_aprs_storm_dir, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_dir, tvb, offset, 3, ENC_ASCII ); offset += 3; offset += 1; - proto_tree_add_item( storm_tree, hf_aprs_storm_spd, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_spd, tvb, offset, 3, ENC_ASCII ); offset += 3; - proto_tree_add_item( storm_tree, hf_aprs_storm_type, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_type, tvb, offset, 3, ENC_ASCII ); offset += 3; - proto_tree_add_item( storm_tree, hf_aprs_storm_sws, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_sws, tvb, offset, 4, ENC_ASCII ); offset += 4; - proto_tree_add_item( storm_tree, hf_aprs_storm_pwg, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_pwg, tvb, offset, 4, ENC_ASCII ); offset += 4; - proto_tree_add_item( storm_tree, hf_aprs_storm_cp, tvb, offset, 5, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_cp, tvb, offset, 5, ENC_ASCII ); offset += 5; - proto_tree_add_item( storm_tree, hf_aprs_storm_rhw, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_rhw, tvb, offset, 4, ENC_ASCII ); offset += 4; - proto_tree_add_item( storm_tree, hf_aprs_storm_rtsw, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_rtsw, tvb, offset, 4, ENC_ASCII ); offset += 4; - proto_tree_add_item( storm_tree, hf_aprs_storm_rwg, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( storm_tree, hf_aprs_storm_rwg, tvb, offset, 4, ENC_ASCII ); offset += 4; return offset; @@ -715,17 +715,17 @@ dissect_aprs_weather( tvbuff_t *tvb, data_len = tvb_reported_length_remaining( tvb, offset ); new_offset = offset + data_len; - tc = proto_tree_add_item( parent_tree, hf_aprs_weather, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + tc = proto_tree_add_item( parent_tree, hf_aprs_weather, tvb, offset, data_len, ENC_ASCII ); weather_tree = proto_item_add_subtree( tc, ett_aprs_weather ); ch = tvb_get_guint8( tvb, offset ); if ( g_ascii_isdigit( ch ) ) { - proto_tree_add_item( weather_tree, hf_aprs_weather_dir, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( weather_tree, hf_aprs_weather_dir, tvb, offset, 3, ENC_ASCII ); offset += 3; /* verify the separator */ offset += 1; - proto_tree_add_item( weather_tree, hf_aprs_weather_spd, tvb, offset, 3, ENC_ASCII|ENC_NA ); + proto_tree_add_item( weather_tree, hf_aprs_weather_spd, tvb, offset, 3, ENC_ASCII ); offset += 3; } @@ -738,63 +738,63 @@ dissect_aprs_weather( tvbuff_t *tvb, { case 'c' : proto_tree_add_item( weather_tree, hf_aprs_weather_dir, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 's' : proto_tree_add_item( weather_tree, hf_aprs_weather_spd, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'g' : proto_tree_add_item( weather_tree, hf_aprs_weather_peak, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 't' : proto_tree_add_item( weather_tree, hf_aprs_weather_temp, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'r' : proto_tree_add_item( weather_tree, hf_aprs_weather_rain_1, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'P' : proto_tree_add_item( weather_tree, hf_aprs_weather_rain_24, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'p' : proto_tree_add_item( weather_tree, hf_aprs_weather_rain, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'h' : proto_tree_add_item( weather_tree, hf_aprs_weather_humidty, - tvb, offset, 3, ENC_ASCII|ENC_NA ); + tvb, offset, 3, ENC_ASCII ); offset += 3; break; case 'b' : proto_tree_add_item( weather_tree, hf_aprs_weather_press, - tvb, offset, 6, ENC_ASCII|ENC_NA ); + tvb, offset, 6, ENC_ASCII ); offset += 6; break; case 'l' : case 'L' : proto_tree_add_item( weather_tree, hf_aprs_weather_luminosity, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case 'S' : proto_tree_add_item( weather_tree, hf_aprs_weather_snow, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; case '#' : proto_tree_add_item( weather_tree, hf_aprs_weather_raw_rain, - tvb, offset, 4, ENC_ASCII|ENC_NA ); + tvb, offset, 4, ENC_ASCII ); offset += 4; break; default : { @@ -814,10 +814,10 @@ dissect_aprs_weather( tvbuff_t *tvb, } #endif proto_tree_add_item( weather_tree, hf_aprs_weather_software, - tvb, offset, 1, ENC_ASCII|ENC_NA ); + tvb, offset, 1, ENC_ASCII ); offset += 1; proto_tree_add_item( weather_tree, hf_aprs_weather_unit, - tvb, offset, lr-1, ENC_ASCII|ENC_NA ); + tvb, offset, lr-1, ENC_ASCII ); offset = new_offset; break; } @@ -840,7 +840,7 @@ aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) ch= tvb_get_guint8( tvb, offset + 6 ); if ( g_ascii_isdigit( ch ) ) { /* MDHM */ - proto_tree_add_item( aprs_tree, hf_aprs_mdhm, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_mdhm, tvb, offset, data_len, ENC_ASCII ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, tzone ); } else @@ -848,7 +848,7 @@ aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) data_len -= 1; if ( ch == 'h' ) { /* HMS */ - proto_tree_add_item( aprs_tree, hf_aprs_hms, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_hms, tvb, offset, data_len, ENC_ASCII ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, tzone ); } else @@ -859,7 +859,7 @@ aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) case '/' : tzone = "local"; break; default : tzone = "unknown"; break; } - proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, data_len, ENC_ASCII ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset + 6, 1, tzone ); } } @@ -918,14 +918,14 @@ aprs_status( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) if ( ( data_len > 7 ) && ( tvb_get_guint8( tvb, offset+6 ) == 'z' ) ) { - proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, 6, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, 6, ENC_ASCII ); offset += 6; data_len -= 6; proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, 1, "zulu" ); offset += 1; data_len -= 1; } - proto_tree_add_item( aprs_tree, hf_aprs_status, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_status, tvb, offset, data_len, ENC_ASCII ); return offset + data_len; } @@ -1176,7 +1176,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void * ti = proto_tree_add_protocol_format( parent_tree , proto_aprs, tvb, 0, -1, "%s", wmem_strbuf_get_str(sb) ); aprs_tree = proto_item_add_subtree( ti, ett_aprs ); - proto_tree_add_item( aprs_tree, hf_aprs_dti, tvb, offset, 1, ENC_ASCII|ENC_NA ); + proto_tree_add_item( aprs_tree, hf_aprs_dti, tvb, offset, 1, ENC_ASCII ); offset += 1; switch ( dti ) diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index d533543489..53aa7bd781 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -152,7 +152,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_PCMD_id, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_PCMD_id, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add PCMD Flag */ @@ -161,7 +161,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_PCMD_flag, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_PCMD_flag, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add PCMD Roll */ @@ -170,7 +170,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - ti = proto_tree_add_item(sub_tree, hf_PCMD_roll, tvb, offset, length, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(sub_tree, hf_PCMD_roll, tvb, offset, length, ENC_ASCII); PCMD_byte = tvb_get_guint8(tvb, offset); if (PCMD_byte == 0x30) @@ -202,7 +202,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - ti = proto_tree_add_item(sub_tree, hf_PCMD_pitch, tvb, offset, length, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(sub_tree, hf_PCMD_pitch, tvb, offset, length, ENC_ASCII); PCMD_byte = tvb_get_guint8(tvb, offset); if (PCMD_byte == 0x30) @@ -234,7 +234,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - ti = proto_tree_add_item(sub_tree, hf_PCMD_gaz, tvb, offset, length, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(sub_tree, hf_PCMD_gaz, tvb, offset, length, ENC_ASCII); PCMD_byte = tvb_get_guint8(tvb, offset); if (PCMD_byte == 0x30) @@ -266,7 +266,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - ti = proto_tree_add_item(sub_tree, hf_PCMD_yaw, tvb, offset, length, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(sub_tree, hf_PCMD_yaw, tvb, offset, length, ENC_ASCII); PCMD_byte = tvb_get_guint8(tvb, offset); if (PCMD_byte == 0x30) @@ -305,7 +305,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_REF_id, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_REF_id, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add REF ctrl */ @@ -314,7 +314,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_REF_ctrl, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_REF_ctrl, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*CONFIG_IDS", 13)) @@ -330,7 +330,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_ID_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_ID_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Session ID */ @@ -339,7 +339,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_ID_session, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_ID_session, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add User ID */ @@ -348,7 +348,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_ID_user, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_ID_user, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Application ID */ @@ -357,7 +357,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_ID_app, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_ID_app, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*ANIM", 7)) @@ -373,7 +373,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_ANIM_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_ANIM_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Animation */ @@ -382,7 +382,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_ANIM_anim, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_ANIM_anim, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add animation time(sec) */ @@ -391,7 +391,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_ANIM_sec, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_ANIM_sec, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*FTRIM", 8)) @@ -408,7 +408,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; } proto_item_append_text(sub_item, " (Sets the reference for the horizontal plane)"); - proto_tree_add_item(sub_tree, hf_FTRIM_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_FTRIM_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*CONFIG", 9)) { @@ -423,7 +423,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Name */ @@ -432,7 +432,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_name, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Value */ @@ -441,7 +441,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_CONFIG_val, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CONFIG_val, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*LED", 6)) @@ -457,7 +457,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_LED_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_LED_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add animation to play */ @@ -466,7 +466,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_LED_anim, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_LED_anim, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add frequency */ @@ -475,7 +475,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_LED_freq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_LED_freq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Time to play in sec */ @@ -484,7 +484,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_LED_sec, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_LED_sec, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else if (!strncmp(command, "AT*COMWDG", 9)) @@ -500,7 +500,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_COMWDG, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_COMWDG, tvb, offset, length, ENC_ASCII); offset += (length + 1); }else if (!strncmp(command, "AT*CTRL", 7)) @@ -518,7 +518,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_COMMA); return offset; } - proto_tree_add_item(sub_tree, hf_CTRL_seq, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CTRL_seq, tvb, offset, length, ENC_ASCII); offset += (length + 1); /* Add Mode */ @@ -537,7 +537,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data expert_add_info(pinfo, sub_item, &ei_NO_CR); return offset; } - proto_tree_add_item(sub_tree, hf_CTRL_fsize, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_CTRL_fsize, tvb, offset, length, ENC_ASCII); offset += (length + 1); } else diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 1c79c5fa06..f8a1773a36 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -3368,15 +3368,15 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 2; proto_tree_add_item(tree, hf_artnet_poll_reply_short_name, - tvb, offset, 18, ENC_ASCII|ENC_NA); + tvb, offset, 18, ENC_ASCII); offset += 18; proto_tree_add_item(tree, hf_artnet_poll_reply_long_name, - tvb, offset, 64, ENC_ASCII|ENC_NA); + tvb, offset, 64, ENC_ASCII); offset += 64; proto_tree_add_item(tree, hf_artnet_poll_reply_node_report, - tvb, offset, 64, ENC_ASCII|ENC_NA); + tvb, offset, 64, ENC_ASCII); offset += 64; @@ -3673,11 +3673,11 @@ dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) { offset += 1; proto_tree_add_item(tree, hf_artnet_address_short_name, - tvb, offset, 18, ENC_ASCII|ENC_NA); + tvb, offset, 18, ENC_ASCII); offset += 18; proto_tree_add_item(tree, hf_artnet_address_long_name, - tvb, offset, 64, ENC_ASCII|ENC_NA); + tvb, offset, 64, ENC_ASCII); offset += 64; hi = proto_tree_add_item(tree, @@ -3823,7 +3823,7 @@ dissect_artnet_video_setup(tvbuff_t *tvb, guint offset, proto_tree *tree ) { offset += 1; proto_tree_add_item(tree, hf_artnet_video_setup_win_font_name, - tvb, offset, 64, ENC_ASCII|ENC_NA); + tvb, offset, 64, ENC_ASCII); offset += 64; size = last_font * font_height; @@ -4307,7 +4307,7 @@ dissect_artnet_diag_data(tvbuff_t *tvb, guint offset, proto_tree *tree) offset+=2; proto_tree_add_item(tree, hf_artnet_diag_data_data, tvb, - offset, length, ENC_ASCII|ENC_NA); + offset, length, ENC_ASCII); offset += length; return offset; @@ -4425,11 +4425,11 @@ dissect_artnet_directory_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 2; proto_tree_add_item(tree, hf_artnet_directory_reply_name, tvb, - offset, 16, ENC_ASCII|ENC_NA); + offset, 16, ENC_ASCII); offset += 16; proto_tree_add_item(tree, hf_artnet_directory_reply_desc, tvb, - offset, 64, ENC_ASCII|ENC_NA); + offset, 64, ENC_ASCII); offset += 64; proto_tree_add_item(tree, hf_artnet_directory_reply_length, tvb, @@ -4478,7 +4478,7 @@ dissect_artnet_file_tn_master(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 4; proto_tree_add_item(tree, hf_artnet_file_tn_master_name, tvb, - offset, 14, ENC_ASCII|ENC_NA); + offset, 14, ENC_ASCII); offset += 14; proto_tree_add_checksum(tree, tvb, offset, hf_artnet_file_tn_master_checksum, -1, NULL, NULL, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NO_FLAGS); diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index d9b0b38599..26c985ae9c 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -449,11 +449,11 @@ dissect_papi_license_manager(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr proto_item_append_text(tlv_item, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset)); break; case 2: /* Serial Number */ - proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_serial_number, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_serial_number, tvb, offset, 32, ENC_ASCII); proto_item_append_text(tlv_item, ": %s", tvb_get_string_enc(pinfo->pool,tvb, offset, optlen, ENC_ASCII)); break; case 3: /* Hostname */ - proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_hostname, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(licmgr_subtree, hf_papi_licmgr_hostname, tvb, offset, optlen, ENC_ASCII); proto_item_append_text(tlv_item, ": %s", tvb_get_string_enc(pinfo->pool,tvb, offset, optlen, ENC_ASCII)); break; case 5: /* MAC Address */ @@ -524,7 +524,7 @@ dissect_papi_debug(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree * while(offset < tvb_reported_length(tvb)) { switch(tvb_get_guint8(tvb,offset)) { case 0x00: - ti = proto_tree_add_item(debug_tree, hf_papi_debug_text, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(debug_tree, hf_papi_debug_text, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), ENC_ASCII); debug_sub_tree = proto_item_add_subtree(ti, ett_papi); proto_tree_add_item(debug_sub_tree, hf_papi_debug_text_length, tvb, offset+1, 2, ENC_BIG_ENDIAN); offset += tvb_get_ntohs(tvb, offset+1) + 3; diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index d0e3ed18ad..e098361ec3 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -3562,10 +3562,10 @@ dissect_serialnumber (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, p proto_tree_add_string_format_value(sn_tree, hf_r3_sn_manufacturer, tvb, start_offset + 0, 2, s, "%s (%s)", s, str_to_str (s, r3_snmanufacturernames, "[Unknown]")); s = tvb_get_string_enc (pinfo->pool, tvb, start_offset + 2, 1, ENC_ASCII|ENC_NA); proto_tree_add_string_format_value(sn_tree, hf_r3_sn_year, tvb, start_offset + 2, 1, s, "%s (%s)", s, str_to_str (s, r3_snyearnames, "[Unknown]")); - proto_tree_add_item(sn_tree, hf_r3_sn_week, tvb, start_offset + 3, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(sn_tree, hf_r3_sn_week, tvb, start_offset + 3, 2, ENC_ASCII); s = tvb_get_string_enc (pinfo->pool, tvb, start_offset + 5, 1, ENC_ASCII|ENC_NA); proto_tree_add_string_format_value(sn_tree, hf_r3_sn_model, tvb, start_offset + 5, 1, s, "%s (%s)", s, str_to_str (s, r3_snmodelnames, "[Unknown]")); - proto_tree_add_item(sn_tree, hf_r3_sn_sequence, tvb, start_offset + 6, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(sn_tree, hf_r3_sn_sequence, tvb, start_offset + 6, 4, ENC_ASCII); s = tvb_get_string_enc (pinfo->pool, tvb, start_offset + 10, 1, ENC_ASCII|ENC_NA); proto_tree_add_string_format_value(sn_tree, hf_r3_sn_group, tvb, start_offset + 10, 1, s, "%s (%s)", s, str_to_str (s, r3_sngroupnames, "[Unknown]")); s = tvb_get_string_enc (pinfo->pool, tvb, start_offset + 11, 1, ENC_ASCII|ENC_NA); @@ -3855,7 +3855,7 @@ dissect_r3_upstreamcommand_debugmsg (tvbuff_t *tvb, guint32 start_offset, guint3 debugmsg_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_r3debugmsg, NULL, "Debug message"); - proto_tree_add_item (debugmsg_tree, hf_r3_debugmsg, tvb, 1, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item (debugmsg_tree, hf_r3_debugmsg, tvb, 1, -1, ENC_ASCII); } static void @@ -3994,7 +3994,7 @@ dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start_offset, gui break; case CONFIGTYPE_STRING : - proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_string, tvb, offset + 3, item_length - 3, ENC_ASCII|ENC_NA); + proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_string, tvb, offset + 3, item_length - 3, ENC_ASCII); break; default : @@ -5000,7 +5000,7 @@ dissect_r3_upstreammfgfield_magcard (tvbuff_t *tvb, guint32 start_offset, guint3 { DISSECTOR_ASSERT(start_offset == 0); - proto_tree_add_item (tree, hf_r3_testmagcard, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_r3_testmagcard, tvb, 0, -1, ENC_ASCII); } static void @@ -5008,7 +5008,7 @@ dissect_r3_upstreammfgfield_proxcard (tvbuff_t *tvb, guint32 start_offset, guint { DISSECTOR_ASSERT(start_offset == 0); - proto_tree_add_item (tree, hf_r3_testproxcard, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_r3_testproxcard, tvb, 0, -1, ENC_ASCII); } /* @@ -5260,7 +5260,7 @@ dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint32 length _U case CONFIGTYPE_STRING : proto_tree_add_item (sc_tree, hf_r3_configitemdata_string, payload_tvb, offset + 2, - item_length - 2, ENC_ASCII|ENC_NA); + item_length - 2, ENC_ASCII); break; default : @@ -6593,7 +6593,7 @@ dissect_r3_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *r3_tree) if (tvb_strneql (tvb, 0, "~~~ds", 5) == 0) { if (r3_tree) - proto_tree_add_item (r3_tree, hf_r3_tildex3ds, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item (r3_tree, hf_r3_tildex3ds, tvb, 0, -1, ENC_ASCII); return 5; } diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c index dc22293e98..f96120261a 100644 --- a/epan/dissectors/packet-ath.c +++ b/epan/dissectors/packet-ath.c @@ -108,7 +108,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* BEGIN */ - proto_tree_add_item(ath_tree, hf_ath_begin, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_begin, tvb, offset, 8, ENC_ASCII); offset += 8; /* LENGTH @@ -157,7 +157,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* COMMAND */ - proto_tree_add_item(ath_tree, hf_ath_comm, tvb, offset, clen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_comm, tvb, offset, clen, ENC_ASCII); if (clen != -1) info_command = tvb_get_string_enc(pinfo->pool, tvb, offset, clen, ENC_ASCII); offset += clen; @@ -169,7 +169,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* DOMAIN */ - proto_tree_add_item(ath_tree, hf_ath_domain, tvb, offset, dlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_domain, tvb, offset, dlen, ENC_ASCII); if (dlen != 0) info_domain = tvb_get_string_enc(pinfo->pool, tvb, offset, dlen, ENC_ASCII); offset += dlen; @@ -186,12 +186,12 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* PAYLOAD */ - proto_tree_add_item(ath_tree, hf_ath_payload, tvb, offset, plen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_payload, tvb, offset, plen, ENC_ASCII); offset += plen; /* END */ - proto_tree_add_item(ath_tree, hf_ath_end, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_end, tvb, offset, 8, ENC_ASCII); } /* dissecting a Tomcat 7/8 packet @@ -200,7 +200,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* BEGIN */ - proto_tree_add_item(ath_tree, hf_ath_begin, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_begin, tvb, offset, 8, ENC_ASCII); offset += 8; proto_tree_add_item(ath_tree, hf_ath_padding, tvb, offset, 2, ENC_ASCII|ENC_NA); @@ -257,7 +257,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* COMMAND */ - proto_tree_add_item(ath_tree, hf_ath_comm, tvb, offset, clen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_comm, tvb, offset, clen, ENC_ASCII); if (clen != -1) info_command = tvb_get_string_enc(pinfo->pool, tvb, offset, clen, ENC_ASCII); offset += clen; @@ -269,7 +269,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* DOMAIN */ - proto_tree_add_item(ath_tree, hf_ath_domain, tvb, offset, dlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_domain, tvb, offset, dlen, ENC_ASCII); if (dlen != 0) info_domain = tvb_get_string_enc(pinfo->pool, tvb, offset, dlen, ENC_ASCII); offset += dlen; @@ -286,12 +286,12 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* PAYLOAD */ - proto_tree_add_item(ath_tree, hf_ath_payload, tvb, offset, plen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_payload, tvb, offset, plen, ENC_ASCII); offset += plen; /* END */ - proto_tree_add_item(ath_tree, hf_ath_end, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(ath_tree, hf_ath_end, tvb, offset, 8, ENC_ASCII); } else { proto_tree_add_expert(tree, pinfo, &ei_ath_hmark_invalid, tvb, offset, -1); diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c index b13d3564f3..8d6b82b953 100644 --- a/epan/dissectors/packet-awdl.c +++ b/epan/dissectors/packet-awdl.c @@ -966,7 +966,7 @@ awdl_tag_datapath_state(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset += 2; if (flags & 0x0100) { - proto_tree_add_item(tree, hf_awdl_datastate_countrycode, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_awdl_datastate_countrycode, tvb, offset, 3, ENC_ASCII); offset += 3; } if (flags & 0x0200) { diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index 37f80f83be..67207b02c0 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -89,7 +89,7 @@ dissect_dx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat dx_tree = proto_item_add_subtree( ti, ett_dx ); offset = 0; - proto_tree_add_item( dx_tree, hf_dx_report, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( dx_tree, hf_dx_report, tvb, offset, data_len, ENC_ASCII ); } return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index a79b68dae8..6d28a82235 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -166,7 +166,7 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (val > MAX_ELEMENT_VAL) { expert_add_info_format(pinfo, NULL, &ei_banana_length_too_long, "String length %" PRId64 " longer than we can handle", val); } - proto_tree_add_item(tree, hf_banana_string, tvb, offset, (guint32) val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_banana_string, tvb, offset, (guint32) val, ENC_ASCII); offset += (gint) val; break; case BE_NEG_INT: diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c index c3cae8b701..1f893e4c00 100644 --- a/epan/dissectors/packet-bencode.c +++ b/epan/dissectors/packet-bencode.c @@ -68,7 +68,7 @@ static int dissect_bencoding_str(tvbuff_t *tvb, packet_info *pinfo, } if (tree) { proto_tree_add_uint(tree, hf_bencode_str_length, tvb, offset, used, stringlen); - proto_tree_add_item(tree, hf_bencode_str, tvb, offset + used, stringlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_bencode_str, tvb, offset + used, stringlen, ENC_ASCII); if (treeadd == 1) { proto_item_append_text(ti, " Key: %s", diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c index 4292df1776..8d092522b2 100644 --- a/epan/dissectors/packet-bfcp.c +++ b/epan/dissectors/packet-bfcp.c @@ -241,7 +241,7 @@ dissect_bfcp_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = offset + pad_len; break; case 7: /* ERROR-INFO */ - proto_tree_add_item(bfcp_attr_tree, hf_bfcp_error_info_text, tvb, offset, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(bfcp_attr_tree, hf_bfcp_error_info_text, tvb, offset, length-3, ENC_ASCII); offset = offset + length-3; pad_len = length & 0x03; if(pad_len != 0){ @@ -251,7 +251,7 @@ dissect_bfcp_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = offset + pad_len; break; case 8: /* PARTICIPANT-PROVIDED-INFO */ - proto_tree_add_item(bfcp_attr_tree, hf_bfcp_part_prov_info_text, tvb, offset, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(bfcp_attr_tree, hf_bfcp_part_prov_info_text, tvb, offset, length-3, ENC_ASCII); offset = offset + length-3; pad_len = length & 0x03; if(pad_len != 0){ @@ -261,7 +261,7 @@ dissect_bfcp_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = offset + pad_len; break; case 9: /* STATUS-INFO */ - proto_tree_add_item(bfcp_attr_tree, hf_bfcp_status_info_text, tvb, offset, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(bfcp_attr_tree, hf_bfcp_status_info_text, tvb, offset, length-3, ENC_ASCII); offset = offset + length-3; pad_len = length & 0x03; if(pad_len != 0){ @@ -297,7 +297,7 @@ dissect_bfcp_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = offset + pad_len; break; case 12: /* USER-DISPLAY-NAME */ - proto_tree_add_item(bfcp_attr_tree, hf_bfcp_user_disp_name, tvb, offset, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(bfcp_attr_tree, hf_bfcp_user_disp_name, tvb, offset, length-3, ENC_ASCII); offset = offset + length-3; pad_len = length & 0x03; if(pad_len != 0){ @@ -307,7 +307,7 @@ dissect_bfcp_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = offset + pad_len; break; case 13: /* USER-URI */ - proto_tree_add_item(bfcp_attr_tree, hf_bfcp_user_uri, tvb, offset, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(bfcp_attr_tree, hf_bfcp_user_uri, tvb, offset, length-3, ENC_ASCII); offset = offset + length-3; pad_len = length & 0x03; if(pad_len != 0){ diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 998342731e..4fd44c0397 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -642,7 +642,7 @@ dissect_bfd_mep (tvbuff_t *tvb, proto_tree *tree, const int hfindex) proto_tree_add_uint (bfd_tree, hf_mep_agi_len, tvb, (offset + 17), 1, mep_agi_len); proto_tree_add_item (bfd_tree, hf_mep_agi_val, tvb, (offset + 18), - mep_agi_len, ENC_ASCII|ENC_NA); + mep_agi_len, ENC_ASCII); break; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 65b7419e47..fc7e3d8c8d 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -5054,7 +5054,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa tlv_tree = proto_item_add_subtree(tlv_item, ett_bgp_link_state); proto_tree_add_item(tlv_tree, hf_bgp_ls_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_bgp_ls_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_node_name_value, tvb, offset + 4, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_node_name_value, tvb, offset + 4, length, ENC_ASCII); break; case BGP_NLRI_TLV_IS_IS_AREA_IDENTIFIER: @@ -5493,7 +5493,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa tlv_tree = proto_item_add_subtree(tlv_item, ett_bgp_link_state); proto_tree_add_item(tlv_tree, hf_bgp_ls_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_bgp_ls_length, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_link_name_attribute_value, tvb, offset + 4, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_bgp_ls_tlv_link_name_attribute_value, tvb, offset + 4, length, ENC_ASCII); break; case BGP_LS_SR_TLV_ADJ_SID: @@ -7449,14 +7449,14 @@ dissect_bgp_capability_item(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, hostname_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cap_tree, hf_bgp_cap_fqdn_hostname, tvb, offset, hostname_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cap_tree, hf_bgp_cap_fqdn_hostname, tvb, offset, hostname_len, ENC_ASCII); offset += hostname_len; proto_tree_add_item(cap_tree, hf_bgp_cap_fqdn_domain_name_len, tvb, offset, 1, ENC_NA); domain_name_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cap_tree, hf_bgp_cap_fqdn_domain_name, tvb, offset, domain_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cap_tree, hf_bgp_cap_fqdn_domain_name, tvb, offset, domain_name_len, ENC_ASCII); offset += domain_name_len; } @@ -8588,7 +8588,7 @@ dissect_bgp_update_pmsi_attr(packet_info *pinfo, proto_tree *parent_tree, tvbuff proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_len, tvb, offset+14+rn_addr_length, 2, ENC_BIG_ENDIAN); opaque_value_length = tvb_get_ntohs(tvb, offset+14+rn_addr_length); proto_tree_add_item(tunnel_id_tree, hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_str, tvb, offset+16+rn_addr_length, - opaque_value_length, ENC_ASCII|ENC_NA); + opaque_value_length, ENC_ASCII); } else { /* This covers situation when opaque id is 0 (reserved) or any other value */ @@ -9424,7 +9424,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_policy_name_reserved, tvb, q, 1, ENC_BIG_ENDIAN); q += 1; proto_tree_add_item(subtree6, hf_bgp_update_encaps_tunnel_subtlv_policy_name_name, tvb, q, - encaps_tunnel_sublen - 1, ENC_ASCII|ENC_NA); + encaps_tunnel_sublen - 1, ENC_ASCII); q += (encaps_tunnel_sublen - 1); break; default: diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c index 7d5b03d418..71acfc5124 100644 --- a/epan/dissectors/packet-bitcoin.c +++ b/epan/dissectors/packet-bitcoin.c @@ -410,7 +410,7 @@ create_string_tree(proto_tree *tree, int hfindex, tvbuff_t *tvb, guint32* offset /* string */ proto_tree_add_item(subtree, hf_string_value, tvb, *offset, string_length, - ENC_ASCII|ENC_NA); + ENC_ASCII); *offset += string_length; return subtree; diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 9aba64c3fa..3e17997d93 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -518,7 +518,7 @@ dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) throw an exception, so we won't use msgtype or type. */ if (isamp) { proto_tree_add_item(mtree, hf_azureus_msg_type_len, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(mtree, hf_azureus_msg_type, tvb, offset+4, typelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(mtree, hf_azureus_msg_type, tvb, offset+4, typelen, ENC_ASCII); proto_item_append_text(ti, ": Len %u, %s", length, msgtype); proto_tree_add_item(mtree, hf_azureus_msg_prio, tvb, offset+4+typelen, 1, ENC_BIG_ENDIAN); offset += 4+typelen+1; @@ -615,7 +615,7 @@ dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case AZUREUS_MESSAGE_JPC_HELLO: stringlen = tvb_get_ntohl(tvb, offset); proto_tree_add_item(mtree, hf_azureus_jpc_addrlen, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(mtree, hf_azureus_jpc_addr, tvb, offset+4, stringlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(mtree, hf_azureus_jpc_addr, tvb, offset+4, stringlen, ENC_ASCII); proto_tree_add_item(mtree, hf_azureus_jpc_port, tvb, offset+4+stringlen, 4, ENC_BIG_ENDIAN); proto_tree_add_item(mtree, hf_azureus_jpc_session, tvb, offset+4+stringlen+4, 4, ENC_BIG_ENDIAN); break; @@ -639,7 +639,7 @@ dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "Handshake"); proto_tree_add_item(tree, hf_bittorrent_prot_name_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, ENC_ASCII|ENC_NA); offset += 19; + proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, ENC_ASCII); offset += 19; proto_tree_add_item(tree, hf_bittorrent_reserved, tvb, offset, 8, ENC_NA); offset += 8; proto_tree_add_item(tree, hf_bittorrent_sha1_hash, tvb, offset, 20, ENC_NA); diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c index c86f59604c..329e361dc3 100644 --- a/epan/dissectors/packet-bjnp.c +++ b/epan/dissectors/packet-bjnp.c @@ -89,7 +89,7 @@ static int dissect_bjnp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo ti = proto_tree_add_item (tree, proto_bjnp, tvb, offset, -1, ENC_NA); bjnp_tree = proto_item_add_subtree (ti, ett_bjnp); - proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, ENC_ASCII); offset += 4; dev_type = tvb_get_guint8 (tvb, offset); diff --git a/epan/dissectors/packet-bluecom.c b/epan/dissectors/packet-bluecom.c index c9026c7c3e..a723a4064e 100644 --- a/epan/dissectors/packet-bluecom.c +++ b/epan/dissectors/packet-bluecom.c @@ -183,7 +183,7 @@ dissect_bcp_connect_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags) offset += 4; proto_tree_add_item(bcp_subtree, hf_bcp_connectreq_ipaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(bcp_subtree, hf_bcp_connectreq_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(bcp_subtree, hf_bcp_connectreq_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII); offset += BCP_NAME_LEN; proto_tree_add_item(bcp_subtree, hf_bcp_connectreq_ethaddr, tvb, offset, BCP_ETHADDR_LEN, ENC_NA); offset += BCP_ETHADDR_LEN; @@ -262,7 +262,7 @@ dissect_bcp_search_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags) break; case BCP_SEARCH_NAME: - proto_tree_add_item(bcp_subtree, hf_bcp_searchreq_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(bcp_subtree, hf_bcp_searchreq_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII); break; default: @@ -292,7 +292,7 @@ dissect_bcp_search_data(proto_tree *bcp_tree, tvbuff_t *tvb, gint flags) offset += 2; proto_tree_add_item(bcp_subtree, hf_bcp_searchrsp_ipaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(bcp_subtree, hf_bcp_searchrsp_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(bcp_subtree, hf_bcp_searchrsp_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII); offset += BCP_NAME_LEN; proto_tree_add_item(bcp_subtree, hf_bcp_searchrsp_ethaddr, tvb, offset, BCP_ETHADDR_LEN, ENC_NA); offset += BCP_ETHADDR_LEN; @@ -329,7 +329,7 @@ dissect_bcp_identify_data(proto_tree *bcp_tree, tvbuff_t *tvb) offset += 4; proto_tree_add_item(bcp_subtree, hf_bcp_identify_ipaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(bcp_subtree, hf_bcp_identify_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(bcp_subtree, hf_bcp_identify_name, tvb, offset, BCP_NAME_LEN, ENC_ASCII); offset += BCP_NAME_LEN; proto_tree_add_item(bcp_subtree, hf_bcp_identify_ethaddr, tvb, offset, BCP_ETHADDR_LEN, ENC_NA); offset += BCP_ETHADDR_LEN; diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c index f6a22eef7c..b2909593d6 100644 --- a/epan/dissectors/packet-bmp.c +++ b/epan/dissectors/packet-bmp.c @@ -614,7 +614,7 @@ dissect_bmp_termination(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, offset += 2; if (term_type == BMP_TERM_TYPE_STRING) { - proto_tree_add_item(subtree, hf_term_info, tvb, offset, term_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_term_info, tvb, offset, term_len, ENC_ASCII); } else { proto_tree_add_item(subtree, hf_term_reason, tvb, offset, term_len, ENC_BIG_ENDIAN); } @@ -772,7 +772,7 @@ dissect_bmp_init(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, int of proto_tree_add_item(subtree, hf_init_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(subtree, hf_init_info, tvb, offset, init_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_init_info, tvb, offset, init_len, ENC_ASCII); offset += init_len; } } @@ -860,7 +860,7 @@ dissect_bmp_route_policy_event(tvbuff_t *tvb, proto_tree *tree, packet_info *pin switch(type){ case BMP_ROUTE_POLICY_TLV_VRF: { proto_tree_add_item(tlv_tree, hf_route_policy_tlv_vrf_table_id, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_route_policy_tlv_vrf_table_name, tvb, offset+4, length-4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_route_policy_tlv_vrf_table_name, tvb, offset+4, length-4, ENC_ASCII); offset += length; single_event_length -=length; } @@ -955,7 +955,7 @@ dissect_bmp_route_policy_event(tvbuff_t *tvb, proto_tree *tree, packet_info *pin } break; case BMP_ROUTE_POLICY_TLV_STRING: { - proto_tree_add_item(tlv_tree, hf_route_policy_tlv_string, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_route_policy_tlv_string, tvb, offset, length, ENC_ASCII); offset += length; single_event_length -= length; } diff --git a/epan/dissectors/packet-bpv6.c b/epan/dissectors/packet-bpv6.c index 44d7287a1d..45140f519e 100644 --- a/epan/dissectors/packet-bpv6.c +++ b/epan/dissectors/packet-bpv6.c @@ -554,34 +554,34 @@ dissect_dictionary(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs */ proto_tree_add_item(dict_tree, hf_bundle_dest_scheme, - tvb, offset + dict_data->dest_scheme_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->dest_scheme_offset, -1, ENC_ASCII); proto_tree_add_item(dict_tree, hf_bundle_dest_ssp, - tvb, offset + dict_data->dest_ssp_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->dest_ssp_offset, -1, ENC_ASCII); /* * Source info */ proto_tree_add_item(dict_tree, hf_bundle_source_scheme, - tvb, offset + dict_data->source_scheme_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->source_scheme_offset, -1, ENC_ASCII); proto_tree_add_item(dict_tree, hf_bundle_source_ssp, - tvb, offset + dict_data->source_ssp_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->source_ssp_offset, -1, ENC_ASCII); /* * Report to info */ proto_tree_add_item(dict_tree, hf_bundle_report_scheme, - tvb, offset + dict_data->report_scheme_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->report_scheme_offset, -1, ENC_ASCII); proto_tree_add_item(dict_tree, hf_bundle_report_ssp, - tvb, offset + dict_data->report_ssp_offset, -1, ENC_ASCII|ENC_NA); + tvb, offset + dict_data->report_ssp_offset, -1, ENC_ASCII); /* * Custodian info */ - proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + dict_data->cust_scheme_offset, -1, ENC_ASCII|ENC_NA); - proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + dict_data->cust_ssp_offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + dict_data->cust_scheme_offset, -1, ENC_ASCII); + proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + dict_data->cust_ssp_offset, -1, ENC_ASCII); /* * Add Source/Destination to INFO Field @@ -1572,7 +1572,7 @@ display_extension_block(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int proto_tree_add_item_ret_length(block_tree, hf_bundle_block_previous_hop_scheme, tvb, offset, 4, ENC_ASCII, &scheme_length); offset += scheme_length; - proto_tree_add_item(block_tree, hf_bundle_block_previous_hop_eid, tvb, offset, block_length-scheme_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(block_tree, hf_bundle_block_previous_hop_eid, tvb, offset, block_length-scheme_length, ENC_ASCII); if (block_length - scheme_length < 1) { expert_add_info_format(pinfo, ti, &ei_bundle_offset_error, "Metadata Block Length Error"); return tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 893425b004..e63b040199 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -156,7 +156,7 @@ dissect_bencoded_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint while( tvb_get_guint8(tvb,offset)!='e' ) offset += 1; - proto_tree_add_item(tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII); *result = tvb_get_string_enc( pinfo->pool, tvb, start_offset, offset-start_offset, ENC_ASCII); proto_tree_add_string_format( tree, hf_bencoded_int, tvb, start_offset, offset-start_offset, *result, @@ -212,7 +212,7 @@ dissect_bencoded_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint return 0; } } - proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII); offset += 1; return offset; } @@ -313,7 +313,7 @@ dissect_bt_dht_values(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint } if (tvb_get_guint8(tvb,offset)=='e') { /* list ending delimiter */ - proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII); offset++; } @@ -538,7 +538,7 @@ dissect_bencoded_dict(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint } } - proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII); offset += 1; proto_item_set_len( ti, offset-orig_offset ); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index c74929737d..b43cfff183 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2884,7 +2884,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_cmd_pin_code_length ,tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_bthci_cmd_pin_code ,tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_bthci_cmd_pin_code ,tvb, offset, 16, ENC_ASCII); offset+=16; break; diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index f112d14e16..13bab36b96 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.c @@ -212,7 +212,7 @@ dissect_bzr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (bzr_tree) { proto_tree_add_item(bzr_tree, hf_bzr_packet_protocol_version, tvb, 0, - protocol_version_len+1, ENC_ASCII|ENC_NA); + protocol_version_len+1, ENC_ASCII); } offset += dissect_prefixed_bencode(tvb, offset, pinfo, bzr_tree); diff --git a/epan/dissectors/packet-caneth.c b/epan/dissectors/packet-caneth.c index dc5d3b8546..98e6c71478 100644 --- a/epan/dissectors/packet-caneth.c +++ b/epan/dissectors/packet-caneth.c @@ -150,7 +150,7 @@ dissect_caneth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) ti = proto_tree_add_item(tree, proto_caneth, tvb, 0, -1, ENC_NA); caneth_tree = proto_item_add_subtree(ti, ett_caneth); - proto_tree_add_item(caneth_tree, hf_caneth_magic, tvb, 0, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(caneth_tree, hf_caneth_magic, tvb, 0, 8, ENC_ASCII); proto_tree_add_item(caneth_tree, hf_caneth_version, tvb, 8, 1, ENC_NA); proto_tree_add_item_ret_uint(caneth_tree, hf_caneth_frames, tvb, 9, 1, ENC_NA, &frame_count); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index b266f29f5b..45c9e6f8e6 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1321,11 +1321,11 @@ dissect_capwap_ac_information(tvbuff_t *tvb, proto_tree *ac_information_type_tre switch (ac_information_type) { case AC_INFORMATION_HARDWARE_VERSION: - proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_hardware_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_hardware_version, tvb, offset+8, optlen, ENC_ASCII); break; case AC_INFORMATION_SOFTWARE_VERSION: - proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_software_version, tvb, offset+8, optlen, ENC_ASCII); break; default: @@ -1361,19 +1361,19 @@ dissect_capwap_wtp_descriptor(tvbuff_t *tvb, proto_tree *wtp_descriptor_type_tre switch (wtp_descriptor_type) { case WTP_DESCRIPTOR_HARDWARE_VERSION: - proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_hardware_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_hardware_version, tvb, offset+8, optlen, ENC_ASCII); break; case WTP_DESCRIPTOR_ACTIVE_SOFTWARE_VERSION: - proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_active_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_active_software_version, tvb, offset+8, optlen, ENC_ASCII); break; case WTP_DESCRIPTOR_BOOT_VERSION: - proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_boot_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_boot_version, tvb, offset+8, optlen, ENC_ASCII); break; case WTP_DESCRIPTOR_OTHER_SOFTWARE_VERSION: - proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_other_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_other_software_version, tvb, offset+8, optlen, ENC_ASCII); break; default: @@ -1407,19 +1407,19 @@ dissect_capwap_board_data(tvbuff_t *tvb, proto_tree *board_data_type_tree, guint proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_value, tvb, offset+4, optlen, ENC_NA); switch (board_data_type) { case BOARD_DATA_WTP_MODEL_NUMBER: - proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_model_number, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_model_number, tvb, offset+4, optlen, ENC_ASCII); break; case BOARD_DATA_WTP_SERIAL_NUMBER: - proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number, tvb, offset+4, optlen, ENC_ASCII); break; case BOARD_DATA_BOARD_ID: - proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_id, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_id, tvb, offset+4, optlen, ENC_ASCII); break; case BOARD_DATA_BOARD_REVISION: - proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision, tvb, offset+4, optlen, ENC_ASCII); break; case BOARD_DATA_BASE_MAC_ADDRESS: @@ -1579,7 +1579,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s } break; case VSP_FORTINET_WTP_ALLOW: /* 34 */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_wtp_allow_sn, tvb, offset, optlen-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_wtp_allow_sn, tvb, offset, optlen-1, ENC_ASCII); offset += optlen - 1; proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_wtp_allow_allow, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1623,7 +1623,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_mvap_sn_length, tvb, offset, 2, ENC_NA); sn_length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_mvap_sn, tvb, offset, sn_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_mvap_sn, tvb, offset, sn_length, ENC_ASCII); offset += sn_length; proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_mvap_unknown, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1678,11 +1678,11 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s offset += 4; break; case VSP_FORTINET_ADMIN_PASSWD: /* 82 */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_admin_passwd, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_admin_passwd, tvb, offset, optlen, ENC_ASCII); offset += optlen; break; case VSP_FORTINET_REGCODE: /* 83 */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_regcode, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_regcode, tvb, offset, 3, ENC_ASCII); offset += 3; break; case VSP_FORTINET_COUNTRYCODE: /* 84 */ @@ -1690,7 +1690,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s offset += 1; proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_countrycode_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_countrycode_string, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_countrycode_string, tvb, offset, 3, ENC_ASCII); offset += 3; break; case VSP_FORTINET_STA_SCAN: /* 99 */ @@ -1726,7 +1726,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_sa_enable, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; optlen -= 1; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_sa_ssid, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_sa_ssid, tvb, offset, optlen, ENC_ASCII); offset += optlen; break; case VSP_FORTINET_DARRP_CFG: /* 112 */ @@ -1803,7 +1803,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_vap_psk_passwd_wid, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; optlen -= 1; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_vap_psk_passwd_key, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_fortinet_vap_psk_passwd_key, tvb, offset, optlen, ENC_ASCII); offset += optlen; break; case VSP_FORTINET_MESH_ETH_BRIDGE_ENABLE: /* 176 */ @@ -2050,15 +2050,15 @@ dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_ offset += 4; break; case VSP_CISCO_RAD_NAME: /* RAD (AP) Name (5) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_rad_name, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_rad_name, tvb, offset, optlen, ENC_ASCII); offset += optlen; break; case VSP_CISCO_MWAR: /* MWAR (6) */ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_type, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_hardware, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_hardware, tvb, offset, 4, ENC_ASCII); offset += 4; - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_software, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_software, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_mwar_active_ms, tvb, offset, 2, ENC_NA); offset += 2; @@ -2094,7 +2094,7 @@ dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_ offset += 4; break; case VSP_CISCO_AP_GROUP_NAME: /* AP Group Name (123) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_group_name, tvb, offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_group_name, tvb, offset, optlen, ENC_ASCII); offset += optlen; break; case VSP_CISCO_AP_LED_STATE_CONFIG: /* AP Led State (125) */ @@ -2228,7 +2228,7 @@ hf_capwap_msg_element_type_ac_descriptor_dtls_policy, ett_capwap_ac_descriptor_d "AC Name length %u wrong, must be >= 1", optlen); break; } - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+4, optlen, ENC_ASCII); break; case TYPE_AC_NAME_W_PRIORITY: /* AC Name With Priority (5) */ @@ -2238,7 +2238,7 @@ hf_capwap_msg_element_type_ac_descriptor_dtls_policy, ett_capwap_ac_descriptor_d break; } proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name_with_priority, tvb, offset+4, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+5, optlen-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+5, optlen-1, ENC_ASCII); break; case TYPE_AC_TIMESTAMP: /* AC Timestamp (6) */ @@ -2273,7 +2273,7 @@ hf_capwap_msg_element_type_ac_descriptor_dtls_policy, ett_capwap_ac_descriptor_d } if(optlen -(2 + maclength)) { - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_add_station_vlan_name, tvb, offset+6+maclength, optlen -(2 + maclength), ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_add_station_vlan_name, tvb, offset+6+maclength, optlen -(2 + maclength), ENC_ASCII); } } break; @@ -2366,7 +2366,7 @@ hf_capwap_msg_element_type_ac_descriptor_dtls_policy, ett_capwap_ac_descriptor_d "Location Data length %u wrong, must be >= 1", optlen); break; } - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_location_data, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_location_data, tvb, offset+4, optlen, ENC_ASCII); break; case TYPE_MAXIMUM_MESSAGE_LENGTH: /* Maximum Message Length (29) */ @@ -2542,7 +2542,7 @@ hf_capwap_msg_element_type_wtp_frame_tunnel_mode, ett_capwap_wtp_frame_tunnel_mo "WTP Name length %u wrong, must be >= 1", optlen); break; } - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_name, tvb, offset+4, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_name, tvb, offset+4, optlen, ENC_ASCII); break; case TYPE_WTP_REBOOT_STATISTICS: /* WTP Reboot Statistics (48) */ @@ -2620,7 +2620,7 @@ hf_capwap_msg_element_type_ieee80211_add_wlan_capability, ett_capwap_ieee80211_a proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_add_wlan_mac_mode, tvb, offset+key_length+20, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_add_wlan_tunnel_mode, tvb, offset+key_length+21, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_add_wlan_suppress_ssid, tvb, offset+key_length+22, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_add_wlan_ssid, tvb, offset+key_length+23, optlen-(key_length+23-4), ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_add_wlan_ssid, tvb, offset+key_length+23, optlen-(key_length+23-4), ENC_ASCII); } break; @@ -2890,7 +2890,7 @@ hf_capwap_msg_element_type_ieee80211_update_wlan_capability, ett_capwap_ieee8021 proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_dtim_period, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_bssid, tvb, offset+8, 6, ENC_NA); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_beacon_period, tvb, offset+14, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_country_string, tvb, offset+16, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_country_string, tvb, offset+16, 4, ENC_ASCII); break; case IEEE80211_WTP_RADIO_INFORMATION: /* ieee80211 WTP Radio Information (1048) */ diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index 5d46c21b4f..a32af5c8ac 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -764,13 +764,13 @@ dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case 0x10 : /* CallInfo */ i = offset+12; - proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; - proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; @@ -778,25 +778,25 @@ dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data i += 4; proto_tree_add_item(cast_tree, hf_cast_callType, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; - proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; proto_tree_add_item(cast_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; proto_tree_add_item(cast_tree, hf_cast_lastRedirectingReason, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; - proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; - proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; - proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII); i += StationMaxDirnumSize; proto_tree_add_item(cast_tree, hf_cast_callInstance, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; @@ -823,7 +823,7 @@ dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data break; case 0x13 : /* MakeCall */ - proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII); proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); break; @@ -904,22 +904,22 @@ dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case 0x90 : /* RemoteInfoRequest */ i = offset+12; - proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; proto_tree_add_item(cast_tree, hf_cast_requestorIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN); break; case 0x91 : /* RemoteInfoResponse */ i = offset+12; - proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; - proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII); i += StationMaxNameSize; proto_tree_add_item(cast_tree, hf_cast_stationIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN); i += 4; - proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA); + proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, ENC_ASCII); break; diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 5989158fc2..4ced9293ef 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2310,7 +2310,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo context_name = tvb_get_const_stringz(tvb, offset, &context_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_context, tvb, - offset, context_length, ENC_ASCII|ENC_NA); + offset, context_length, ENC_ASCII); } offset += context_length; @@ -2359,7 +2359,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo protocol_name = tvb_get_const_stringz(tvb, offset, &protocol_length); if (dct2000_tree) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_protocol, tvb, - offset, protocol_length, ENC_ASCII|ENC_NA); + offset, protocol_length, ENC_ASCII); } is_comment = (strcmp(protocol_name, "comment") == 0); if (!is_comment) { @@ -2372,7 +2372,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo variant_string = tvb_get_const_stringz(tvb, offset, &variant_length); if (!is_comment && !is_sprint) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_variant, tvb, - offset, variant_length, ENC_ASCII|ENC_NA); + offset, variant_length, ENC_ASCII); } offset += variant_length; @@ -2380,7 +2380,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo outhdr_string = tvb_get_const_stringz(tvb, offset, &outhdr_length); if (!is_comment && !is_sprint && (outhdr_length > 1)) { proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_outhdr, tvb, - offset, outhdr_length, ENC_ASCII|ENC_NA); + offset, outhdr_length, ENC_ASCII); } offset += outhdr_length; diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 2446fa071f..f280e9fb19 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -369,7 +369,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_stringzpad(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -399,7 +399,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, real_length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_portid, tvb, offset + 4, real_length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_portid, tvb, offset + 4, real_length - 4, ENC_ASCII); } offset += real_length; break; @@ -464,7 +464,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -858,7 +858,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -871,7 +871,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -890,7 +890,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } } offset += length; @@ -904,7 +904,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -917,7 +917,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -930,7 +930,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -943,7 +943,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -956,7 +956,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -969,7 +969,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -982,7 +982,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -995,7 +995,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; @@ -1008,7 +1008,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb_format_text(pinfo->pool, tvb, offset + 4, length - 4)); proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII); } offset += length; break; diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 704cf0e68f..132aff8ba5 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -6717,7 +6717,7 @@ guint c_dissect_new(proto_tree *tree, if (bansize != C_BANNER_SIZE) /* Note -1 != C_BANNER_SIZE */ return C_INVALID; - proto_tree_add_item(tree, hf_banner, tvb, off, bansize, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_banner, tvb, off, bansize, ENC_ASCII); off += bansize; c_set_type(data, "Connect"); diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index 3d965d585f..827cfff839 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -620,13 +620,13 @@ static guint32 dissect_cfdp_filestore_req_tlv(tvbuff_t *tvb, proto_tree *tree, g aux_byte = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_filestore_req_tree, hf_cfdp_first_file_name, tvb, offset, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_filestore_req_tree, hf_cfdp_first_file_name, tvb, offset, aux_byte, ENC_ASCII); offset += aux_byte; aux_byte = tvb_get_guint8(tvb, offset); offset += 1; if(aux_byte > 0){ - proto_tree_add_item(cfdp_filestore_req_tree, hf_cfdp_second_file_name, tvb, offset, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_filestore_req_tree, hf_cfdp_second_file_name, tvb, offset, aux_byte, ENC_ASCII); offset += aux_byte; } } @@ -689,13 +689,13 @@ static guint32 dissect_cfdp_filestore_resp_tlv(tvbuff_t *tvb, proto_tree *tree, aux_byte = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_filestore_resp_tree, hf_cfdp_first_file_name, tvb, offset, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_filestore_resp_tree, hf_cfdp_first_file_name, tvb, offset, aux_byte, ENC_ASCII); offset += aux_byte; aux_byte = tvb_get_guint8(tvb, offset); offset += 1; if(aux_byte > 0){ - proto_tree_add_item(cfdp_filestore_resp_tree, hf_cfdp_second_file_name, tvb, offset, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_filestore_resp_tree, hf_cfdp_second_file_name, tvb, offset, aux_byte, ENC_ASCII); offset += aux_byte; } @@ -780,12 +780,12 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, packet_info *pinfo, p tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_src_file_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_src_file_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_dst_file_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_dst_file_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; break; @@ -871,12 +871,12 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, packet_info *pinfo, p /* Directory Name */ tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; /* Directory File Name */ tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_file_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_file_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; break; @@ -888,12 +888,12 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, packet_info *pinfo, p /* Directory Name */ tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; /* Directory File Name */ tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_file_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_directory_file_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; break; @@ -917,7 +917,7 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, packet_info *pinfo, p /* Report File Name */ tlv_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_report_file_name, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(cfdp_msg_to_user_tree, hf_cfdp_report_file_name, tvb, offset, tlv_len, ENC_ASCII); offset += tlv_len; break; @@ -1156,10 +1156,10 @@ static guint32 dissect_cfdp_metadata_pdu(tvbuff_t *tvb, packet_info *pinfo, prot offset += 4; aux_byte = tvb_get_guint8(tvb, offset); if(aux_byte >0){ - proto_tree_add_item(tree, hf_cfdp_src_file_name, tvb, offset+1, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_cfdp_src_file_name, tvb, offset+1, aux_byte, ENC_ASCII); offset += aux_byte+1; aux_byte = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_cfdp_dst_file_name, tvb, offset+1, aux_byte, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_cfdp_dst_file_name, tvb, offset+1, aux_byte, ENC_ASCII); offset += aux_byte+1; } /* Add TLV fields */ diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 1272b4f6fd..143228aabf 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -557,7 +557,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr } else { /* MD name format is regular string or DNS string */ proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_string, - tvb, maid_offset, cfm_maid_md_name_length, ENC_ASCII|ENC_NA); + tvb, maid_offset, cfm_maid_md_name_length, ENC_ASCII); } maid_offset += cfm_maid_md_name_length; } @@ -571,7 +571,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if ((cfm_maid_ma_name_format == 2) || (cfm_maid_ma_name_format == 32)) { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_string, - tvb, maid_offset, cfm_maid_ma_name_length, ENC_ASCII|ENC_NA); + tvb, maid_offset, cfm_maid_ma_name_length, ENC_ASCII); } else { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex, tvb, maid_offset, cfm_maid_ma_name_length, ENC_NA); diff --git a/epan/dissectors/packet-chargen.c b/epan/dissectors/packet-chargen.c index 0064d59e53..b5bf66d079 100644 --- a/epan/dissectors/packet-chargen.c +++ b/epan/dissectors/packet-chargen.c @@ -52,7 +52,7 @@ dissect_chargen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* disse proto_tree_add_string_format(chargen_tree, hf_chargen_data, tvb, 0, len, "Data", "Data (%u): %s", len, data); -/* proto_tree_add_item(chargen_tree, hf_chargen_data, tvb, 0, -1, ENC_ASCII|ENC_NA); */ +/* proto_tree_add_item(chargen_tree, hf_chargen_data, tvb, 0, -1, ENC_ASCII); */ return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 45c079ea1a..c9291e9c82 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -4167,7 +4167,7 @@ cigi2_add_image_generator_message(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_item(tree, hf_cigi2_image_generator_message_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_cigi2_image_generator_message_message, tvb, offset, packet_size-4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_cigi2_image_generator_message_message, tvb, offset, packet_size-4, ENC_ASCII); offset += packet_size-4; return offset; diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 2ddc479b4c..106daf01a2 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -442,7 +442,7 @@ static void dissect_cimd_parameter(tvbuff_t *tvb, proto_tree *tree, gint pindex, (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); proto_tree_add_item(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII|ENC_NA); } @@ -475,7 +475,7 @@ static void dissect_cimd_ud(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint s (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr ); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); g_offset = startOffset + 1 + CIMD_PC_LENGTH + 1; g_size = endOffset - g_offset; @@ -680,7 +680,7 @@ static void dissect_cimd_dcs(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint ); proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, - startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); offset = startOffset + 1 + CIMD_PC_LENGTH + 1; dcs = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, endOffset - offset, ENC_ASCII), NULL, 10); @@ -728,7 +728,7 @@ static void dissect_cimd_error_code( tvbuff_t *tvb, proto_tree *tree, gint pinde param_tree = proto_tree_add_subtree(tree, tvb, startOffset + 1, endOffset - (startOffset + 1), (*vals_hdr_PC[pindex].ett_p), NULL, cimd_vals_PC[pindex].strptr); - proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII); err_code = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII), diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index f1b7494c34..da8318c153 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3351,7 +3351,7 @@ static int dissect_time_sync_prod_desc(packet_info *pinfo, proto_tree *tree, pro return total_len; } - proto_tree_add_item( tree, hf_time_sync_prod_desc_str, tvb, offset+4, size, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_time_sync_prod_desc_str, tvb, offset+4, size, ENC_ASCII); return size+4; } @@ -3380,7 +3380,7 @@ static int dissect_time_sync_revision_data(packet_info *pinfo, proto_tree *tree, return total_len; } - proto_tree_add_item( tree, hf_time_sync_revision_data_str, tvb, offset+4, size, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_time_sync_revision_data_str, tvb, offset+4, size, ENC_ASCII); return size+4; } @@ -3409,7 +3409,7 @@ static int dissect_time_sync_user_desc(packet_info *pinfo, proto_tree *tree, pro return total_len; } - proto_tree_add_item( tree, hf_time_sync_user_desc_str, tvb, offset+4, size, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_time_sync_user_desc_str, tvb, offset+4, size, ENC_ASCII); return size+4; } @@ -3469,7 +3469,7 @@ static int dissect_time_sync_port_phys_addr_info(packet_info *pinfo, proto_tree { port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*36, 36, ett_time_sync_port_phys_addr_info, NULL, "Port #%d", i+1); proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_port_num, tvb, offset+2+i*36, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i*36, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i*36, 16, ENC_ASCII); guint32 addr_size; proto_tree_add_item_ret_uint(port_tree, hf_time_sync_port_phys_addr_info_addr_size, tvb, offset+20+i*36, 2, ENC_LITTLE_ENDIAN, &addr_size); diff --git a/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c index 596e1efc2b..6a5097e6f9 100644 --- a/epan/dissectors/packet-clique-rm.c +++ b/epan/dissectors/packet-clique-rm.c @@ -231,7 +231,7 @@ dissect_unreliable_packet(proto_tree *clique_rm_tree, guint8 type, tvbuff_t *tvb hf_clique_rm_whois_reply_name_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(clique_rm_tree, - hf_clique_rm_whois_reply_name, tvb, offset, len, ENC_ASCII|ENC_NA); + hf_clique_rm_whois_reply_name, tvb, offset, len, ENC_ASCII); break; case PACKET_TYPE_REPAIR_REQUEST: proto_tree_add_item(clique_rm_tree, diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index a130853e2f..471c48a089 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -775,7 +775,7 @@ dissect_collectd_signature (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2, length); proto_tree_add_item (pt, hf_collectd_data_sighash, tvb, offset + 4, 32, ENC_NA); - proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 36, length - 36, ENC_ASCII|ENC_NA); + proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 36, length - 36, ENC_ASCII); return (0); } /* int dissect_collectd_signature */ @@ -857,7 +857,7 @@ dissect_collectd_encrypted (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_uint (pt, hf_collectd_type, tvb, offset, 2, type); proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2, length); proto_tree_add_uint (pt, hf_collectd_data_username_len, tvb, offset + 4, 2, username_length); - proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 6, username_length, ENC_ASCII|ENC_NA); + proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 6, username_length, ENC_ASCII); proto_tree_add_item (pt, hf_collectd_data_initvec, tvb, offset + (6 + username_length), 16, ENC_NA); proto_tree_add_item (pt, hf_collectd_data_encrypted, tvb, diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 5c066e1b51..9cfaf4cdb8 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1463,12 +1463,12 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32 break; if (tvb_strnlen(tvb, offset, len) == -1) { - ti = proto_tree_add_item(tree, hf_cops_pepid, tvb, offset, len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_cops_pepid, tvb, offset, len, ENC_ASCII); expert_add_info(pinfo, ti, &ei_cops_pepid_not_null); } else proto_tree_add_item(tree, hf_cops_pepid, tvb, offset, - tvb_strnlen(tvb, offset, len) + 1, ENC_ASCII|ENC_NA); + tvb_strnlen(tvb, offset, len) + 1, ENC_ASCII); break; case COPS_OBJ_REPORT_TYPE: @@ -3260,11 +3260,11 @@ cops_surveillance_parameters(tvbuff_t *tvb, proto_tree *st, guint n, guint32 off offset += 4; /* BCID Element ID */ - proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Time Zone */ - proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Event Counter */ @@ -3318,11 +3318,11 @@ cops_event_generation_info(tvbuff_t *tvb, proto_tree *st, guint n, guint32 offse offset += 4; /* BCID Element ID */ - proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Time Zone */ - proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Event Counter */ @@ -3842,7 +3842,7 @@ cops_docsis_service_class_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *st offset += 3; if (object_len >= 12) { - proto_tree_add_item(stt, hf_cops_pcmm_docsis_scn, tvb, offset, object_len - 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pcmm_docsis_scn, tvb, offset, object_len - 8, ENC_ASCII); offset += object_len - 8; } else { proto_tree_add_expert_format(stt, pinfo, &ei_cops_bad_cops_object_length, @@ -5676,11 +5676,11 @@ cops_mm_event_generation_info(tvbuff_t *tvb, proto_tree *st, guint n, guint32 of offset += 4; /* BCID Element ID */ - proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_id, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Time Zone */ - proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(stt, hf_cops_pc_bcid_tz, tvb, offset, 8, ENC_ASCII); offset += 8; /* BCID Event Counter */ diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index 4c79dfdaaf..f315a9694e 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -2156,7 +2156,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (opcode == PROTOCOL_BINARY_CMD_OBSERVE) { proto_tree *observe_tree; gint oo = offset, end = offset + value_len; - ti = proto_tree_add_item(tree, hf_observe, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_observe, tvb, offset, value_len, ENC_ASCII); observe_tree = proto_item_add_subtree(ti, ett_observe); while (oo < end) { guint16 kl; /* keylength */ @@ -2165,7 +2165,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, kl = tvb_get_ntohs(tvb, oo); proto_tree_add_item(observe_tree, hf_observe_keylength, tvb, oo, 2, ENC_BIG_ENDIAN); oo += 2; - proto_tree_add_item(observe_tree, hf_observe_key, tvb, oo, kl, ENC_ASCII|ENC_NA); + proto_tree_add_item(observe_tree, hf_observe_key, tvb, oo, kl, ENC_ASCII); oo += kl; if (!request) { proto_tree_add_item(observe_tree, hf_observe_status, tvb, oo, 1, ENC_BIG_ENDIAN); @@ -2234,7 +2234,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { proto_tree *failover_log_tree; gint cur = offset, end = offset + value_len; - ti = proto_tree_add_item(tree, hf_failover_log, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_failover_log, tvb, offset, value_len, ENC_ASCII); failover_log_tree = proto_item_add_subtree(ti, ett_failover_log); ti = proto_tree_add_uint(failover_log_tree, hf_failover_log_size, tvb, offset, 0, (end - cur) / 16); proto_item_set_generated(ti); @@ -2251,7 +2251,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { proto_tree *vbucket_states_tree; gint cur = offset, end = offset + value_len; - ti = proto_tree_add_item(tree, hf_vbucket_states, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_vbucket_states, tvb, offset, value_len, ENC_ASCII); vbucket_states_tree = proto_item_add_subtree(ti, ett_vbucket_states); ti = proto_tree_add_uint(vbucket_states_tree, hf_vbucket_states_size, tvb, offset, 0, (end - cur) / 10); proto_item_set_generated(ti); @@ -2282,7 +2282,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else if (opcode == PROTOCOL_BINARY_CMD_HELLO) { gint curr = offset, end = offset + value_len; proto_tree *hello_features_tree; - ti = proto_tree_add_item(tree, hf_hello_features, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_hello_features, tvb, offset, value_len, ENC_ASCII); hello_features_tree = proto_item_add_subtree(ti, ett_hello_features); while (curr < end) { proto_tree_add_item(hello_features_tree, hf_hello_features_feature, tvb, curr, 2, ENC_BIG_ENDIAN); @@ -2304,7 +2304,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, sep = tvb_find_guint8(tvb, offset, value_len, 0x00); if (sep == -1) { - ti = proto_tree_add_item(tree, hf_value, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_value, tvb, offset, value_len, ENC_ASCII); expert_add_info_format(pinfo, ti, &ef_separator_not_found, "Null byte not found"); } else { proto_tree_add_item(tree, hf_bucket_type, tvb, offset, sep - offset, ENC_ASCII | ENC_NA); diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index 9f4d02c9a4..2dc1267b37 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -754,7 +754,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t offset += 16; break; case CQL_RESULT_ROW_TYPE_VARCHAR: - proto_tree_add_item(columns_subtree, hf_cql_varchar, tvb, offset, bytes_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(columns_subtree, hf_cql_varchar, tvb, offset, bytes_length, ENC_ASCII); offset += bytes_length; break; case CQL_RESULT_ROW_TYPE_VARINT: diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 530dbaed70..2277d766da 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -531,7 +531,7 @@ dissect_daap_one_tag(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb) /* Tags contain strings XXX - verify that they're really 7bit ASCII */ proto_tree_add_item(tag_tree, hf_daap_data_string, - tvb, offset, tagsize, ENC_ASCII|ENC_NA); + tvb, offset, tagsize, ENC_ASCII); break; case daap_mper: diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index f7a5095514..a7745ca28e 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -83,9 +83,9 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (show_as_text) { if (uncompr_tvb && uncompr_len > 0) { - proto_tree_add_item(data_tree, hf_data_text, uncompr_tvb, 0, uncompr_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_data_text, uncompr_tvb, 0, uncompr_len, ENC_ASCII); } else { - proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, ENC_ASCII); } } diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c index d3a57f2856..a19a39b3e6 100644 --- a/epan/dissectors/packet-daytime.c +++ b/epan/dissectors/packet-daytime.c @@ -47,7 +47,7 @@ dissect_daytime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_tree_add_boolean(daytime_tree, hf_response_request, tvb, 0, 0, pinfo->srcport==DAYTIME_PORT); if (pinfo->srcport == DAYTIME_PORT) { - proto_tree_add_item(daytime_tree, hf_daytime_string, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(daytime_tree, hf_daytime_string, tvb, 0, -1, ENC_ASCII); } } return tvb_captured_length(tvb); diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index b965dba84e..5b35930cda 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -176,7 +176,7 @@ dissect_db_lsp_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } /* heuristic failed. Print remaining bytes as text */ - proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, ENC_ASCII); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 31b33a4e20..fb90ae600e 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -385,7 +385,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) offset += 2; proto_tree_add_item(dcc_optree, hf_dcc_brand, tvb, - offset, (int)sizeof(DCC_BRAND), ENC_ASCII|ENC_NA); + offset, (int)sizeof(DCC_BRAND), ENC_ASCII); offset += (int)sizeof(DCC_BRAND); D_SIGNATURE(); diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index ee3814d22e..8da97080fe 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -721,7 +721,7 @@ dissect_afsTaggedPath (tvbuff_t *tvb, int offset, dissect_ndr_uint16 (tvb, offset, pinfo, tree, di, drep, hf_fileexp_afsTaggedPath_tp_length, &tp_length); proto_tree_add_item (tree, hf_fileexp_afsTaggedPath_tp_chars, tvb, offset, - tp_length, ENC_ASCII|ENC_NA); + tp_length, ENC_ASCII); tp_chars = tvb_get_string_enc (pinfo->pool, tvb, offset, 1025, ENC_ASCII); offset += 1025; col_append_fstr (pinfo->cinfo, COL_INFO, " :tp_chars %s", tp_chars); @@ -1263,7 +1263,7 @@ dissect_afstaggedname (tvbuff_t *tvb, int offset, if (tn_length < 254) { proto_tree_add_item (tree, hf_fileexp_tn_string, tvb, offset, - tn_length, ENC_ASCII|ENC_NA); + tn_length, ENC_ASCII); tn_string = tvb_get_string_enc (pinfo->pool, tvb, offset, 257, ENC_ASCII); offset += 257; col_append_fstr (pinfo->cinfo, COL_INFO, " :tn_tag: %s", tn_string); diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index f388abec43..e26e01bb02 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -315,7 +315,7 @@ dissect_vlconf_cell (tvbuff_t *tvb, int offset, } /* byte name[MAXVLCELLCHARS]; Cell name */ - proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_ASCII); name = tvb_get_string_enc(pinfo->pool, tvb, offset, MAXVLCELLCHARS, ENC_ASCII); /* XXX why 114 above and 128 here?? */ offset += MAXVLCELLCHARS; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " Name: %s", name); diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index bb340526b0..c6d13c9265 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -4174,7 +4174,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int str_len = tvb_get_letohs(tvb, offset); proto_tree_add_item(tree, hf_mapi_EcDoRpc_str_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_mapi_EcDoRpc_mailbox, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mapi_EcDoRpc_mailbox, tvb, offset, str_len, ENC_ASCII); offset += str_len; proto_item_set_len(item, offset - origin_offset); return offset; diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index d9db651f1d..b36f9ea62a 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -4571,7 +4571,7 @@ netlogon_dissect_UAS_INFO_0(tvbuff_t *tvb, int offset, return offset; } - proto_tree_add_item(tree, hf_netlogon_computer_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_netlogon_computer_name, tvb, offset, 16, ENC_ASCII); offset += 16; time_created = tvb_get_guint32(tvb, offset, DREP_ENC_INTEGER(drep)); @@ -7655,14 +7655,14 @@ static int dissect_secchan_nl_auth_message(tvbuff_t *tvb, int offset, /* netbios domain name */ if (messageflags&0x00000001) { len = tvb_strsize(tvb, offset); - proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_domain, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_domain, tvb, offset, len, ENC_ASCII); offset += len; } /* netbios host name */ if (messageflags&0x00000002) { len = tvb_strsize(tvb, offset); - proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_host, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_host, tvb, offset, len, ENC_ASCII); offset += len; } diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 8a2bec6635..61aa584afe 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -4218,7 +4218,7 @@ dissect_dcerpc_cn_bind_ack(tvbuff_t *tvb, gint offset, packet_info *pinfo, hf_dcerpc_cn_sec_addr_len, &sec_addr_len); if (sec_addr_len != 0) { proto_tree_add_item(dcerpc_tree, hf_dcerpc_cn_sec_addr, tvb, offset, - sec_addr_len, ENC_ASCII|ENC_NA); + sec_addr_len, ENC_ASCII); offset += sec_addr_len; } diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index af9ae15414..d20594b1d7 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -422,7 +422,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_NA); pft_tree = proto_item_add_subtree (ti, ett_pft); - proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII); offset += 2; seq = tvb_get_ntohs (tvb, offset); @@ -513,7 +513,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_NA); af_tree = proto_item_add_subtree (ti, ett_af); - proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII); offset += 2; payload_len = tvb_get_ntohl(tvb, offset); @@ -540,7 +540,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _ offset += 1; pt = tvb_get_guint8 (tvb, offset); - proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item (af_tree, hf_edcp_pt, tvb, offset, 1, ENC_ASCII); offset += 1; next_tvb = tvb_new_subset_length_caplen (tvb, offset, payload_len, payload_len); offset += payload_len; diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 9930dfadf0..49e23036ba 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1094,7 +1094,7 @@ handle_connect_contents( /* The name field for formats 1 and 2 */ image_len = tvb_get_guint8(tvb, my_offset); my_offset++; - proto_tree_add_item(contents_tree, hf_dec_sess_dst_name, tvb, my_offset, image_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(contents_tree, hf_dec_sess_dst_name, tvb, my_offset, image_len, ENC_ASCII); my_offset += image_len; } /* The source end user */ @@ -1115,7 +1115,7 @@ handle_connect_contents( image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_src_name, - tvb, my_offset, image_len, ENC_ASCII|ENC_NA); + tvb, my_offset, image_len, ENC_ASCII); my_offset += image_len; } /* Now the MENUVER field */ @@ -1130,17 +1130,17 @@ handle_connect_contents( image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, ENC_ASCII|ENC_NA); + tvb, my_offset, image_len, ENC_ASCII); my_offset += image_len; image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, ENC_ASCII|ENC_NA); + tvb, my_offset, image_len, ENC_ASCII); my_offset += image_len; image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, ENC_ASCII|ENC_NA); + tvb, my_offset, image_len, ENC_ASCII); my_offset += image_len; diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 3c1ea14388..dbd4fb0930 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -526,7 +526,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da case DHCP_FO_PD_FTDDNS: proto_tree_add_item(option_tree, hf_dhcpfo_ftddns, tvb, - offset, option_length, ENC_ASCII|ENC_NA); + offset, option_length, ENC_ASCII); break; case DHCP_FO_PD_REJECT_REASON: @@ -548,12 +548,12 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da case DHCP_FO_PD_RELATIONSHIP_NAME: proto_tree_add_item(option_tree, hf_dhcpfo_relationship_name, tvb, - offset, option_length, ENC_ASCII|ENC_NA); + offset, option_length, ENC_ASCII); break; case DHCP_FO_PD_MESSAGE: proto_tree_add_item(option_tree, hf_dhcpfo_message, tvb, - offset, option_length, ENC_ASCII|ENC_NA); + offset, option_length, ENC_ASCII); break; case DHCP_FO_PD_MCLT: @@ -762,7 +762,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da proto_tree_add_item(option_tree, hf_dhcpfo_message_digest, tvb, offset+1, - option_length-1, ENC_ASCII|ENC_NA); + option_length-1, ENC_ASCII); break; case DHCP_FO_PD_PROTOCOL_VERSION: diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index d4fa873b34..010f90bc21 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -2245,7 +2245,7 @@ dissect_dhcpopt_vendor_class_identifier(tvbuff_t *tvb, packet_info *pinfo, proto * XXX - RFC 2132 says this is a string of octets; * should we check for non-printables? */ - proto_tree_add_item(tree, hf_dhcp_option_vendor_class_id, tvb, 0, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_vendor_class_id, tvb, 0, tvb_reported_length(tvb), ENC_ASCII); dissector_try_heuristic(dhcp_vendor_id_subdissector, tvb, pinfo, tree, &hdtbl_entry, data); return tvb_captured_length(tvb); @@ -2344,7 +2344,7 @@ dissect_dhcpopt_client_identifier(tvbuff_t *tvb, packet_info *pinfo, proto_tree } else if (byte == 0 && length > 1) { /* identifier other than a hardware address (e.g. a fully qualified domain name) */ proto_tree_add_item(tree, hf_dhcp_client_identifier_type, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_dhcp_client_identifier_undef, tvb, offset+1, length-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_client_identifier_undef, tvb, offset+1, length-1, ENC_ASCII); } else { /* otherwise, it's opaque data */ } @@ -2377,7 +2377,7 @@ dissect_dhcpopt_user_class_information(tvbuff_t *tvb, packet_info *pinfo, proto_ * https://gitlab.com/wireshark/wireshark/-/issues/16349 * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-dhcpe/fe8a2dd4-1e8c-4546-bacd-4ae10de02058 */ - proto_item *expert_ti = proto_tree_add_item(tree, hf_dhcp_option77_user_class_text, tvb, offset, uci_len, ENC_ASCII|ENC_NA); + proto_item *expert_ti = proto_tree_add_item(tree, hf_dhcp_option77_user_class_text, tvb, offset, uci_len, ENC_ASCII); expert_add_info(pinfo, expert_ti, &ei_dhcp_nonstd_option_data); break; } @@ -2449,7 +2449,7 @@ dissect_dhcpopt_slp_service_scope(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_item(tree, hf_dhcp_option_slp_service_scope_value, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dhcp_option_slp_service_scope_string, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_slp_service_scope_string, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); return tvb_captured_length(tvb); } @@ -2490,7 +2490,7 @@ dissect_dhcpopt_client_full_domain_name(tvbuff_t *tvb, packet_info *pinfo, proto proto_tree_add_string(tree, hf_dhcp_fqdn_name, tvb, offset+3, length-3, format_text(wmem_packet_scope(), dns_name, dns_name_len)); } else { - proto_tree_add_item(tree, hf_dhcp_fqdn_asciiname, tvb, offset+3, length-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_fqdn_asciiname, tvb, offset+3, length-3, ENC_ASCII); } } @@ -2505,7 +2505,7 @@ dissect_dhcpopt_novell_servers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Option 85 can be sent as a string */ /* Added by Greg Morris (gmorris[AT]novell.com) */ if (novell_string) { - proto_tree_add_item(tree, hf_dhcp_option_novell_dss_string, tvb, offset, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_novell_dss_string, tvb, offset, tvb_reported_length(tvb), ENC_ASCII); } else { /* IP addresses */ while (tvb_reported_length_remaining(tvb, offset) >= 4) { @@ -2561,7 +2561,7 @@ dissect_dhcpopt_dhcp_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tre break; default: - proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_rdm_rdv, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_rdm_rdv, tvb, offset, 8, ENC_ASCII); break; } offset += 8; @@ -2591,7 +2591,7 @@ dissect_dhcpopt_dhcp_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (tvb_reported_length_remaining(tvb, offset) == 0) break; - proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_information, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_information, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); break; } break; @@ -2600,7 +2600,7 @@ dissect_dhcpopt_dhcp_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (tvb_reported_length_remaining(tvb, offset) == 0) break; - proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_information, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_dhcp_authentication_information, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); break; } @@ -2714,7 +2714,7 @@ dissect_dhcpopt_civic_location(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { proto_tree_add_item(tree, hf_dhcp_option_civic_location_what, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_dhcp_option_civic_location_country, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_civic_location_country, tvb, offset, 2, ENC_ASCII); offset += 2; while (tvb_reported_length_remaining(tvb, offset) >= 2) @@ -2730,7 +2730,7 @@ dissect_dhcpopt_civic_location(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (tvb_reported_length_remaining(tvb, offset) >= (int)calength) { - proto_tree_add_item(tree, hf_dhcp_option_civic_location_ca_value, tvb, offset, calength, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_civic_location_ca_value, tvb, offset, calength, ENC_ASCII); offset += calength; } else @@ -3039,14 +3039,14 @@ dissect_dhcpopt_coordinate_based_location(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id_option, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); s_len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id, tvb, offset+2, s_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id, tvb, offset+2, s_len, ENC_ASCII); if (length > s_len+2) { /* Second DSS_ID*/ proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id_option, tvb, offset+2+s_len, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id_len, tvb, offset+1+2+s_len, 1, ENC_BIG_ENDIAN); s_len = tvb_get_guint8(tvb, offset+1+2+s_len); - proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id, tvb, offset+2+2+s_len, s_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_cl_dss_id, tvb, offset+2+2+s_len, s_len, ENC_ASCII); } } else { expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "Invalid length of DHCP option!"); @@ -3075,7 +3075,7 @@ dissect_dhcpopt_vi_vendor_class(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t data_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(tree, hf_dhcp_option_vi_class_data, tvb, offset, data_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_vi_class_data, tvb, offset, data_len, ENC_ASCII); /* look for next enterprise number */ offset += data_len; @@ -3130,7 +3130,7 @@ static int dissect_dhcpopt_dhcp_captive_portal(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *ti_cp; - ti_cp = proto_tree_add_item(tree, hf_dhcp_option_captive_portal, tvb, 0, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); + ti_cp = proto_tree_add_item(tree, hf_dhcp_option_captive_portal, tvb, 0, tvb_reported_length(tvb), ENC_ASCII); proto_item_set_url(ti_cp); return tvb_captured_length(tvb); @@ -3469,15 +3469,15 @@ dhcp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v_ proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_dpoe_system_pbb_service, tvb, clsuboptoff, vs_len, ENC_NA); break; case CL_AI_OPTION_CMTS_CM_SERVICE_CLASS: - proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_service_class_name, tvb, clsuboptoff, vs_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_service_class_name, tvb, clsuboptoff, vs_len, ENC_ASCII); clsuboptoff += vs_len; break; case CL_AI_OPTION_CMTS_MSO_DEFINED_TEXT: - proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_mso_defined_text, tvb, clsuboptoff, vs_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_mso_defined_text, tvb, clsuboptoff, vs_len, ENC_ASCII); clsuboptoff += vs_len; break; case CL_AI_OPTION_SECURE_FILE_TRANSFER_URI: - proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_secure_file_transfer_uri, tvb, clsuboptoff, vs_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o82_sub_tree, hf_dhcp_option82_vi_cl_secure_file_transfer_uri, tvb, clsuboptoff, vs_len, ENC_ASCII); clsuboptoff += vs_len; break; default: @@ -3509,7 +3509,7 @@ dhcp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v_ proto_tree_add_item(o82_v_tree, hf_dhcp_option82_vrf_name_global, tvb, suboptoff, 1, ENC_NA); } else if (subopt_len != 7) { - proto_tree_add_item(o82_v_tree, hf_dhcp_option82_vrf_name, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o82_v_tree, hf_dhcp_option82_vrf_name, tvb, suboptoff, subopt_len, ENC_ASCII); } else { proto_tree_add_item(o82_v_tree, hf_dhcp_option82_vrf_name_vpn_id_oui, tvb, suboptoff, 3, ENC_BIG_ENDIAN); proto_tree_add_item(o82_v_tree, hf_dhcp_option82_vrf_name_vpn_id_index, tvb, suboptoff+3, 4, ENC_BIG_ENDIAN); @@ -3882,7 +3882,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t suboptoff += 2; proto_tree_add_item_ret_uint(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_boot_menu_length, tvb, suboptoff, 1, ENC_BIG_ENDIAN, &boot_menu_length); suboptoff += 1; - proto_tree_add_item(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_boot_menu_desc, tvb, suboptoff, boot_menu_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_boot_menu_desc, tvb, suboptoff, boot_menu_length, ENC_ASCII); suboptoff += boot_menu_length; } break; @@ -3891,7 +3891,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t o43pxeclient_suboption_tree = proto_item_add_subtree(ti, ett_dhcp_option43_suboption_tree); proto_tree_add_item(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_menu_prompt_timeout, tvb, suboptoff, 1, ENC_BIG_ENDIAN); suboptoff += 1; - proto_tree_add_item(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_menu_prompt_prompt, tvb, suboptoff, subopt_len - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43pxeclient_suboption_tree, hf_dhcp_option43_pxeclient_menu_prompt_prompt, tvb, suboptoff, subopt_len - 1, ENC_ASCII); break; case O43PXE_BOOT_ITEM: ti = proto_tree_add_item(o43pxeclient_v_tree, hf_dhcp_option43_pxeclient_boot_item, tvb, suboptoff, subopt_len, ENC_NA); @@ -4450,7 +4450,7 @@ dissect_vendor_cablelabs_suboption(packet_info *pinfo, proto_item *v_ti, proto_t proto_tree_add_bytes_format_value(o43cl_v_tree, hf_dhcp_option43_cl_oui_bytes, tvb, suboptoff, subopt_len, NULL, "%02x:%02x:%02x", tvb_get_guint8(tvb, suboptoff), tvb_get_guint8(tvb, suboptoff+1), tvb_get_guint8(tvb, suboptoff+2)); } else if (subopt_len == 6) { - proto_tree_add_item(o43cl_v_tree, hf_dhcp_option43_cl_oui_string, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cl_v_tree, hf_dhcp_option43_cl_oui_string, tvb, suboptoff, subopt_len, ENC_ASCII); } else { expert_add_info_format(pinfo, vti, &ei_dhcp_bad_length, "length isn't 3 or 6"); } @@ -4521,7 +4521,7 @@ dissect_aruba_ap_vendor_info_heur( tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_item_append_text(tree, " (Aruba AP)"); vendor_tree = proto_item_add_subtree(tree, ett_dhcp_option); - proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaap_controllerip, tvb, offset, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); + proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaap_controllerip, tvb, offset, tvb_reported_length(tvb), ENC_ASCII); return TRUE; } @@ -4542,15 +4542,15 @@ dissect_aruba_instant_ap_vendor_info_heur( tvbuff_t *tvb, packet_info *pinfo _U_ proto_item_append_text(tree, " (Aruba Instant AP)"); - vendor_item = proto_tree_add_item(tree, hf_dhcp_option43_arubaiap, tvb, offset, reported_len, ENC_ASCII|ENC_NA); + vendor_item = proto_tree_add_item(tree, hf_dhcp_option43_arubaiap, tvb, offset, reported_len, ENC_ASCII); vendor_tree = proto_item_add_subtree(vendor_item, ett_dhcp_option43_suboption); nameorglen = tvb_find_guint8(tvb, offset, tvb_reported_length(tvb), ','); - proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_nameorg, tvb, offset, nameorglen, ENC_ASCII|ENC_NA); + proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_nameorg, tvb, offset, nameorglen, ENC_ASCII); offset += (nameorglen+1); ampiplen = tvb_find_guint8(tvb, offset, reported_len-nameorglen-1, ',') - offset; - proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_ampip, tvb, offset, ampiplen, ENC_ASCII|ENC_NA); + proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_ampip, tvb, offset, ampiplen, ENC_ASCII); offset += (ampiplen+1); - proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_password, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(vendor_tree, hf_dhcp_option43_arubaiap_password, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); return TRUE; } @@ -4648,7 +4648,7 @@ dissect_vendor_bsdp_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree * proto_tree_add_item(o43bsdp_v_tree, hf_dhcp_option43_bsdp_reply_port, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN); break; case 6: - proto_tree_add_item(o43bsdp_v_tree, hf_dhcp_option43_bsdp_boot_image_list_path, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43bsdp_v_tree, hf_dhcp_option43_bsdp_boot_image_list_path, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 7: ti = proto_tree_add_item(o43bsdp_v_tree, hf_dhcp_option43_bsdp_default_boot_image_id, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN|ENC_NA); @@ -4818,22 +4818,22 @@ dissect_vendor_cisco_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_unknown6, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN); break; case 7: - proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_model, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_model, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 8: - proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_apicuuid, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_apicuuid, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 9: - proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_fabricname, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_fabricname, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 10: proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_unknown10, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN); break; case 11: - proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_serialno, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_serialno, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 12: - proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_clientint, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_clientint, tvb, suboptoff, subopt_len, ENC_ASCII); break; default: proto_tree_add_item(o43cisco_v_tree, hf_dhcp_option43_cisco_unknown, tvb, suboptoff, subopt_len, ENC_NA); @@ -4915,7 +4915,7 @@ dissect_vendor_aerohive_suboption(packet_info *pinfo, proto_item *v_ti, proto_tr switch(subopt) { case 225: - proto_tree_add_item(o43aerohive_v_tree, hf_dhcp_option43_aerohive_xiqhostname, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43aerohive_v_tree, hf_dhcp_option43_aerohive_xiqhostname, tvb, suboptoff, subopt_len, ENC_ASCII); break; case 226: proto_tree_add_item(o43aerohive_v_tree, hf_dhcp_option43_aerohive_xiqipaddress, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN); @@ -5158,7 +5158,7 @@ dissect_vendor_alcatel_suboption(packet_info *pinfo, proto_item *v_ti, proto_tre proto_tree_add_item(o43alcatel_v_tree, hf_dhcp_option43_alcatel_app_type, tvb, suboptoff, 1, ENC_BIG_ENDIAN); break; case 67: /* 0x43 - Alcatel-Lucent SIP URL */ - proto_tree_add_item(o43alcatel_v_tree, hf_dhcp_option43_alcatel_sip_url, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(o43alcatel_v_tree, hf_dhcp_option43_alcatel_sip_url, tvb, suboptoff, subopt_len, ENC_ASCII); break; default: expert_add_info_format(pinfo, vti, &hf_dhcp_subopt_unknown_type, "ERROR, please report: Unknown subopt type handler %d", subopt); @@ -6537,7 +6537,7 @@ dissect_packetcable_cm_vendor_id_heur( tvbuff_t *tvb, packet_info *pinfo _U_, pr } if ((strcmp((const char*)vendor_id, PACKETCABLE_CM_CAP30) == 0)) { - proto_tree_add_item(tree, hf_dhcp_option_vendor_class_data, tvb, 0, tvb_reported_length(tvb), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_vendor_class_data, tvb, 0, tvb_reported_length(tvb), ENC_ASCII); return TRUE; } @@ -6554,7 +6554,7 @@ dissect_apple_bsdp_vendor_id_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t } if (tvb_memeql(tvb, 0, (const guint8*)APPLE_BSDP_CLIENT, vendor_id_len) == 0) { - proto_tree_add_item(tree, hf_dhcp_option_vendor_class_data, tvb, vendor_id_len, tvb_reported_length_remaining(tvb, vendor_id_len), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dhcp_option_vendor_class_data, tvb, vendor_id_len, tvb_reported_length_remaining(tvb, vendor_id_len), ENC_ASCII); return TRUE; } @@ -7142,7 +7142,7 @@ dissect_dhcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (tvb_get_guint8(tvb, SERVER_NAME_OFFSET) != '\0') { proto_tree_add_item(bp_tree, hf_dhcp_server, tvb, SERVER_NAME_OFFSET, - SERVER_NAME_LEN, ENC_ASCII|ENC_NA); + SERVER_NAME_LEN, ENC_ASCII); } else { proto_tree_add_string_format(bp_tree, hf_dhcp_server, tvb, @@ -7160,7 +7160,7 @@ dissect_dhcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (tvb_get_guint8(tvb, FILE_NAME_OFFSET) != '\0') { proto_tree_add_item(bp_tree, hf_dhcp_file, tvb, FILE_NAME_OFFSET, - FILE_NAME_LEN, ENC_ASCII|ENC_NA); + FILE_NAME_LEN, ENC_ASCII); } else { proto_tree_add_string_format(bp_tree, hf_dhcp_file, tvb, FILE_NAME_OFFSET, diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 60d5600c53..0587cda76f 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1426,7 +1426,7 @@ dissect_packetcable_cccV6_option(proto_tree *v_tree, proto_item *v_item, packet_ switch (subopt) { case PKT_CCCV6_PRI_DSS: if (subopt_len < 35) { - proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_pri_dss, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_pri_dss, tvb, suboptoff, subopt_len, ENC_ASCII); } else { expert_add_info_format(pinfo, vti, &ei_dhcpv6_bogus_length, "Bogus length: %d", subopt_len); } @@ -1434,7 +1434,7 @@ dissect_packetcable_cccV6_option(proto_tree *v_tree, proto_item *v_item, packet_ break; case PKT_CCCV6_SEC_DSS: if (subopt_len < 35) { - proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_sec_dss, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_sec_dss, tvb, suboptoff, subopt_len, ENC_ASCII); } else { expert_add_info_format(pinfo, vti, &ei_dhcpv6_bogus_length, "Bogus length: %d", subopt_len); } @@ -2270,7 +2270,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, proto_tree_add_item(subtree, hf_auth_replay_detection, tvb, off+3, 8, ENC_NA); if (optlen > 11+20 && algorithm == 1) { // RFC 3315, HMAC-MD5 (16) + Key ID (4) => 20 bytes if (optlen-11-20 < 256) { - proto_tree_add_item(subtree, hf_auth_realm, tvb, off+11, optlen-11-20, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_auth_realm, tvb, off+11, optlen-11-20, ENC_ASCII); } else { expert_add_info_format(pinfo, option_item, &ei_dhcpv6_malformed_option, "DHCP realm: probably malformed option"); } @@ -2290,7 +2290,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, case OPTION_STATUS_CODE: proto_tree_add_item(subtree, hf_opt_status_code, tvb, off, 2, ENC_BIG_ENDIAN); if (optlen > 2) - proto_tree_add_item(subtree, hf_opt_status_msg, tvb, off+2, optlen - 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_opt_status_msg, tvb, off+2, optlen - 2, ENC_ASCII); break; case OPTION_VENDOR_CLASS: if (optlen < 4) { @@ -2299,7 +2299,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, } proto_tree_add_item(subtree, hf_vendorclass_enterprise, tvb, off, 4, ENC_BIG_ENDIAN); if (optlen > 4) - proto_tree_add_item(subtree, hf_vendorclass_data, tvb, off+6, optlen-6, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_vendorclass_data, tvb, off+6, optlen-6, ENC_ASCII); break; case OPTION_VENDOR_OPTS: if (optlen < 4) { @@ -2336,9 +2336,9 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, if (cablelabs_interface_id) { gint namelen = tvb_strnlen(tvb, off, optlen)+1; if (namelen == 0) { - proto_tree_add_item(subtree, hf_cablelabs_interface_id, tvb, off, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_cablelabs_interface_id, tvb, off, optlen, ENC_ASCII); } else { - proto_tree_add_item(subtree, hf_cablelabs_interface_id, tvb, off, namelen-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_cablelabs_interface_id, tvb, off, namelen-1, ENC_ASCII); temp_optlen = optlen - namelen; off += namelen; @@ -2476,7 +2476,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, expert_add_info_format(pinfo, option_item, &ei_dhcpv6_malformed_option, "SUBSCRIBER_ID: malformed option"); break; } - proto_tree_add_item(subtree, hf_subscriber_id, tvb, off, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_subscriber_id, tvb, off, optlen, ENC_ASCII); break; case OPTION_CLIENT_FQDN: if (optlen < 1) { @@ -2583,16 +2583,16 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, break; case OPTION_TIME_ZONE: if (optlen > 0) - proto_tree_add_item(subtree, hf_opt_timezone, tvb, off, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_opt_timezone, tvb, off, optlen, ENC_ASCII); break; case OPTION_TZDB: if (optlen > 0) - proto_tree_add_item(subtree, hf_opt_tzdb, tvb, off, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_opt_tzdb, tvb, off, optlen, ENC_ASCII); break; case OPTION_MUDURL: if (optlen > 0) - proto_tree_add_item(subtree, hf_opt_mudurl, tvb, off, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_opt_mudurl, tvb, off, optlen, ENC_ASCII); break; case OPTION_LQ_QUERY: @@ -2651,7 +2651,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, } proto_tree_add_item(subtree, hf_lq_relay_data_peer_addr, tvb, off, 16, ENC_NA); - proto_tree_add_item(subtree, hf_lq_relay_data_msg, tvb, off+16, optlen - 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lq_relay_data_msg, tvb, off+16, optlen - 16, ENC_ASCII); break; case OPTION_LQ_CLIENT_LINK: if (optlen % 16) { @@ -2725,7 +2725,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, expert_add_info_format(pinfo, option_item, &ei_dhcpv6_malformed_option, "NAI: malformed option"); break; } - proto_tree_add_item(subtree, hf_nai, tvb, off, optlen - 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_nai, tvb, off, optlen - 2, ENC_ASCII); break; case OPTION_PD_EXCLUDE: if ((optlen < 2) || (optlen > 17)) { @@ -2737,7 +2737,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, break; case OPTION_CAPTIVE_PORTAL:{ proto_item *ti_cp; - ti_cp = proto_tree_add_item(subtree, hf_option_captive_portal, tvb, off, optlen, ENC_ASCII|ENC_NA); + ti_cp = proto_tree_add_item(subtree, hf_option_captive_portal, tvb, off, optlen, ENC_ASCII); proto_item_set_url(ti_cp); break; } diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 7bc8cde581..8b3749e73f 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -706,7 +706,7 @@ dissect_diameter_user_equipment_info_value(tvbuff_t *tvb, packet_info *pinfo, pr proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_BCD_DIGITS_0_9|ENC_NA); return len; } else if (len == 16) { - proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_diameter_user_equipment_info_imeisv, tvb, 0, len, ENC_ASCII); return len; } proto_tree_add_expert(tree, pinfo, &ei_diameter_invalid_user_equipment_info_value_len, tvb, 0, len); diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 3595ef73e2..1c1cde8660 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -1147,10 +1147,10 @@ dissect_diameter_3gpp_path(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr while (offset < end_offset) { comma_offset = tvb_find_guint8(tvb, offset, -1, ','); if(comma_offset == -1) { - proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII); return end_offset; } - proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII); offset = comma_offset+1; } @@ -1171,7 +1171,7 @@ dissect_diameter_3gpp_contact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_item *item; int offset = 0; - item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII); proto_item_set_generated(item); return tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 9c83c4aa18..9b64939216 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -5443,7 +5443,7 @@ static gint parseField_DIS_FIELDS_VARIABLE_DATUM(tvbuff_t *tvb, proto_tree *tree lengthInBytes += 1;/* add another byte for the remaining bits */ proto_tree_add_item(sub_tree, hf_dis_variable_datum_value, tvb, offset, lengthInBytes, ENC_NA); - proto_tree_add_item(sub_tree, hf_dis_variable_datum_value_as_text, tvb, offset, lengthInBytes, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_dis_variable_datum_value_as_text, tvb, offset, lengthInBytes, ENC_ASCII); offset += lengthInBytes; @@ -5627,13 +5627,13 @@ static int dissect_DIS_FIELDS_VR_APPLICATION_INITIALIZATION(tvbuff_t *tvb, proto proto_tree_add_item(tree, hf_dis_padding, tvb, offset, 1, ENC_NA); offset++; - proto_tree_add_item(tree, hf_dis_vr_exercise_file_path, tvb, offset, 256, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_vr_exercise_file_path, tvb, offset, 256, ENC_ASCII); offset += 256; - proto_tree_add_item(tree, hf_dis_vr_exercise_file_name, tvb, offset, 128, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_vr_exercise_file_name, tvb, offset, 128, ENC_ASCII); offset += 128; - proto_tree_add_item(tree, hf_dis_vr_application_role, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_vr_application_role, tvb, offset, 64, ENC_ASCII); offset += 64; return offset; @@ -7964,13 +7964,13 @@ static int dissect_DIS_PARSER_SIMULATOR_PRESENT_PO_PDU(tvbuff_t *tvb, packet_inf proto_tree_add_item(tree, hf_dis_relative_battle_scheme, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_dis_terrain_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_terrain_name, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(tree, hf_dis_terrain_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_dis_host_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dis_host_name, tvb, offset, 32, ENC_ASCII); offset += 32; return offset; diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 231bf91a92..1ce7fc3962 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -204,7 +204,7 @@ dissect_distcc_doti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off col_append_str(pinfo->cinfo, COL_INFO, "DOTI source "); - ti = proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_ASCII); if(len!=(gint)parameter){ expert_add_info_format(pinfo, ti, &ei_distcc_short_pdu, "[Short DOTI PDU]"); diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c index 72b8db04ec..b5f6f8e4f2 100644 --- a/epan/dissectors/packet-dlep.c +++ b/epan/dissectors/packet-dlep.c @@ -1037,7 +1037,7 @@ decode_signal_header(tvbuff_t *tvb, int offset, proto_item* pi, proto_tree *pt, tmp_pi = proto_tree_add_item(pt, hf_dlep_signal, tvb, offset, 0, ENC_NA); PROTO_ITEM_SET_HIDDEN(tmp_pi); - proto_tree_add_item(pt, hf_dlep_signal_signature, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_dlep_signal_signature, tvb, offset, 4, ENC_ASCII); offset+=4; proto_tree_add_item_ret_uint(pt, hf_dlep_signal_type, tvb, offset, 2, ENC_BIG_ENDIAN, &signal_type); diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 626c7cf817..cca2940456 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -785,7 +785,7 @@ dissect_dlm3_rcom_lock(tvbuff_t *tvb, proto_tree *tree, sub_offset = offset; proto_tree_add_item(sub_tree, hf_dlm3_rl_name_contents, tvb, sub_offset, - namelen, ENC_ASCII|ENC_NA); + namelen, ENC_ASCII); sub_offset += namelen; proto_tree_add_item(sub_tree, diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index c1a07ac52a..6573c1e487 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -3049,7 +3049,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, if (dmp.body_format == FREE_TEXT_SUBJECT) { len = tvb_strsize (tvb, offset); - proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_ASCII); offset += len; } @@ -3134,7 +3134,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, if (eit != EIT_BILATERAL && body_len > 0) { field_tree = proto_item_add_subtree (tf, ett_message_body); proto_tree_add_item (field_tree, hf_message_body_plain, body_tvb, - body_offset, body_len, ENC_ASCII|ENC_NA); + body_offset, body_len, ENC_ASCII); } } offset += len; @@ -3285,7 +3285,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo, 128 - (offset - boffset)); } field_tree = proto_item_add_subtree (tf, ett_report_suppl_info); - proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_ASCII); } offset += len; } @@ -3358,7 +3358,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, 128 - (offset - boffset)); } field_tree = proto_item_add_subtree (tf, ett_notif_suppl_info); - proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_ASCII); } offset += len; @@ -3374,7 +3374,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item_append_text (tf, " (incorrect, must be less than 64)"); } field_tree = proto_item_add_subtree (tf, ett_notif_acp127recip); - proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_ASCII); } offset += len; } diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c index db9af81d66..621b5f35f9 100644 --- a/epan/dissectors/packet-dmx.c +++ b/epan/dissectors/packet-dmx.c @@ -355,7 +355,7 @@ dissect_dmx_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data size = tvb_reported_length_remaining(tvb, offset); proto_tree_add_item(dmx_text_tree, hf_dmx_text_string, tvb, - offset, size, ENC_ASCII|ENC_NA); + offset, size, ENC_ASCII); } return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 4f05033527..7927348a15 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2804,7 +2804,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, /* Filename */ if (al_filename_len > 0) { - proto_tree_add_item(point_tree, hf_dnp3_al_file_name, tvb, data_pos, al_filename_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(point_tree, hf_dnp3_al_file_name, tvb, data_pos, al_filename_len, ENC_ASCII); } data_pos += al_filename_len; proto_item_set_len(point_item, data_pos - offset); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 9cd3417c7c..12bbd2dd6f 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2343,12 +2343,12 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree_add_item(rr_tree, hf_dns_hinfo_cpu_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_hinfo_cpu, tvb, cur_offset, cpu_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_hinfo_cpu, tvb, cur_offset, cpu_len, ENC_ASCII); cur_offset += cpu_len; proto_tree_add_item(rr_tree, hf_dns_hinfo_os_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_hinfo_os, tvb, cur_offset, os_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_hinfo_os, tvb, cur_offset, os_len, ENC_ASCII); /* cur_offset += os_len;*/ } break; @@ -2455,7 +2455,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, x25_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_x25_psdn_address, tvb, cur_offset, x25_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_x25_psdn_address, tvb, cur_offset, x25_len, ENC_ASCII); /*cur_offset += x25_len;*/ } break; @@ -2472,7 +2472,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, cur_offset += 1; rr_len -= 1; - proto_tree_add_item(rr_tree, hf_dns_isdn_address, tvb, cur_offset, isdn_address_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_isdn_address, tvb, cur_offset, isdn_address_len, ENC_ASCII); cur_offset += isdn_address_len; rr_len -= isdn_address_len; @@ -2481,7 +2481,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, isdn_sa_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_isdn_sa, tvb, cur_offset, isdn_sa_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_isdn_sa, tvb, cur_offset, isdn_sa_len, ENC_ASCII); } } break; @@ -2601,21 +2601,21 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, long_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_gpos_longitude, tvb, cur_offset, long_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_longitude, tvb, cur_offset, long_len, ENC_ASCII); cur_offset += long_len; proto_tree_add_item(rr_tree, hf_dns_gpos_latitude_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); lat_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_gpos_latitude, tvb, cur_offset, lat_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_latitude, tvb, cur_offset, lat_len, ENC_ASCII); cur_offset += lat_len; proto_tree_add_item(rr_tree, hf_dns_gpos_altitude_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN); alt_len = tvb_get_guint8(tvb, cur_offset); cur_offset += 1; - proto_tree_add_item(rr_tree, hf_dns_gpos_altitude, tvb, cur_offset, alt_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_gpos_altitude, tvb, cur_offset, alt_len, ENC_ASCII); /*cur_offset += alt_len;*/ } break; @@ -2762,14 +2762,14 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree_add_item(rr_tree, hf_dns_naptr_service_length, tvb, offset, 1, ENC_BIG_ENDIAN); service_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(rr_tree, hf_dns_naptr_service, tvb, offset, service_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_naptr_service, tvb, offset, service_len, ENC_ASCII); offset += service_len; /* Regex */ proto_tree_add_item(rr_tree, hf_dns_naptr_regex_length, tvb, offset, 1, ENC_BIG_ENDIAN); regex_len = tvb_get_guint8(tvb, offset); offset += 1; - proto_tree_add_item(rr_tree, hf_dns_naptr_regex, tvb, offset, regex_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_naptr_regex, tvb, offset, regex_len, ENC_ASCII); offset += regex_len; /* Replacement */ @@ -3043,7 +3043,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, case O_CHAIN: { if (optlen) { - proto_tree_add_item(rropt_tree, hf_dns_opt_chain_fqdn, tvb, cur_offset, optlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(rropt_tree, hf_dns_opt_chain_fqdn, tvb, cur_offset, optlen, ENC_ASCII); } cur_offset += optlen; rropt_len -= optlen; @@ -3482,7 +3482,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, case T_OPENPGPKEY: /* OpenPGP Key (61) */ { - proto_tree_add_item(rr_tree, hf_dns_openpgpkey, tvb, cur_offset, data_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_openpgpkey, tvb, cur_offset, data_len, ENC_ASCII); } break; @@ -3627,7 +3627,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree_add_item(rr_tree, hf_dns_spf_length, tvb, spf_offset, 1, ENC_BIG_ENDIAN); spf_offset += 1; rr_len -= 1; - proto_tree_add_item(rr_tree, hf_dns_spf, tvb, spf_offset, spf_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rr_tree, hf_dns_spf, tvb, spf_offset, spf_len, ENC_ASCII); spf_offset += spf_len; rr_len -= spf_len; } diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c index 02bd30ea1a..9c32801e29 100644 --- a/epan/dissectors/packet-docsis-macmgmt.c +++ b/epan/dissectors/packet-docsis-macmgmt.c @@ -3744,7 +3744,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_RESERVED: break; case BPKM_SERIAL_NUM: - proto_tree_add_item (attr_tree, hf_docsis_bpkmattr_serial_num, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item (attr_tree, hf_docsis_bpkmattr_serial_num, tvb, pos, length, ENC_ASCII); break; case BPKM_MANUFACTURER_ID: if (length == 3) @@ -3768,7 +3768,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dissect_attrs (attr_tvb, pinfo, attr_subtree); break; case BPKM_DISPLAY_STR: - proto_tree_add_item (attr_tree, hf_docsis_bpkmattr_display_str, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item (attr_tree, hf_docsis_bpkmattr_display_str, tvb, pos, length, ENC_ASCII); break; case BPKM_AUTH_KEY: if ((length == 96) || (length == 128) || (length == 256)) diff --git a/epan/dissectors/packet-docsis-tlv.c b/epan/dissectors/packet-docsis-tlv.c index 6ded4f83ed..d39b57d8ec 100644 --- a/epan/dissectors/packet-docsis-tlv.c +++ b/epan/dissectors/packet-docsis-tlv.c @@ -1014,7 +1014,7 @@ dissect_phs_err (tvbuff_t * tvb, packet_info *pinfo, proto_tree * tree, int star break; case PHS_ERR_MSG: proto_tree_add_item (err_tree, hf_docsis_tlv_phs_err_msg, tvb, pos, - length, ENC_ASCII|ENC_NA); + length, ENC_ASCII); break; default: dissect_unknown_tlv (tvb, pinfo, err_tree, pos - 2, length + 2); @@ -1231,7 +1231,7 @@ dissect_sflow_err (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int st break; case SFW_ERR_MSG: proto_tree_add_item (err_tree, hf_docsis_tlv_sflow_err_msg, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); break; default: dissect_unknown_tlv (tvb, pinfo, err_tree, pos - 2, length + 2); @@ -1511,7 +1511,7 @@ dissect_sflow (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int start, break; case SFW_SERVICE_CLASS_NAME: proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_classname, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); break; case SFW_ERRORS: dissect_sflow_err (tvb, pinfo, sflow_tree, pos, length); @@ -1852,7 +1852,7 @@ dissect_clsfr_err (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int st break; case CFR_ERR_MSG: proto_tree_add_item (err_tree, hf_docsis_tlv_clsfr_err_msg, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); break; default: dissect_unknown_tlv (tvb, pinfo, err_tree, pos - 2, length + 2); @@ -3210,7 +3210,7 @@ dissect_snmpv3_kickstart(tvbuff_t * tvb, packet_info * pinfo, proto_tree *tree, case SNMPV3_SEC_NAME: proto_tree_add_item (snmpv3_tree, hf_docsis_tlv_snmpv3_kick_name, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); break; case SNMPV3_MGR_PUB_NUM: proto_tree_add_item (snmpv3_tree, @@ -3499,7 +3499,7 @@ dissect_tcc_err(tvbuff_t * tvb, packet_info* pinfo, proto_tree *tree, int start, case TCC_ERR_MSG: proto_tree_add_item (tccerr_tree, hf_docsis_tcc_err_msg, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); break; default: dissect_unknown_tlv (tvb, pinfo, tccerr_tree, pos - 2, length + 2); @@ -5200,7 +5200,7 @@ dissect_docsis_tlv (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void break; case TLV_SW_UPG_FILE: proto_tree_add_item (tlv_tree, hf_docsis_tlv_sw_file, tvb, pos, - length, ENC_ASCII|ENC_NA); + length, ENC_ASCII); break; case TLV_SNMP_WRITE_CTRL: proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb, diff --git a/epan/dissectors/packet-docsis-vendor.c b/epan/dissectors/packet-docsis-vendor.c index 4d5729585b..52ca798d0d 100644 --- a/epan/dissectors/packet-docsis-vendor.c +++ b/epan/dissectors/packet-docsis-vendor.c @@ -202,7 +202,7 @@ dissect_cisco (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint vsif break; case IOS_CONFIG_FILE: proto_tree_add_item (tree, hf_docsis_vsif_cisco_config_file, tvb, - pos, length, ENC_ASCII|ENC_NA); + pos, length, ENC_ASCII); } pos += length; } @@ -366,7 +366,7 @@ dissect_sav(tvbuff_t * tvb, packet_info * pinfo, proto_tree *tree, int start, g switch (type) { case GEX_SAV_GROUP_NAME: - proto_tree_add_item (sav_tree, hf_docsis_vsif_gex_sav_group_name, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item (sav_tree, hf_docsis_vsif_gex_sav_group_name, tvb, pos, length, ENC_ASCII); break; case GEX_SAV_STATIC_PREFIX_RULE: dissect_sav_static_prefix_rule(tvb, pinfo, sav_tree, pos, length); @@ -532,7 +532,7 @@ dissect_ip_multicast_join_authorization(tvbuff_t * tvb, packet_info * pinfo, pr if ((length < 1) || (length > 15)) { expert_add_info_format(pinfo, imja_it, &ei_docsis_vsif_tlvlen_bad, "Wrong TLV length: %u", length); } - proto_tree_add_item (imja_tree, hf_docsis_vsif_gex_imja_ip_multicast_profile_name, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item (imja_tree, hf_docsis_vsif_gex_imja_ip_multicast_profile_name, tvb, pos, length, ENC_ASCII); break; case GEX_IMJA_IP_MULTICAST_PROFILE_JOIN_AUTHORIZATION_STATIC_SESSION_RULE: dissect_ip_multicast_join_authorization_static_session_rule(tvb, pinfo, imja_tree, pos, length); @@ -608,7 +608,7 @@ dissect_general_extension_information (tvbuff_t * tvb, packet_info * pinfo, prot dissect_ip_multicast_join_authorization(tvb, pinfo, tree, pos, length); break; case GEX_SERVICE_TYPE_IDENTIFIER: - proto_tree_add_item (tree, hf_docsis_vsif_gex_service_type_identifier, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_docsis_vsif_gex_service_type_identifier, tvb, pos, length, ENC_ASCII); break; default: proto_tree_add_item (tree, hf_docsis_vsif_tlv_unknown, tvb, pos, length, ENC_NA); diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 59eade35b6..581858724b 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -698,7 +698,7 @@ static gint dissect_dplay_header(proto_tree *tree, tvbuff_t *tvb, gint offset) proto_tree_add_uint(tree, hf_dplay_token, tvb, offset, 4, token); offset += 4; offset = dissect_sockaddr_in(tree, tvb, offset); - proto_tree_add_item(tree, hf_dplay_play_str, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; + proto_tree_add_item(tree, hf_dplay_play_str, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(tree, hf_dplay_command, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_dplay_proto_dialect, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; @@ -849,7 +849,7 @@ static gint dissect_type15_message(proto_tree *tree, tvbuff_t *tvb, gint offset) enc_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_dplay_enc_packet, NULL, "DirectPlay encapsulated packet"); - proto_tree_add_item(enc_tree, hf_dplay_play_str_2, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; + proto_tree_add_item(enc_tree, hf_dplay_play_str_2, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(enc_tree, hf_dplay_command_2, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(enc_tree, hf_dplay_proto_dialect_2, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index a2ea1826b1..ef41211ec3 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -934,7 +934,7 @@ dissect_dpnns_sup_str_par(tvbuff_t *tvb, proto_tree * tree, int par_type_num, in case DPNSS_SIC: */ case DPNSS_A_B_PARTY_ADDR: - proto_tree_add_item(tree, hf_dpnss_a_b_party_addr, tvb, par_start_offset, par_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dpnss_a_b_party_addr, tvb, par_start_offset, par_len, ENC_ASCII); break; /* @@ -944,7 +944,7 @@ dissect_dpnns_sup_str_par(tvbuff_t *tvb, proto_tree * tree, int par_type_num, in case DPNSS_TEXT: */ case DPNSS_CALL_INDEX: - proto_tree_add_item(tree, hf_dpnss_call_idx, tvb, par_start_offset, par_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dpnss_call_idx, tvb, par_start_offset, par_len, ENC_ASCII); break; /* @@ -1147,7 +1147,7 @@ dissect_dpnss_sup_info_str(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr str_no++; } else { last_string = TRUE; - proto_tree_add_item(tree, hf_dpnss_dest_addr, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dpnss_dest_addr, tvb, offset, -1, ENC_ASCII); } } return offset; diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index b1bc248df7..34d2e47c62 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -206,7 +206,7 @@ dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, case DTP_TLV_DOMAIN: if (length <= 33) { /* VTP domain name is at most 32 bytes long and is null-terminated */ proto_item_append_text(ti, ": %s", tvb_format_text(pinfo->pool, tvb, offset, length - 1)); - proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_ASCII); } else expert_add_info(pinfo, tlv_length_item, &ei_dtp_tlv_length_invalid); diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index 789d585968..be3c731af3 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -99,7 +99,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_text_interface_id, - parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); + parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); } @@ -113,7 +113,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, - parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); + parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index afd363436b..54028bc35e 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -181,7 +181,7 @@ dissect_dvb_ait_app_name_desc_body(tvbuff_t *tvb, guint offset, offset_start = offset; while (offset-offset_start < body_len) { proto_tree_add_item(tree, hf_dvb_ait_descr_app_name_lang, - tvb, offset, 3, ENC_ASCII|ENC_NA); + tvb, offset, 3, ENC_ASCII); offset += 3; len = tvb_get_guint8(tvb, offset); /* FT_UINT_STRING with 1 leading len byte */ @@ -315,7 +315,7 @@ dissect_dvb_ait_descriptor(tvbuff_t *tvb, guint offset, case AIT_DESCR_SIM_APP_LOC: proto_tree_add_item(descr_tree, hf_dvb_ait_descr_sal_init_path, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); offset += len; break; default: diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index e2733bfe47..0a7d4385d3 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -2015,7 +2015,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset, conversation_t *conv, /* everything from here to the descriptor's end is a hostname */ hostname_len = (offset_body+len_field)-offset; proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_hostname, - tvb, offset, hostname_len, ENC_ASCII|ENC_NA); + tvb, offset, hostname_len, ENC_ASCII); offset += hostname_len; } else { proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_media_data, @@ -3614,7 +3614,7 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_, case T_CC_PIN_MMI_REQ: proto_tree_add_item(tree, hf_dvbci_pincode, tvb, offset, tvb_reported_length_remaining(tvb, offset), - ENC_ASCII|ENC_NA); + ENC_ASCII); break; default: break; @@ -3761,7 +3761,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, } offset += app_dom_id_len; proto_tree_add_item(tree, hf_dvbci_init_obj, - tvb, offset, init_obj_len, ENC_ASCII|ENC_NA); + tvb, offset, init_obj_len, ENC_ASCII); break; case T_REQUEST_START_ACK: ack_code = tvb_get_guint8(tvb, offset); @@ -4080,7 +4080,7 @@ dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_dvbci_opp_lang_code, - tvb, offset, 3, ENC_ASCII|ENC_NA); + tvb, offset, 3, ENC_ASCII); offset += 3; /* hf_dvbci_prof_name is an FT_UINT_STRING, one leading len byte */ proto_tree_add_item(tree, hf_dvbci_prof_name, @@ -4831,14 +4831,14 @@ dissect_dvbci_cis_payload_tpll_v1(tvbuff_t *data_tvb, if (offset_str_end<offset) /* offset_str_end==offset is ok */ return offset; proto_tree_add_item(tree, hf_dvbci_cis_tpll_v1_info_manuf, - data_tvb, offset, offset_str_end-offset, ENC_ASCII|ENC_NA); + data_tvb, offset, offset_str_end-offset, ENC_ASCII); offset = offset_str_end+1; /* +1 for 0 termination */ offset_str_end = tvb_find_guint8(data_tvb, offset, -1, 0x0); if (offset_str_end<offset) return offset; proto_tree_add_item(tree, hf_dvbci_cis_tpll_v1_info_name, - data_tvb, offset, offset_str_end-offset, ENC_ASCII|ENC_NA); + data_tvb, offset, offset_str_end-offset, ENC_ASCII); offset = offset_str_end+1; /* the pc-card spec mentions two additional info strings, @@ -4849,7 +4849,7 @@ dissect_dvbci_cis_payload_tpll_v1(tvbuff_t *data_tvb, if (offset_str_end<offset) break; proto_tree_add_item(tree, hf_dvbci_cis_tpll_v1_info_additional, - data_tvb, offset, offset_str_end-offset, ENC_ASCII|ENC_NA); + data_tvb, offset, offset_str_end-offset, ENC_ASCII); offset = offset_str_end+1; } @@ -4921,7 +4921,7 @@ dissect_dvbci_cis_payload_config(tvbuff_t *data_tvb, /* the stci_str field could consist of multiple strings, this case is not supported for now */ proto_tree_add_item(st_tree, hf_dvbci_cis_stci_str, - data_tvb, offset, st_len-stci_ifn_size, ENC_ASCII|ENC_NA); + data_tvb, offset, st_len-stci_ifn_size, ENC_ASCII); offset += st_len-stci_ifn_size; } else { diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 81fef2a9a0..c10ecdd888 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -780,7 +780,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in if (left <= 0) break; proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_name, - tvb, offset, left, ENC_ASCII|ENC_NA); + tvb, offset, left, ENC_ASCII); break; case MS_CHAP_V2_RESPONSE: if (left <= 0) @@ -811,19 +811,19 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in } if (left <= 0) break; - proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_name, tvb, offset, left, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_name, tvb, offset, left, ENC_ASCII); break; case MS_CHAP_V2_SUCCESS: if (left <= 0) break; proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_message, - tvb, offset, left, ENC_ASCII|ENC_NA); + tvb, offset, left, ENC_ASCII); break; case MS_CHAP_V2_FAILURE: if (left <= 0) break; proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_failure_request, - tvb, offset, left, ENC_ASCII|ENC_NA); + tvb, offset, left, ENC_ASCII); break; default: proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_data, tvb, offset, left, ENC_NA); @@ -882,7 +882,7 @@ dissect_eap_identity_wlan(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, i /* tokens[0] is the identity, tokens[1] is the NAI Realm */ if (ntokens != 2) { ret = FALSE; - proto_tree_add_item(tree, hf_eap_identity, tvb, offset, size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_eap_identity, tvb, offset, size, ENC_ASCII); goto end; } @@ -899,7 +899,7 @@ dissect_eap_identity_wlan(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, i g_ascii_strncasecmp(realm_tokens[3], "3gppnetwork", 11) || g_ascii_strncasecmp(realm_tokens[4], "org", 3)) { ret = FALSE; - proto_tree_add_item(tree, hf_eap_identity, tvb, offset, size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_eap_identity, tvb, offset, size, ENC_ASCII); goto end; } } @@ -928,27 +928,27 @@ dissect_eap_identity_wlan(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, i case '3': /* EAP-SIM Pseudonym */ case '7': /* EAP-AKA' Pseudonym */ proto_tree_add_item(eap_identity_tree, hf_eap_identity_full, tvb, offset + 1, size - 1, ENC_ASCII || ENC_NA); - proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII); break; case '4': /* EAP-AKA Reauth ID */ case '5': /* EAP-SIM Reauth ID */ case '8': /* EAP-AKA' Reauth ID */ proto_tree_add_item(eap_identity_tree, hf_eap_identity_full, tvb, offset + 1, size - 1, ENC_ASCII || ENC_NA); - proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII); break; case 'C': /* Conservative Peer */ proto_tree_add_item(eap_identity_tree, hf_eap_identity_full, tvb, offset + 1, size - 1, ENC_ASCII || ENC_NA); - proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII); break; case 'a': /* Anonymous User */ proto_tree_add_item(eap_identity_tree, hf_eap_identity_full, tvb, offset, size, ENC_ASCII || ENC_NA); - proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset, (guint)strlen(tokens[0]), ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset, (guint)strlen(tokens[0]), ENC_ASCII); break; case 'G': /* TODO: 'G' Unknown */ case 'I': /* TODO: 'I' Unknown */ default: proto_tree_add_item(eap_identity_tree, hf_eap_identity_full, tvb, offset + 1, size - 1, ENC_ASCII || ENC_NA); - proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_identity_tree, hf_eap_identity, tvb, offset + 1, (guint)strlen(tokens[0]) - 1, ENC_ASCII); expert_add_info(pinfo, item, &ei_eap_identity_invalid); } @@ -963,7 +963,7 @@ dissect_eap_identity_wlan(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, i /* Add Certificate Serial Number to the tree */ proto_tree_add_item(eap_identity_tree, hf_eap_identity_certificate_sn, tvb, offset + 1 + (guint)strlen(tokens[0]) + 1 + (guint)strlen("CertificateSerialNumber="), - (guint)strlen(tokens[1]) - (guint)strlen("CertificateSerialNumber="), ENC_ASCII|ENC_NA); + (guint)strlen(tokens[1]) - (guint)strlen("CertificateSerialNumber="), ENC_ASCII); /* Check for the optional NAI Realm string */ if (ntokens != 3 || g_ascii_strncasecmp(tokens[2], "Realm", 5)) { @@ -1756,7 +1756,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) **********************************************************************/ case EAP_TYPE_NOTIFY: proto_tree_add_item(eap_tree, hf_eap_notification, tvb, - offset, size, ENC_ASCII|ENC_NA); + offset, size, ENC_ASCII); break; /********************************************************************* @@ -2166,7 +2166,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* Name (Length-(8+Count)) */ namesize = eap_len - (8+count); - proto_tree_add_item(eap_tree, hf_eap_leap_name, tvb, offset, namesize, ENC_ASCII|ENC_NA); + proto_tree_add_item(eap_tree, hf_eap_leap_name, tvb, offset, namesize, ENC_ASCII); } break; /* EAP_TYPE_LEAP */ diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 5603eeeab7..f2553b5687 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -678,7 +678,7 @@ static proto_item* edonkey_tree_add_metatag_name(proto_tree *tree, tvbuff_t *tvb */ tag_name = try_val_to_str(special_tagtype, edonkey_special_tags); if (tag_name == NULL) { - return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, ENC_ASCII|ENC_NA); + return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, ENC_ASCII); } else { return proto_tree_add_uint_format(tree, hf_edonkey_metatag_id, tvb, start, length, @@ -765,7 +765,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size); edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); proto_tree_add_uint(metatag_tree, hf_edonkey_string_length, tvb, tag_offset, 2, string_length); - proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, ENC_ASCII); break; case EDONKEY_MTAG_DWORD: @@ -884,7 +884,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_, if (real_tag_type==tag_type) proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size); edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); - proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, ENC_ASCII); } else { /* Unknown tag type - actual tag length is also unknown */ @@ -998,7 +998,7 @@ static int dissect_kademlia_string(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); /* TODO: ASCII or UTF-8? */ - proto_tree_add_item(tree, hf_edonkey_kademlia_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_edonkey_kademlia_string, tvb, offset+2, string_length, ENC_ASCII); return offset+2+string_length; } @@ -1138,7 +1138,7 @@ static int dissect_kademlia_tag_string(tvbuff_t *tvb, packet_info *pinfo _U_, hidden_item = proto_tree_add_item_ret_string(tree, hf_edonkey_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA, wmem_packet_scope(), string_value); proto_item_set_hidden(hidden_item); - proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, ENC_ASCII); return offset + 2 + string_length; } @@ -1166,7 +1166,7 @@ static int dissect_edonkey_string(tvbuff_t *tvb, packet_info *pinfo _U_, /* <String> ::= <String length (guint16)> DATA */ guint16 string_length = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII); return offset+2+string_length; } @@ -1177,7 +1177,7 @@ static int dissect_edonkey_directory(tvbuff_t *tvb, packet_info *pinfo _U_, /* <Directory> ::= <String> */ guint16 string_length = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, ENC_ASCII); return offset+2+string_length; } @@ -1695,7 +1695,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo, /* Add query info */ proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length); - proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII); offset += search_length; break; @@ -1716,7 +1716,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo, /* Add query info */ proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length); - proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII); proto_tree_add_uint(search_tree, hf_edonkey_metatag_namesize, tvb, tag_name_offset, 2, tag_name_size); edonkey_tree_add_metatag_name(search_tree, tvb, tag_name_offset+2, tag_name_size, special_tagtype); offset += search_length; diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c index 19e53c593b..b0d90ee52e 100644 --- a/epan/dissectors/packet-elasticsearch.c +++ b/epan/dissectors/packet-elasticsearch.c @@ -444,7 +444,7 @@ static int elasticsearch_dissect_valid_binary_packet(tvbuff_t *tvb, packet_info * * Token/Magic number that is at the start of all ES packets */ - proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_ASCII); offset += 2; /* Message length */ diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index 16827ef7be..25ed68d8d9 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -167,7 +167,7 @@ dissect_elmi_sub_info_elem( switch (sub_tag) { case SUB_TAG_UNI_ID: - proto_tree_add_item(sub_info_elem_tree, hf_elmi_uni_id, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_info_elem_tree, hf_elmi_uni_id, tvb, offset, len, ENC_ASCII); offset += len; break; case SUB_TAG_EVC_PRM: @@ -175,7 +175,7 @@ dissect_elmi_sub_info_elem( offset++; break; case SUB_TAG_EVC_ID: - proto_tree_add_item(sub_info_elem_tree, hf_elmi_evc_id, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_info_elem_tree, hf_elmi_evc_id, tvb, offset, len, ENC_ASCII); offset += len; break; case SUB_TAG_EVC_MAP: diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 76ad7dd448..8624ba22ca 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1485,7 +1485,7 @@ dissect_tcpip_interface_config(packet_info *pinfo, proto_tree *tree, proto_item proto_tree_add_item(tree, hf_tcpip_ic_name_server2, tvb, offset+16, 4, ENC_LITTLE_ENDIAN); domain_length = tvb_get_letohs( tvb, offset+20); - proto_tree_add_item(tree, hf_tcpip_ic_domain_name, tvb, offset+22, domain_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tcpip_ic_domain_name, tvb, offset+22, domain_length, ENC_ASCII); /* Add padding. */ domain_length += domain_length % 2; @@ -2133,7 +2133,7 @@ dissect_eip_cert_cert_list(packet_info *pinfo, proto_tree *tree, proto_item *ite for (i = 0; i < num; i++) { path_size = tvb_get_guint8( tvb, offset ); - proto_tree_add_item(tree, hf_eip_cert_cert_name, tvb, offset+1, path_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_eip_cert_cert_name, tvb, offset+1, path_size, ENC_ASCII); offset += (1+path_size); path_size = dissect_padded_epath_len_usint(pinfo, cert_tree, ti, tvb, offset, total_len); diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index ca4a49a58d..21925c4017 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -119,7 +119,7 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_enttec_poll_reply_name, tvb, - offset, 10, ENC_ASCII|ENC_NA); + offset, 10, ENC_ASCII); offset += 10; proto_tree_add_item(tree, hf_enttec_poll_reply_option, tvb, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index debd174010..9efd797a94 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -3512,7 +3512,7 @@ dissect_epl_asnd_ires(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *t proto_tree_add_ipv4(epl_tree , hf_epl_asnd_identresponse_gtw, tvb, offset, 4, epl_asnd_identresponse_gtw); offset += 4; - proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_hn, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_hn, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex2, tvb, offset, 48, ENC_NA); diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index f3c1f10298..ff5fb9d69b 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -493,7 +493,7 @@ read_string(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree) byteLength = read_length(offset, tvb, etch_tree); proto_tree_add_item(etch_tree, hf_etch_string, tvb, *offset, - byteLength, ENC_ASCII|ENC_NA); + byteLength, ENC_ASCII); (*offset) += byteLength; } diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index ff47eae609..27a43270fa 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1233,7 +1233,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x04: /* 8bit */ /* XXX - ASCII, or some extended ASCII? */ - proto_tree_add_item(elem_tree, hf_ctlv_text_string, tvb, pos+1, len-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_text_string, tvb, pos+1, len-1, ENC_ASCII); break; case 0x08: /* UCS2 */ proto_tree_add_item(elem_tree, hf_ctlv_text_string, tvb, pos+1, len-1, ENC_UCS_2|ENC_BIG_ENDIAN); @@ -1341,16 +1341,16 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } break; case 0x28: /* AT Command */ - proto_tree_add_item(elem_tree, hf_ctlv_at_cmd, tvb, pos, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_at_cmd, tvb, pos, len, ENC_ASCII); break; case 0x29: /* AT Response */ - proto_tree_add_item(elem_tree, hf_ctlv_at_rsp, tvb, pos, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_at_rsp, tvb, pos, len, ENC_ASCII); break; case 0x2c: /* DTMF string */ dissect_cat_efadn_coding(tvb, elem_tree, pos, len, hf_ctlv_dtmf_string); break; case 0x2d: /* language */ - proto_tree_add_item(elem_tree, hf_ctlv_language, tvb, pos, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(elem_tree, hf_ctlv_language, tvb, pos, len, ENC_ASCII); break; case 0x2e: /* Timing Advance */ proto_tree_add_item(elem_tree, hf_ctlv_me_status, tvb, pos, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 149d185aff..92a26dc9d7 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -2481,7 +2481,7 @@ dissect_dpt_trailer_noise_low(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre gint viplen = tvb_get_guint8(tvb, offset); /* Make sure VIP Name Length does not extend past the TVB */ if (tvb_reported_length_remaining(tvb, offset) < viplen) { - pi = proto_tree_add_item(tree, hf_vip, tvb, offset, 0, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(tree, hf_vip, tvb, offset, 0, ENC_ASCII); expert_add_info(pinfo, pi, &ei_f5eth_badlen); /* Cannot go any further */ return len; @@ -2492,7 +2492,7 @@ dissect_dpt_trailer_noise_low(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre "Virtual Server: %s", text); proto_tree_add_item(ti, hf_vipnamelen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ti, hf_vip, tvb, offset, viplen, ENC_ASCII|ENC_NA); + proto_tree_add_item(ti, hf_vip, tvb, offset, viplen, ENC_ASCII); if (viplen > 0 && have_tap_listener(tap_f5ethtrailer)) { tdata->virtual_name = text; } diff --git a/epan/dissectors/packet-fbzero.c b/epan/dissectors/packet-fbzero.c index e56561d524..4679fd5d86 100644 --- a/epan/dissectors/packet-fbzero.c +++ b/epan/dissectors/packet-fbzero.c @@ -258,7 +258,7 @@ dissect_fb_zero_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fb_zero_tree, if(tag_offset_valid){ while(offset_end - tag_offset >= 4){ proto_tree *ti_aead; - ti_aead = proto_tree_add_item(tag_tree, hf_fb_zero_tag_aead, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + ti_aead = proto_tree_add_item(tag_tree, hf_fb_zero_tag_aead, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); proto_item_append_text(ti_aead, " (%s)", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_aead_vals, "Unknown")); proto_item_append_text(ti_tag, ", %s", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_aead_vals, "Unknown")); tag_offset += 4; @@ -328,7 +328,7 @@ dissect_fb_zero_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fb_zero_tree, if(tag_offset_valid){ while(offset_end - tag_offset >= 4){ proto_tree *ti_kexs; - ti_kexs = proto_tree_add_item(tag_tree, hf_fb_zero_tag_kexs, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + ti_kexs = proto_tree_add_item(tag_tree, hf_fb_zero_tag_kexs, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); proto_item_append_text(ti_kexs, " (%s)", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_kexs_vals, "Unknown")); proto_item_append_text(ti_tag, ", %s", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_kexs_vals, "Unknown")); tag_offset += 4; @@ -455,7 +455,7 @@ dissect_fb_zero_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if(puflags & PUFLAGS_VRSN){ version = tvb_get_ntoh24(tvb, offset); if(version == VERSION_QTV){ - proto_tree_add_item(fb_zero_tree, hf_fb_zero_version, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(fb_zero_tree, hf_fb_zero_version, tvb, offset, 3, ENC_ASCII); offset += 3; } } diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 63e87c4f24..aa984e7691 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -498,7 +498,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (len) { proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb, - offset+13, len, ENC_ASCII|ENC_NA); + offset+13, len, ENC_ASCII); } if (tvb_offset_exists (tvb, 292)) { @@ -511,7 +511,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) offset+276, 1, ENC_BIG_ENDIAN); if (len) { proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, - offset+277, len, ENC_ASCII|ENC_NA); + offset+277, len, ENC_ASCII); } } if (tvb_offset_exists (tvb, 556)) { @@ -621,7 +621,7 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb, - offset+1, len, ENC_ASCII|ENC_NA); + offset+1, len, ENC_ASCII); } } } @@ -813,7 +813,7 @@ dissect_fcdns_gsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, - offset+1, len, ENC_ASCII|ENC_NA); + offset+1, len, ENC_ASCII); } } } @@ -1054,7 +1054,7 @@ dissect_fcdns_rspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) len = tvb_get_guint8 (tvb, offset+4); proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } } @@ -1089,7 +1089,7 @@ dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += 256; len -= 256; } @@ -1131,7 +1131,7 @@ dissect_fcdns_rsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } } @@ -1214,7 +1214,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb, - offset+1, len, ENC_ASCII|ENC_NA); + offset+1, len, ENC_ASCII); offset += 256; } proto_tree_add_item (tree, hf_fcdns_rply_nname, tvb, offset, 8, ENC_NA); @@ -1224,7 +1224,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb, - offset+1, len, ENC_ASCII|ENC_NA); + offset+1, len, ENC_ASCII); offset += 256; } proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA); @@ -1370,7 +1370,7 @@ dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) str_len = tvb_get_guint8 (tvb, offset); proto_tree_add_uint(req_tree, hf_fcdns_zonelen, tvb, offset, 1, str_len); proto_tree_add_item (req_tree, hf_fcdns_zonenm, tvb, offset+3, - str_len, ENC_ASCII|ENC_NA); + str_len, ENC_ASCII); } } else { diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 9376e01bec..cdde38bfb0 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -242,17 +242,17 @@ dissect_fcfcs_gieil (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) prevlen = 0; len = tvb_strsize(tvb, offset+4); proto_tree_add_item (tree, hf_fcs_vendorname, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); prevlen += len; len = tvb_strsize(tvb, offset+4+prevlen); proto_tree_add_item (tree, hf_fcs_modelname, tvb, offset+4+prevlen, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); prevlen += len; len = tvb_strsize(tvb, offset+4+prevlen); proto_tree_add_item (tree, hf_fcs_releasecode, tvb, - offset+4+prevlen, len, ENC_ASCII|ENC_NA); + offset+4+prevlen, len, ENC_ASCII); prevlen += len; offset += (4+prevlen); while (tot_len > prevlen) { diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 5d6071bdee..7182d5dfae 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -115,7 +115,7 @@ dissect_fcfzs_zoneset(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int o proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += 4 + len + (4-(len % 4)); @@ -130,7 +130,7 @@ dissect_fcfzs_zoneset(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int o proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += 4 + len + (4-(len % 4)); nummbrs = tvb_get_ntohl(tvb, offset); @@ -237,7 +237,7 @@ dissect_fcfzs_gzsn(tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += len + 1 + (len % 4); proto_tree_add_item(tree, hf_fcfzs_numzones, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -259,7 +259,7 @@ dissect_fcfzs_gzd(tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } else { numrec = tvb_get_ntohl(tvb, offset); @@ -273,7 +273,7 @@ dissect_fcfzs_gzd(tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += len + 1 + (len % 4); proto_tree_add_item(tree, hf_fcfzs_nummbrs, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -295,7 +295,7 @@ dissect_fcfzs_gzm(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gboolean proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } else { numrec = tvb_get_ntohl(tvb, offset); @@ -348,7 +348,7 @@ dissect_fcfzs_gzs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gboolean proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } else { dissect_fcfzs_zoneset(tvb, pinfo, tree, offset); @@ -387,7 +387,7 @@ dissect_fcfzs_arzs(tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } } } @@ -411,7 +411,7 @@ dissect_fcfzs_arzm(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, gboolean proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+1, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); len += (len % 4); plen = tvb_reported_length(tvb) - offset - len; @@ -455,14 +455,14 @@ dissect_fcfzs_arzd(tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); len += (len % 4); offset += len; len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+4, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); } } } diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 50ca480f6c..8d83b0d4a6 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -525,15 +525,15 @@ dissect_swils_interconnect_element_info(tvbuff_t *tvb, proto_tree *tree, int off if (tree) { proto_tree_add_item(tree, hf_swils_interconnect_list_len, tvb, offset+3, 1, ENC_BIG_ENDIAN); len = tvb_strsize(tvb, offset+4); - proto_tree_add_item(tree, hf_swils_ess_vendorname, tvb, offset+4, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_swils_ess_vendorname, tvb, offset+4, len, ENC_ASCII); offset += (4 + len); max_len -= len; len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_swils_ess_modelname, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_swils_ess_modelname, tvb, offset, len, ENC_ASCII); offset += len; max_len -= len; len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_swils_ess_relcode, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_swils_ess_relcode, tvb, offset, len, ENC_ASCII); offset += len; max_len -= len; while (max_len > 0) { @@ -541,7 +541,7 @@ dissect_swils_interconnect_element_info(tvbuff_t *tvb, proto_tree *tree, int off * strings */ len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_swils_ess_vendorspecific, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_swils_ess_vendorspecific, tvb, offset, len, ENC_ASCII); offset += len; max_len -= len; } @@ -669,7 +669,7 @@ dissect_swils_ess_capability_obj(tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item(capinfo_tree, hf_swils_ess_cap_len, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(capinfo_tree, hf_swils_ess_cap_t10, tvb, offset+4, - 8, ENC_ASCII|ENC_NA); + 8, ENC_ASCII); i -= 8; /* reduce length by t10 object size */ offset += 12; len += 12; @@ -1473,7 +1473,7 @@ dissect_swils_esc(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *esc_tree, g plen = tvb_get_ntohs(tvb, offset+2); proto_tree_add_item(esc_tree, hf_swils_esc_payload_length, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(esc_tree, hf_swils_esc_swvendorid, tvb, - offset+4, 8, ENC_ASCII|ENC_NA); + offset+4, 8, ENC_ASCII); numrec = (plen - 12)/12; offset = 12; @@ -1481,7 +1481,7 @@ dissect_swils_esc(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *esc_tree, g pdesc_tree = proto_tree_add_subtree_format(esc_tree, tvb, offset, 12, ett_fcswils_esc_pdesc, NULL, "Protocol Descriptor %d", i); proto_tree_add_item(pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, - offset, 8, ENC_ASCII|ENC_NA); + offset, 8, ENC_ASCII); proto_tree_add_item(pdesc_tree, hf_swils_esc_protocolid, tvb, offset+10, 2, ENC_BIG_ENDIAN); offset += 12; @@ -1489,12 +1489,12 @@ dissect_swils_esc(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *esc_tree, g } else { proto_tree_add_item(esc_tree, hf_swils_esc_swvendorid, tvb, - offset+4, 8, ENC_ASCII|ENC_NA); + offset+4, 8, ENC_ASCII); pdesc_tree = proto_tree_add_subtree(esc_tree, tvb, offset+12, 12, ett_fcswils_esc_pdesc, NULL, "Accepted Protocol Descriptor"); proto_tree_add_item(pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, - offset+12, 8, ENC_ASCII|ENC_NA); + offset+12, 8, ENC_ASCII); proto_tree_add_item(pdesc_tree, hf_swils_esc_protocolid, tvb, offset+22, 2, ENC_BIG_ENDIAN); } @@ -1574,12 +1574,12 @@ dissect_swils_mrra(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree, guin if (isreq) { proto_tree_add_item(tree, hf_swils_mrra_rev, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_swils_mrra_size, tvb, offset+8, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, ENC_ASCII); proto_tree_add_item(tree, hf_swils_mrra_vendorinfo, tvb, offset+20, 8, ENC_NA); } else { proto_tree_add_item(tree, hf_swils_mrra_vendorid, tvb, offset+4, - 8, ENC_ASCII|ENC_NA); + 8, ENC_ASCII); proto_tree_add_item(tree, hf_swils_mrra_reply, tvb, offset+12, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_swils_mrra_reply_size, tvb, offset+16, diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 9957f66e7b..e83f207f68 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -1938,7 +1938,7 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2003,7 +2003,7 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2055,7 +2055,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -2158,7 +2158,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -2203,12 +2203,12 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2323,12 +2323,12 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2648,12 +2648,12 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2751,7 +2751,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_sm_id_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -2782,12 +2782,12 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset, ett_ff_sm_id_err, NULL, "SM Clear Address Request"); proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -2873,7 +2873,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -2954,12 +2954,12 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, ett_ff_sm_set_assign_info_req, NULL, "SM Set Assignment Info Request"); proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -3097,7 +3097,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -3128,12 +3128,12 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset, ett_ff_sm_clear_assign_info_req, NULL, "SM Clear Assignment Info Request"); proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -3211,7 +3211,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -3487,12 +3487,12 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -3596,7 +3596,7 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fms_init_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -3682,7 +3682,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_fms_init_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -3846,7 +3846,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_status_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); + hf_ff_fms_status_err_additional_desc, tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -3948,17 +3948,17 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset, ett_ff_fms_id_rsp, NULL, "FMS Identify Response"); proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_model_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fms_id_rsp_model_name, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_revision, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_fms_id_rsp_revision, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; @@ -4009,7 +4009,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_id_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4144,7 +4144,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_get_od_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4256,7 +4256,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_init_put_od_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4364,7 +4364,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_put_od_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4474,7 +4474,7 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_terminate_put_od_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4589,7 +4589,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_init_download_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4711,7 +4711,7 @@ dissect_ff_msg_fms_generic_download_segment_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_download_seg_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4837,7 +4837,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -4950,7 +4950,7 @@ dissect_ff_msg_fms_init_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_init_download_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5068,7 +5068,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_download_seg_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5192,7 +5192,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_download_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5303,7 +5303,7 @@ dissect_ff_msg_fms_init_upload_seq_err( length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_init_upload_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5421,7 +5421,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_upload_seg_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5535,7 +5535,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_upload_seq_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5574,7 +5574,7 @@ dissect_ff_msg_fms_req_dom_download_req( if (length) { proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_download_req_additional_info, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); } } @@ -5650,7 +5650,7 @@ dissect_ff_msg_fms_req_dom_download_err( proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_download_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5689,7 +5689,7 @@ dissect_ff_msg_fms_req_dom_upload_req( if (length) { proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_upload_req_additional_info, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); } } @@ -5764,7 +5764,7 @@ dissect_ff_msg_fms_req_dom_upload_err( proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_upload_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -5922,7 +5922,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_create_pi_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6031,7 +6031,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_del_pi_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6146,7 +6146,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_start_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6261,7 +6261,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_stop_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6376,7 +6376,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_resume_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6491,7 +6491,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_reset_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6597,7 +6597,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_kill_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6700,7 +6700,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_read_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6813,7 +6813,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_read_with_subidx_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -6919,7 +6919,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_write_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7034,7 +7034,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_write_with_subidx_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7181,7 +7181,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_def_variable_list_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7291,7 +7291,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_del_variable_list_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7592,7 +7592,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7711,7 +7711,7 @@ dissect_ff_msg_fms_ack_ev_notification_err( proto_tree_add_item(sub_tree, hf_ff_fms_ack_ev_notification_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -7927,7 +7927,7 @@ dissect_ff_msg_lr_get_info_err( proto_tree_add_item(sub_tree, hf_ff_lr_get_info_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -8252,7 +8252,7 @@ dissect_ff_msg_lr_put_info_err( proto_tree_add_item(sub_tree, hf_ff_lr_put_info_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -8437,7 +8437,7 @@ dissect_ff_msg_lr_get_statistics_err( proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_err_additional_desc, - tvb, offset, 16, ENC_ASCII|ENC_NA); + tvb, offset, 16, ENC_ASCII); offset += 16; length -= 16; @@ -8628,7 +8628,7 @@ dissect_ff_msg_diagnostic_msg_req( length -= 4; proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, ENC_ASCII); offset += 32; length -= 32; diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index 6d3b868714..676491548f 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -104,7 +104,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, finger_tree = proto_item_add_subtree(ti, ett_finger); if (is_query) { - expert_ti = proto_tree_add_item(finger_tree, hf_finger_query, tvb, 0, -1, ENC_ASCII|ENC_NA); + expert_ti = proto_tree_add_item(finger_tree, hf_finger_query, tvb, 0, -1, ENC_ASCII); if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { /* * From RFC742, Send a single "command line", ending with <CRLF>. @@ -117,7 +117,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_set_generated(ti); } } else if (tree && finger_trans->rep_frame) { - proto_tree_add_item(finger_tree, hf_finger_response, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(finger_tree, hf_finger_response, tvb, 0, -1, ENC_ASCII); if (finger_trans->req_frame) { nstime_t ns; diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index dd25944742..6eb71e624e 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -382,7 +382,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da field_tree = proto_tree_add_subtree_format(fix_tree, tvb, field_offset, tag->field_len, ett_unknown, NULL, "%i: %s", tag_value, value); proto_tree_add_uint(field_tree, hf_fix_field_tag, tvb, field_offset, tag->tag_len, tag_value); - proto_tree_add_item(field_tree, hf_fix_field_value, tvb, tag->value_offset, tag->value_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(field_tree, hf_fix_field_value, tvb, tag->value_offset, tag->value_len, ENC_ASCII); } field_offset = tag->ctrla_offset + 1; diff --git a/epan/dissectors/packet-fortinet-sso.c b/epan/dissectors/packet-fortinet-sso.c index 08df1fad28..13696e7ac1 100644 --- a/epan/dissectors/packet-fortinet-sso.c +++ b/epan/dissectors/packet-fortinet-sso.c @@ -73,37 +73,37 @@ dissect_fortinet_sso(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 2; string = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &string_length, ENC_ASCII); - proto_tree_add_item(fsso_tree, hf_fsso_string, tvb, offset, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_string, tvb, offset, string_length, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, string); if(client_ip == 0xFFFFFFFF) { //if client_ip equal 255.255.255.255 (0xFFFFFFFF) is KeepAlive packet /* Domain / KeepAlive (User) / Version */ len = tvb_find_guint8(tvb, offset, string_length, '/') - offset; - proto_tree_add_item(fsso_tree, hf_fsso_domain, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_domain, tvb, offset, len, ENC_ASCII); offset += (len + 1); string_length -= (len + 1); len = tvb_find_guint8(tvb, offset, string_length, '/') - offset; - proto_tree_add_item(fsso_tree, hf_fsso_user, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_user, tvb, offset, len, ENC_ASCII); offset += (len + 1); string_length -= (len + 1); - proto_tree_add_item(fsso_tree, hf_fsso_version, tvb, offset, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_version, tvb, offset, string_length, ENC_ASCII); offset += (string_length); } else { /* Host / Domain / User */ len = tvb_find_guint8(tvb, offset, string_length, '/') - offset; - proto_tree_add_item(fsso_tree, hf_fsso_host, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_host, tvb, offset, len, ENC_ASCII); offset += (len + 1); string_length -= (len + 1); len = tvb_find_guint8(tvb, offset, string_length, '/') - offset; - proto_tree_add_item(fsso_tree, hf_fsso_domain, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_domain, tvb, offset, len, ENC_ASCII); offset += (len + 1); string_length -= (len + 1); - proto_tree_add_item(fsso_tree, hf_fsso_user, tvb, offset, string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(fsso_tree, hf_fsso_user, tvb, offset, string_length, ENC_ASCII); offset += (string_length); } diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index fa2532cb64..e7bda09abb 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -4747,7 +4747,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static int dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, void* data _U_) { - proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); + proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_ASCII); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 36a7d532f9..9d27f1c786 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -942,7 +942,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tokenlen = get_token_len(line, line + linelen, &next_token); if (tokenlen != 0) { proto_tree_add_item(reqresp_tree, hf_ftp_request_command, - tvb, 0, tokenlen, ENC_ASCII|ENC_NA); + tvb, 0, tokenlen, ENC_ASCII); if (strncmp(line, "PORT", tokenlen) == 0) is_port_request = TRUE; /* @@ -1116,11 +1116,11 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (is_request) { proto_tree_add_item(reqresp_tree, hf_ftp_request_arg, tvb, offset, - linelen, ENC_ASCII|ENC_NA); + linelen, ENC_ASCII); } else { proto_tree_add_item(reqresp_tree, hf_ftp_response_arg, tvb, offset, - linelen, ENC_ASCII|ENC_NA); + linelen, ENC_ASCII); } } offset = next_offset; diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index f2baebc451..78208dd089 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -192,12 +192,12 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* create display subtree for the protocol */ fh_tree = proto_item_add_subtree(ti, ett_fw1); - proto_tree_add_item(fh_tree, hf_fw1_direction, tvb, 0, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(fh_tree, hf_fw1_direction, tvb, 0, 1, ENC_ASCII); if (fw1_iflist_with_chain) - proto_tree_add_item(fh_tree, hf_fw1_chain, tvb, 1, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(fh_tree, hf_fw1_chain, tvb, 1, 1, ENC_ASCII); - proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, ENC_ASCII); if (fw1_with_uuid) proto_tree_add_item(fh_tree, hf_fw1_uuid, tvb, 8, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c index d3ec7fd7f2..6cdd18faf6 100644 --- a/epan/dissectors/packet-gdb.c +++ b/epan/dissectors/packet-gdb.c @@ -75,7 +75,7 @@ dissect_gdb_token(void *tvbparse_data, const void *wanted_data, tvbparse_elem_t break; case GDB_TOK_START: proto_tree_add_item(tree, hf_gdb_start, - tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); + tok->tvb, tok->offset, tok->len, ENC_ASCII); break; case GDB_TOK_PAYLOAD: proto_tree_add_item(tree, hf_gdb_payload, @@ -83,11 +83,11 @@ dissect_gdb_token(void *tvbparse_data, const void *wanted_data, tvbparse_elem_t break; case GDB_TOK_END: proto_tree_add_item(tree, hf_gdb_end, - tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); + tok->tvb, tok->offset, tok->len, ENC_ASCII); break; case GDB_TOK_CHKSUM: proto_tree_add_item(tree, hf_gdb_chksum, - tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); + tok->tvb, tok->offset, tok->len, ENC_ASCII); break; default: break; diff --git a/epan/dissectors/packet-gearman.c b/epan/dissectors/packet-gearman.c index 8b5e69c53e..6c8b8715ce 100644 --- a/epan/dissectors/packet-gearman.c +++ b/epan/dissectors/packet-gearman.c @@ -220,7 +220,7 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* // explicitly set len to 0 if there are no arguments, // else use tvb_strnlen() to find the remaining length of tvb len = ( size > 0 ) ? tvb_strnlen( tvb, GEARMAN_COMMAND_HEADER_SIZE, -1 ) : 0 ; - content_item = proto_tree_add_item(command_tree, hf_gearman_data_content, tvb, GEARMAN_COMMAND_HEADER_SIZE, len, ENC_ASCII|ENC_NA); + content_item = proto_tree_add_item(command_tree, hf_gearman_data_content, tvb, GEARMAN_COMMAND_HEADER_SIZE, len, ENC_ASCII); content_tree = proto_item_add_subtree(content_item, ett_gearman_content); } diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index 583bf1bfde..5d6960899e 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -256,7 +256,7 @@ dissect_glbp_auth(tvbuff_t *tvb, int offset, offset++; switch(authtype) { case 1: - proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, ENC_ASCII); offset += authlength; break; case 2: diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 4bf5af6f30..2a27bf7f3d 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -191,7 +191,7 @@ static void dissect_gnutella_query(tvbuff_t *tvb, guint offset, proto_tree *tree tvb, offset + GNUTELLA_QUERY_SEARCH_OFFSET, size - GNUTELLA_SHORT_LENGTH, - ENC_ASCII|ENC_NA); + ENC_ASCII); } else { proto_tree_add_string_format(tree, @@ -309,7 +309,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t tvb, name_at_offset, name_length, - ENC_ASCII|ENC_NA); + ENC_ASCII); if(extra_length) { proto_tree_add_item(hit_tree, diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index 9836b7271c..3aedb5d577 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -161,20 +161,20 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ dir_tree = proto_item_add_subtree(ti, ett_dir_item); proto_tree_add_item(dir_tree, hf_gopher_di_type, tvb, offset, 1, ENC_ASCII|ENC_NA); proto_tree_add_item(dir_tree, hf_gopher_di_name, tvb, offset + 1, - sel_start - offset - 2, ENC_ASCII|ENC_NA); + sel_start - offset - 2, ENC_ASCII); proto_tree_add_item(dir_tree, hf_gopher_di_selector, tvb, sel_start, - host_start - sel_start - 1, ENC_ASCII|ENC_NA); + host_start - sel_start - 1, ENC_ASCII); proto_tree_add_item(dir_tree, hf_gopher_di_host, tvb, host_start, - port_start - host_start - 1, ENC_ASCII|ENC_NA); + port_start - host_start - 1, ENC_ASCII); proto_tree_add_item(dir_tree, hf_gopher_di_port, tvb, port_start, - line_len - (port_start - offset - 1), ENC_ASCII|ENC_NA); + line_len - (port_start - offset - 1), ENC_ASCII); is_dir = TRUE; offset = next_offset; } if (!is_dir) { proto_item_append_text(ti, "[Unknown]"); - proto_tree_add_item(gopher_tree, hf_gopher_unknown, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gopher_tree, hf_gopher_unknown, tvb, 0, -1, ENC_ASCII); } } diff --git a/epan/dissectors/packet-gquic.c b/epan/dissectors/packet-gquic.c index e7d4919e09..9aa374bb23 100644 --- a/epan/dissectors/packet-gquic.c +++ b/epan/dissectors/packet-gquic.c @@ -1483,7 +1483,7 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui case TAG_SCFG:{ guint32 scfg_tag_number; - proto_tree_add_item(tag_tree, hf_gquic_tag_scfg, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tag_tree, hf_gquic_tag_scfg, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); tag_offset += 4; proto_tree_add_item(tag_tree, hf_gquic_tag_scfg_number, tvb, tag_offset_start + tag_offset, 4, ENC_LITTLE_ENDIAN); scfg_tag_number = tvb_get_guint32(tvb, tag_offset_start + tag_offset, ENC_LITTLE_ENDIAN); @@ -1507,7 +1507,7 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui case TAG_AEAD: while(offset_end - tag_offset >= 4){ proto_tree *ti_aead; - ti_aead = proto_tree_add_item(tag_tree, hf_gquic_tag_aead, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + ti_aead = proto_tree_add_item(tag_tree, hf_gquic_tag_aead, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); proto_item_append_text(ti_aead, " (%s)", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_aead_vals, "Unknown")); proto_item_append_text(ti_tag, ", %s", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_aead_vals, "Unknown")); tag_offset += 4; @@ -1529,7 +1529,7 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui case TAG_KEXS: while(offset_end - tag_offset >= 4){ proto_tree *ti_kexs; - ti_kexs = proto_tree_add_item(tag_tree, hf_gquic_tag_kexs, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + ti_kexs = proto_tree_add_item(tag_tree, hf_gquic_tag_kexs, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); proto_item_append_text(ti_kexs, " (%s)", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_kexs_vals, "Unknown")); proto_item_append_text(ti_tag, ", %s", val_to_str(tvb_get_ntohl(tvb, tag_offset_start + tag_offset), tag_kexs_vals, "Unknown")); tag_offset += 4; @@ -1571,7 +1571,7 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui break; case TAG_COPT: while(offset_end - tag_offset >= 4){ - proto_tree_add_item(tag_tree, hf_gquic_tag_copt, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tag_tree, hf_gquic_tag_copt, tvb, tag_offset_start + tag_offset, 4, ENC_ASCII); tag_offset += 4; } break; @@ -1793,7 +1793,7 @@ dissect_gquic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tr proto_tree_add_item(ft_tree, hf_gquic_frame_type_cc_reason_phrase_length, tvb, offset, 2, gquic_info->encoding); len_reason = tvb_get_guint16(tvb, offset, gquic_info->encoding); offset += 2; - proto_tree_add_item(ft_tree, hf_gquic_frame_type_cc_reason_phrase, tvb, offset, len_reason, ENC_ASCII|ENC_NA); + proto_tree_add_item(ft_tree, hf_gquic_frame_type_cc_reason_phrase, tvb, offset, len_reason, ENC_ASCII); offset += len_reason; proto_item_append_text(ti_ft, " Error code: %s", val_to_str_ext(error_code, &error_code_vals_ext, "Unknown (%d)")); col_set_str(pinfo->cinfo, COL_INFO, "Connection Close"); @@ -1810,7 +1810,7 @@ dissect_gquic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tr proto_tree_add_item(ft_tree, hf_gquic_frame_type_goaway_reason_phrase_length, tvb, offset, 2, gquic_info->encoding); len_reason = tvb_get_guint16(tvb, offset, gquic_info->encoding); offset += 2; - proto_tree_add_item(ft_tree, hf_gquic_frame_type_goaway_reason_phrase, tvb, offset, len_reason, ENC_ASCII|ENC_NA); + proto_tree_add_item(ft_tree, hf_gquic_frame_type_goaway_reason_phrase, tvb, offset, len_reason, ENC_ASCII); offset += len_reason; proto_item_append_text(ti_ft, " Stream ID: %u, Error code: %s", last_good_stream_id, val_to_str_ext(error_code, &error_code_vals_ext, "Unknown (%d)")); col_set_str(pinfo->cinfo, COL_INFO, "GOAWAY"); @@ -2221,14 +2221,14 @@ dissect_gquic_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if(puflags & PUFLAGS_VRSN){ if(pinfo->srcport == gquic_info->server_port){ /* Version Negotiation Packet */ while(tvb_reported_length_remaining(tvb, offset) > 0){ - proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII); offset += 4; } col_add_fstr(pinfo->cinfo, COL_INFO, "Version Negotiation, CID: %" PRIu64, cid); return offset; } else{ - proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII); offset += 4; } } @@ -2237,7 +2237,7 @@ dissect_gquic_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if(puflags & PUFLAGS_RST){ guint32 tag_number, message_tag; - ti = proto_tree_add_item(gquic_tree, hf_gquic_tag, tvb, offset, 4, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(gquic_tree, hf_gquic_tag, tvb, offset, 4, ENC_ASCII); message_tag = tvb_get_ntohl(tvb, offset); proto_item_append_text(ti, " (%s)", val_to_str(message_tag, message_tag_vals, "Unknown Tag")); offset += 4; @@ -2355,7 +2355,7 @@ dissect_gquic_q046(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(firstbyte_tree, hf_gquic_packet_number_length, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(gquic_tree, hf_gquic_version, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(gquic_tree, hf_gquic_dcil, tvb, offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index a513fec109..bac7b4e419 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -2592,7 +2592,7 @@ be_trace_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_trigger_id, tvb, curr_offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_trigger_id, tvb, curr_offset, len, ENC_ASCII); curr_offset += len; /* no length check possible */ @@ -2655,7 +2655,7 @@ be_trace_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_offset = offset; - proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_omc_id, tvb, curr_offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_omc_id, tvb, curr_offset, len, ENC_ASCII); curr_offset += len; /* no length check possible */ diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index c88b42d7b3..8d0e2d7c88 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -763,7 +763,7 @@ dissect_om2k_negotiation_record1(tvbuff_t *tvb, gint base_offset, proto_tree *tr for (j = 0; j < num_vers; j++) { proto_tree_add_item(iwd_tree, hf_om2k_iwd_gen_rev, tvb, - offset, 6, ENC_ASCII|ENC_NA); + offset, 6, ENC_ASCII); offset += 6; } } @@ -805,7 +805,7 @@ dissect_om2k_negotiation_record2(tvbuff_t *tvb, gint base_offset, proto_tree *tr iwd_tree = proto_item_add_subtree(ti, ett_om2k_iwd); proto_tree_add_item(iwd_tree, hf_om2k_iwd_gen_rev, tvb, - offset, 6, ENC_ASCII|ENC_NA); + offset, 6, ENC_ASCII); offset += 6; } return offset - base_offset; @@ -894,7 +894,7 @@ dissect_om2k_attrs(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *t break; case 0x17: /* File Revision */ proto_tree_add_item(tree, hf_om2k_file_rev, tvb, - offset, 8, ENC_ASCII|ENC_NA); + offset, 8, ENC_ASCII); offset += 8; break; case 0x1c: /* Filling Marker */ @@ -1003,16 +1003,16 @@ dissect_om2k_attrs(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *t break; case 0x40: /* BTS Version */ proto_tree_add_item(tree, hf_om2k_bts_manuf, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_om2k_bts_gen, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_om2k_bts_rev, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_om2k_bts_var, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; break; case 0x43: /* OML Function Map 1 */ diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index c4d79394fe..8c11599487 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -1803,15 +1803,15 @@ dissect_oml_attrs(tvbuff_t *tvb, int base_offs, int length, break; case NM_ATT_IPACC_LOCATION: proto_tree_add_item(att_tree, hf_attr_ipa_location_name, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); break; case NM_ATT_IPACC_UNIT_ID: proto_tree_add_item(att_tree, hf_attr_ipa_unit_id, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); break; case NM_ATT_IPACC_UNIT_NAME: proto_tree_add_item(att_tree, hf_attr_ipa_unit_name, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); break; case NM_ATT_IPACC_PRIM_OML_CFG_LIST: proto_tree_add_item(att_tree, hf_attr_ipa_prim_oml_ip, @@ -1979,7 +1979,7 @@ dissect_oml_manuf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item_ret_uint(tree, hf_oml_manuf_id_len, tvb, offset, 1, ENC_NA, &len); proto_tree_add_item(tree, hf_oml_manuf_id_val, tvb, - offset + 1, len, ENC_ASCII|ENC_NA); + offset + 1, len, ENC_ASCII); /* Some implementations include '\0', some don't - handle this */ if ((len == (sizeof(ipaccess_magic) + 1) || len == sizeof(ipaccess_magic)) && diff --git a/epan/dissectors/packet-gsm_gsup.c b/epan/dissectors/packet-gsm_gsup.c index 4b8cdb8a94..5629184450 100644 --- a/epan/dissectors/packet-gsm_gsup.c +++ b/epan/dissectors/packet-gsm_gsup.c @@ -654,14 +654,14 @@ static void dissect_name_ie(tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, ti = proto_tree_add_item(tree, hf_gsup_source_name, tvb, offset, ie_len, ENC_NA); if (show_name_as_text) { proto_item_set_hidden(ti); - proto_tree_add_item(tree, hf_gsup_source_name_text, tvb, offset, ie_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gsup_source_name_text, tvb, offset, ie_len, ENC_ASCII); } break; case OSMO_GSUP_DESTINATION_NAME_IE: ti = proto_tree_add_item(tree, hf_gsup_destination_name, tvb, offset, ie_len, ENC_NA); if (show_name_as_text) { proto_item_set_hidden(ti); - proto_tree_add_item(tree, hf_gsup_destination_name_text, tvb, offset, ie_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gsup_destination_name_text, tvb, offset, ie_len, ENC_ASCII); } break; } @@ -764,7 +764,7 @@ dissect_gsup_tlvs(tvbuff_t *tvb, int base_offs, int length, packet_info *pinfo, proto_tree_add_item(att_tree, hf_gsup_pdp_context_id, tvb, offset, len, ENC_NA); break; case OSMO_GSUP_CHARG_CHAR_IE: - proto_tree_add_item(att_tree, hf_gsup_charg_char, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(att_tree, hf_gsup_charg_char, tvb, offset, len, ENC_ASCII); break; case OSMO_GSUP_CAUSE_IE: proto_tree_add_item(att_tree, hf_gsup_cause, tvb, offset, len, ENC_NA); diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index 2e6358b734..f12a011c7f 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -185,7 +185,7 @@ dissect_ipa_attr(tvbuff_t *tvb, int base_offs, proto_tree *tree) proto_tree_add_item(tree, hf_ipaccess_attr_tag, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipaccess_attr_string, - tvb, offset+3, len-1, ENC_ASCII|ENC_NA); + tvb, offset+3, len-1, ENC_ASCII); break; case 0x01: /* a single-byte request for a certain attr */ len = 0; @@ -259,7 +259,7 @@ dissect_osmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ipatree, proto_tree return 1; /* Simply display the CTRL data as text */ } else if (osmo_proto == IPAC_PROTO_EXT_CTRL) { - proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_ASCII); return 1; } @@ -349,10 +349,10 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_udp break; case HSL_DEBUG: proto_tree_add_item(ipa_tree, hf_ipa_hsl_debug, - next_tvb, 0, len, ENC_ASCII|ENC_NA); + next_tvb, 0, len, ENC_ASCII); if (global_ipa_in_root == TRUE) proto_tree_add_item(tree, hf_ipa_hsl_debug, - next_tvb, 0, len, ENC_ASCII|ENC_NA); + next_tvb, 0, len, ENC_ASCII); if (global_ipa_in_info == TRUE) col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", tvb_get_stringz_enc(pinfo->pool, next_tvb, 0, NULL, ENC_ASCII)); diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 91bf2de2fc..e952ef4c3d 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -5411,7 +5411,7 @@ dissect_gsm_map_ss_USSD_String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int break; case SMS_ENCODING_8BIT: /* XXX - ASCII, or some extended ASCII? */ - proto_tree_add_item(subtree, hf_gsm_map_ussd_string, parameter_tvb, 0, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_gsm_map_ussd_string, parameter_tvb, 0, length, ENC_ASCII); break; case SMS_ENCODING_UCS2: case SMS_ENCODING_UCS2_LANG: diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 57e9bcf29f..f78d852106 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2153,7 +2153,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset if (p_frag_params) { proto_tree_add_item(subtree, hf_gsm_sms_text, sm_tvb, total_sms_len, - p_frag_params->length, ENC_ASCII|ENC_NA); + p_frag_params->length, ENC_ASCII); total_sms_len += p_frag_params->length; } } diff --git a/epan/dissectors/packet-gsmtap_log.c b/epan/dissectors/packet-gsmtap_log.c index 2839b509be..b373b40e55 100644 --- a/epan/dissectors/packet-gsmtap_log.c +++ b/epan/dissectors/packet-gsmtap_log.c @@ -73,7 +73,7 @@ dissect_gsmtap_log(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * d /* actual log message */ log_str_len = tvb_captured_length_remaining(tvb, offset); - proto_tree_add_item(log_tree, hf_log_string, tvb, offset, log_str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(log_tree, hf_log_string, tvb, offset, log_str_len, ENC_ASCII); log_str = tvb_format_stringzpad_wsp(pinfo->pool, tvb, offset, log_str_len); col_append_str(pinfo->cinfo, COL_INFO, log_str); diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index c84dbc9f04..e434f3056a 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -6480,7 +6480,7 @@ dissect_gtpv2_detach_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre static void dissect_gtpv2_ldn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_) { - proto_tree_add_item(tree, hf_gtpv2_ldn, tvb, 0, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_ldn, tvb, 0, length, ENC_ASCII); } /* 8.83 Node Features */ @@ -6945,7 +6945,7 @@ dissect_gtpv2_twan_identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree break; case 1: /* fall trough */ - proto_tree_add_item(tree, hf_gtpv2_twan_relay_id, tvb, offset, relay_id_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_gtpv2_twan_relay_id, tvb, offset, relay_id_len, ENC_ASCII); offset += relay_id_len; default: break; diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 2687322f61..3b4af3128b 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1012,7 +1012,7 @@ static int dissect_register(guint32 addr, proto_tree *branch, tvbuff_t *tvb, gin break; case GVCP_USER_DEFINED_NAME: - proto_tree_add_item(branch, hf_gvcp_user_defined_name, tvb, offset, 4, ENC_ASCII|ENC_NA); /*? */ + proto_tree_add_item(branch, hf_gvcp_user_defined_name, tvb, offset, 4, ENC_ASCII); /*? */ break; case GVCP_FIRST_URL: @@ -1461,56 +1461,56 @@ static int dissect_register_data(guint32 addr, proto_tree *branch, tvbuff_t *tvb case GVCP_MANUFACTURER_NAME: if (length == 32) { - proto_tree_add_item(branch, hf_gvcp_manufacturer_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_manufacturer_name, tvb, offset, -1, ENC_ASCII); } break; case GVCP_MODEL_NAME: if (length == 32) { - proto_tree_add_item(branch, hf_gvcp_model_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_model_name, tvb, offset, -1, ENC_ASCII); } break; case GVCP_DEVICE_VERSION: if (length == 32) { - proto_tree_add_item(branch, hf_gvcp_device_version, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_device_version, tvb, offset, -1, ENC_ASCII); } break; case GVCP_MANUFACTURER_INFO: if (length == 48) { - proto_tree_add_item(branch, hf_gvcp_manufacturer_specific_info, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_manufacturer_specific_info, tvb, offset, -1, ENC_ASCII); } break; case GVCP_SERIAL_NUMBER: if (length == 16) { - proto_tree_add_item(branch, hf_gvcp_serial_number, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_serial_number, tvb, offset, -1, ENC_ASCII); } break; case GVCP_USER_DEFINED_NAME: if (length == 16) { - proto_tree_add_item(branch, hf_gvcp_user_defined_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_user_defined_name, tvb, offset, -1, ENC_ASCII); } break; case GVCP_FIRST_URL: if (length == 512) { - proto_tree_add_item(branch, hf_gvcp_first_xml_device_description_file, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_first_xml_device_description_file, tvb, offset, -1, ENC_ASCII); } break; case GVCP_SECOND_URL: if (length == 512) { - proto_tree_add_item(branch, hf_gvcp_second_xml_device_description_file, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_gvcp_second_xml_device_description_file, tvb, offset, -1, ENC_ASCII); } break; @@ -2169,22 +2169,22 @@ static void dissect_discovery_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, dissect_register(GVCP_CURRENT_DEFAULT_GATEWAY_0, gvcp_telegram_tree, tvb, offset + 68, 4); /* Manufacturer name */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_manufacturer_name, tvb, offset + 72, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_manufacturer_name, tvb, offset + 72, -1, ENC_ASCII); /* Model name */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_model_name, tvb, offset + 104, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_model_name, tvb, offset + 104, -1, ENC_ASCII); /* Device version */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_device_version, tvb, offset + 136, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_device_version, tvb, offset + 136, -1, ENC_ASCII); /* Manufacturer specific information */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_manufacturer_specific_info, tvb, offset + 168, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_manufacturer_specific_info, tvb, offset + 168, -1, ENC_ASCII); /* Serial number */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_serial_number, tvb, offset + 216, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_serial_number, tvb, offset + 216, -1, ENC_ASCII); /* User defined name */ - proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_user_defined_name, tvb, offset + 232, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvcp_telegram_tree, hf_gvcp_user_defined_name, tvb, offset + 232, -1, ENC_ASCII); } } diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c index df1df5fd02..b080468337 100644 --- a/epan/dissectors/packet-gvsp.c +++ b/epan/dissectors/packet-gvsp.c @@ -1418,7 +1418,7 @@ static gint dissect_file_leader(proto_tree *gvsp_tree, tvbuff_t *tvb, packet_inf /* Filename */ file_length = tvb_strsize(tvb, offset + 20); - proto_tree_add_item(gvsp_tree, hf_gvsp_filename, tvb, offset + 20, file_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvsp_tree, hf_gvsp_filename, tvb, offset + 20, file_length, ENC_ASCII); if (20 + file_length > G_MAXINT) return -1; @@ -1915,7 +1915,7 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p proto_tree* gvsp_gendc_container_header_component_offsets_tree = 0; /* GenDC container header signature */ - proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_signature_v2_2, tvb, offset + 16, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_signature_v2_2, tvb, offset + 16, 4, ENC_ASCII); /* GenDC container header major version */ proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_version_major_v2_2, tvb, offset + 20, 1, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 984af8139e..04761e7bd4 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -389,7 +389,7 @@ static int dissect_hazelcast_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot offset += 4; if ( nameLength > 0 ) { - proto_tree_add_item(hcast_tree, hf_hazelcast_name, tvb, offset, nameLength, ENC_ASCII|ENC_NA); + proto_tree_add_item(hcast_tree, hf_hazelcast_name, tvb, offset, nameLength, ENC_ASCII); offset += nameLength; } diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index 6bf4bdaa65..8bf5502b1b 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -129,7 +129,7 @@ dissect_params (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset, int params) offset += 2; /* length bytes = parameter type */ - proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII); offset += length; if (offset >= length && (!tvb_memeql(tvb, offset - length, "long", length) || !tvb_memeql(tvb, offset - length, "int", length) || @@ -156,7 +156,7 @@ dissect_params (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset, int params) proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII); offset += length; if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.fs.permission.FsPermission", length)) { @@ -193,7 +193,7 @@ dissect_data (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset) { offset += 2; /* length bytes = method name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_ASCII); offset += length; /* we only want to parse the packet if it is not a heartbeat (random looking numbers are the decimal @@ -227,7 +227,7 @@ dissect_resp_long (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 2; /* length bytes = parameter type */ - proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII); offset += length; /* the value */ @@ -257,7 +257,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 2; /* file name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_filename, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_filename, tvb, offset, length, ENC_ASCII); offset += length; @@ -298,7 +298,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* owner name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_ownername, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_ownername, tvb, offset, length, ENC_ASCII); offset += length; /* get length */ @@ -309,7 +309,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* group name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_groupname, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_groupname, tvb, offset, length, ENC_ASCII); offset += length; return offset; @@ -332,7 +332,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* identifier */ - proto_tree_add_item(hdfs_tree, hf_hdfs_identifier, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_identifier, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_guint8(tvb, offset); @@ -342,7 +342,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* password */ - proto_tree_add_item(hdfs_tree, hf_hdfs_password, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_password, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_guint8(tvb, offset); @@ -352,7 +352,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* kind */ - proto_tree_add_item(hdfs_tree, hf_hdfs_kind, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_kind, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_guint8(tvb, offset); @@ -362,7 +362,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* service */ - proto_tree_add_item(hdfs_tree, hf_hdfs_service, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_service, tvb, offset, length, ENC_ASCII); offset += length; /* corrupt */ @@ -403,7 +403,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 2; /* datanode id */ - proto_tree_add_item(hdfs_tree, hf_hdfs_datanodeid, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_datanodeid, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_ntohs(tvb, offset); @@ -413,7 +413,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 2; /* storageid */ - proto_tree_add_item(hdfs_tree, hf_hdfs_storageid, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_storageid, tvb, offset, length, ENC_ASCII); offset += length; /* info port */ @@ -453,7 +453,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* location rack */ - proto_tree_add_item(hdfs_tree, hf_hdfs_rackloc, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_rackloc, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_guint8(tvb, offset); @@ -463,7 +463,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* hostname */ - proto_tree_add_item(hdfs_tree, hf_hdfs_hostname, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_hostname, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_guint8(tvb, offset); @@ -473,7 +473,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) { offset += 1; /* admin state */ - proto_tree_add_item(hdfs_tree, hf_hdfs_adminstate, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_adminstate, tvb, offset, length, ENC_ASCII); offset += length; return offset; @@ -555,7 +555,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 2; /* length bytes = method name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII); offset += length; /* get length that we just dissected */ @@ -566,7 +566,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 2; /* length bytes = object name */ - proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII); offset += length; /* responses about block location info */ @@ -586,7 +586,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 2; /* the value of the parameter */ - proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII); /*offset += length;*/ } } @@ -600,7 +600,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* first setup packet starts with "hrpc" */ if (!tvb_memeql(tvb, offset, REQUEST_STR, sizeof(REQUEST_STR) - 1)) { - proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_ASCII); offset += (int)sizeof(REQUEST_STR) - 1; proto_tree_add_item(hdfs_tree, hf_hdfs_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -615,11 +615,11 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* authentication length (read out of first 4 bytes) */ length = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_ASCII); offset += 4; /* authentication (length the number we just got) */ - proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_ASCII); offset += length; } diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index 516c8fbeb8..a2e6f6bed9 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -149,7 +149,7 @@ dissect_variable_int_string(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offse int len = dissect_variable_length_long (tvb, hdfsdata_tree, offset); /* client id = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_ASCII); *offset += len; } @@ -165,7 +165,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token id = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -173,7 +173,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token password = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -181,7 +181,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token type = amount of bytes in previous */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_ASCII); *offset += len; len = tvb_get_guint8(tvb, *offset); @@ -189,7 +189,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset) *offset += 1; /* token service = amount of bytes in previous; */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_ASCII); *offset += len; } @@ -360,7 +360,7 @@ dissect_write_response(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int offset) offset += 8; /* add the rest -> RESPONSE_DATA */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII); /* offset += (tvb_reported_length(tvb)); */ } @@ -428,7 +428,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* This message just contains data so we can display it all as one block */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII); } else { @@ -466,7 +466,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo } else { /* This message contains some form of data that we have not successfully been able to pattern match and catagorize. Display all of it as data. */ - proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_ASCII|ENC_NA); + proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_ASCII); } } } diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index f8f59fc65b..3c24df84ea 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -997,10 +997,10 @@ dissect_hip_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *ti, i break; if (di_type == 1) { /* RFC 1035 */ - proto_tree_add_item(t, hf_hip_fqdn, tvb, offset+16+hi_len, di_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(t, hf_hip_fqdn, tvb, offset+16+hi_len, di_len, ENC_ASCII); } else if (di_type == 2) { /* RFC 4282 */ - proto_tree_add_item(t, hf_hip_nai, tvb, offset+16+hi_len, di_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(t, hf_hip_nai, tvb, offset+16+hi_len, di_len, ENC_ASCII); } break; case PARAM_CERT: /* CERT */ diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index 26ce69fd36..50a0c25a7e 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -827,7 +827,7 @@ dissect_hislip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Actually dissect fields */ /* TODO: could control whether this is shown by preference? */ - proto_tree_add_item(hislip_tree, hf_hislip_prologue, tvb, hislip_data.offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(hislip_tree, hf_hislip_prologue, tvb, hislip_data.offset, 2, ENC_ASCII); hislip_data.offset += 2; proto_tree_add_item(hislip_tree, hf_hislip_messagetype, tvb, hislip_data.offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index 0daabdfbe5..2a6b149fef 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -747,7 +747,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, hf_hl7_message_type, tvb, offset, 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); proto_item_set_hidden(hidden_item); } if (tvb_get_guint8(tvb, offset + 3) == msh->component_separator) { @@ -759,7 +759,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, hf_hl7_event_type, tvb, offset + 4, 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); proto_item_set_hidden(hidden_item); } } @@ -830,20 +830,20 @@ dissect_hl7_segment(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, tvb, offset, 3, ENC_ASCII); ti = proto_tree_add_item(tree, hf_hl7_segment, tvb, offset, segment_len_crlf, - ENC_ASCII|ENC_NA); + ENC_ASCII); proto_item_set_text(ti, "%s (%s)", segment_type_id, str_to_str(segment_type_id, hl7_seg_type_vals, "Unknown Segment")); segment_tree = proto_item_add_subtree(ti, ett_hl7_segment); if (global_hl7_raw) { proto_tree_add_item(segment_tree, hf_hl7_raw_segment, tvb, offset, - segment_len_crlf, ENC_ASCII|ENC_NA); + segment_len_crlf, ENC_ASCII); } } field_str = tvb_get_string_enc(pinfo->pool, tvb, offset, field_len, ENC_ASCII); ti = proto_tree_add_item(segment_tree, hf_hl7_field, - tvb, offset, field_len, ENC_ASCII|ENC_NA); + tvb, offset, field_len, ENC_ASCII); proto_item_set_text(ti, "field %d: %s", field_num, field_str); /* if this is the last field we are done */ @@ -920,7 +920,7 @@ dissect_hl7_message(tvbuff_t *tvb, guint tvb_offset, gint len, offset++; if (global_hl7_raw) { proto_tree_add_item(hl7_tree, hf_hl7_raw, tvb, offset, len - 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); } /* body */ diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index a6eb2e6599..10961cf420 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -3349,7 +3349,7 @@ dissect_homeplug_av_get_sw_cnf(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_status, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_dev_id, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_len, 1, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_str, 64, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_str, 64, ENC_ASCII); ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_upg, 1, ENC_BIG_ENDIAN); } ptvcursor_pop_subtree(cursor); @@ -4136,7 +4136,7 @@ dissect_homeplug_av_mfg_string_cnf(ptvcursor_t *cursor) { ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_status, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_len, 1, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_string, 64, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_string, 64, ENC_ASCII); } ptvcursor_pop_subtree(cursor); } @@ -4313,15 +4313,15 @@ dissect_homeplug_av_op_attr_bin_report(ptvcursor_t *cursor) ptvcursor_push_subtree(cursor, it, ett_homeplug_av_op_attr_data); { - ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_hw, 16, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_hw, 16, ENC_ASCII); + ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw, 16, ENC_ASCII); ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_major, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_minor, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_sub, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_num, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_reserved, 4, ENC_NA); - ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_date, 8, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_rel, 12, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_date, 8, ENC_ASCII); + ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_rel, 12, ENC_ASCII); ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_sdram_type, 1, ENC_NA); ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA); ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_data_sw_linefreq, 1, ENC_NA); @@ -5086,7 +5086,7 @@ dissect_homeplug_av_st_iotecha_stp_discover_tlv(ptvcursor_t *cursor) { if (Type == HOMEPLUG_AV_ST_IOTECHA_STP_DISCOVER_TLV_TYPE_DEVICE_TYPE) { ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_stp_discover_tlv_value_bytes, Length, ENC_NA); } else { - ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_stp_discover_tlv_value_string, Length, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_stp_discover_tlv_value_string, Length, ENC_ASCII); } } ptvcursor_pop_subtree(cursor); @@ -5362,7 +5362,7 @@ dissect_homeplug_av_st_iotecha_stp_mfct_get_item_req(ptvcursor_t *cursor) { ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_item_offset, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_item_total_length, 4, ENC_LITTLE_ENDIAN); tvb_get_const_stringz(ptvcursor_tvbuff(cursor),ptvcursor_current_offset(cursor), &name_size); - ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size-1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size-1, ENC_ASCII); /* Skip terminator */ ptvcursor_advance(cursor, 1); } @@ -5378,7 +5378,7 @@ dissect_homeplug_av_st_iotecha_stp_mfct_get_item_cnf(ptvcursor_t *cursor) { ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_item_offset, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_item_total_length, 4, ENC_LITTLE_ENDIAN); tvb_get_const_stringz(ptvcursor_tvbuff(cursor),ptvcursor_current_offset(cursor), &name_size); - ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size - 1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size - 1, ENC_ASCII); /* Skip terminator */ ptvcursor_advance(cursor,1); ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_value, -1, ENC_NA); @@ -5398,7 +5398,7 @@ dissect_homeplug_av_st_iotecha_stp_mfct_get_keylist_cnf(ptvcursor_t *cursor) { && (tvb_get_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor) + 1) == '\0')) break; tvb_get_const_stringz(ptvcursor_tvbuff(cursor),ptvcursor_current_offset(cursor), &name_size); - ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size - 1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_mfct_name, name_size - 1, ENC_ASCII); /* Skip terminator */ ptvcursor_advance(cursor,1); } @@ -5482,7 +5482,7 @@ dissect_homeplug_av_st_iotecha_stp_user_message_ind(ptvcursor_t *cursor, packet_ ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_user_message_info, null_offset - ptvcursor_current_offset(cursor), - ENC_ASCII|ENC_NA); + ENC_ASCII); } null_offset = tvb_find_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor) + 1, -1, 0); @@ -5491,7 +5491,7 @@ dissect_homeplug_av_st_iotecha_stp_user_message_ind(ptvcursor_t *cursor, packet_ ptvcursor_add(cursor, hf_homeplug_av_st_iotecha_user_message_details, null_offset - ptvcursor_current_offset(cursor), - ENC_ASCII|ENC_NA); + ENC_ASCII); } } diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 4e129f66a0..a6bf02950c 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -723,7 +723,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo) ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN); if (length != 0) { ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_homeplug_loader_version, -1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_loader_version, -1, ENC_ASCII); } break; case HOMEPLUG_MID_LSF: @@ -965,12 +965,12 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo) case HOMEPLUG_MID_GDVR: col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Device Version"); ptvcursor_add(cursor, hf_homeplug_hrsp_gdvr, 1, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII); break; case HOMEPLUG_MID_GFVR: col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Firmware Version"); ptvcursor_add(cursor, hf_homeplug_hrsp_gfvr, 1, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII); break; case HOMEPLUG_MID_GNEKR: col_set_str(pinfo->cinfo, COL_INFO, "Get Network Encryption Key"); diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 6f60998afa..d79fcd7f9c 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -97,7 +97,7 @@ static const value_string opcode_vals[] = { static void dissect_hpfeeds_error_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) { - proto_tree_add_item(tree, hf_hpfeeds_errmsg, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_hpfeeds_errmsg, tvb, offset, -1, ENC_ASCII); } static void @@ -117,7 +117,7 @@ dissect_hpfeeds_info_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) offset += 1; proto_tree_add_item(data_subtree, hf_hpfeeds_server, tvb, offset, len, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += len; proto_tree_add_item(data_subtree, hf_hpfeeds_nonce, tvb, offset, -1, @@ -134,7 +134,7 @@ dissect_hpfeeds_auth_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_hpfeeds_ident, tvb, - offset, len, ENC_ASCII|ENC_NA); + offset, len, ENC_ASCII); offset += len; proto_tree_add_item(tree, hf_hpfeeds_secret, tvb, @@ -173,7 +173,7 @@ dissect_hpfeeds_publish_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_hpfeeds_ident_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_hpfeeds_ident, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_hpfeeds_ident, tvb, offset, len, ENC_ASCII); offset += len; len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_hpfeeds_chan_len, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -257,11 +257,11 @@ dissect_hpfeeds_subscribe_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) offset += 1; proto_tree_add_item(tree, hf_hpfeeds_ident, tvb, offset, len, - ENC_ASCII|ENC_NA); + ENC_ASCII); /* move forward inside data */ offset += len; proto_tree_add_item(tree, hf_hpfeeds_channel, tvb, offset, -1, - ENC_ASCII|ENC_NA); + ENC_ASCII); } /* diff --git a/epan/dissectors/packet-hsms.c b/epan/dissectors/packet-hsms.c index 036dc99136..9df882b909 100644 --- a/epan/dissectors/packet-hsms.c +++ b/epan/dissectors/packet-hsms.c @@ -252,7 +252,7 @@ dissect_secs_variable(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void value_length = (guint*)wmem_map_lookup(value_lengths, GUINT_TO_POINTER(item_format_code)); len = GPOINTER_TO_UINT(value_length) * length; - proto_tree_add_item(hsms_data_item_tree, hf_hsms_data_item_value_string, tvb, *offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(hsms_data_item_tree, hf_hsms_data_item_value_string, tvb, *offset, len, ENC_ASCII); itemLength = len; *offset += len; break; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 8d7e1f6d61..29d2cf7cc2 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1997,7 +1997,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, if (tokenlen == 0) return; proto_tree_add_item(tree, hf_http_request_method, tvb, offset, tokenlen, - ENC_ASCII|ENC_NA); + ENC_ASCII); if ((next_token - line) > 2 && next_token[-1] == ' ' && next_token[-2] == ' ') { /* Two spaces in a now indicates empty URI, so roll back one here */ next_token--; @@ -2039,7 +2039,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, /* Everything to the end of the line is the version. */ tokenlen = (int) (lineend - line); proto_tree_add_item(tree, hf_http_request_version, tvb, offset, tokenlen, - ENC_ASCII|ENC_NA); + ENC_ASCII); } static gint @@ -2090,7 +2090,7 @@ basic_response_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, if (tokenlen == 0) return; proto_tree_add_item(tree, hf_http_response_version, tvb, offset, tokenlen, - ENC_ASCII|ENC_NA); + ENC_ASCII); /* Advance to the start of the next token. */ offset += (int) (next_token - line); line = next_token; @@ -2130,7 +2130,7 @@ basic_response_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, tokenlen = (int) (lineend - line); if (tokenlen >= 1) { proto_tree_add_item(tree, hf_http_response_phrase, tvb, offset, - tokenlen, ENC_ASCII|ENC_NA); + tokenlen, ENC_ASCII); } } @@ -2454,7 +2454,7 @@ chunked_encoding_dissector(tvbuff_t **tvb_ptr, packet_info *pinfo, if (trailer_len > 0) { proto_tree_add_item(subtree, hf_http_chunked_trailer_part, - tvb, offset, trailer_len, ENC_ASCII|ENC_NA); + tvb, offset, trailer_len, ENC_ASCII); offset += trailer_len; datalen -= trailer_len; } diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index d60ce8aadf..f77adbcbac 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -3563,7 +3563,7 @@ dissect_http2_continuation(tvbuff_t *tvb, packet_info *pinfo _U_, http2_session_ THROW(ReportedBoundsError); } headlen -= padding; - proto_tree_add_item(http2_tree, hf_http2_continuation_header, tvb, offset, headlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_continuation_header, tvb, offset, headlen, ENC_ASCII); #ifdef HAVE_NGHTTP2 inflate_http2_header_block(tvb, pinfo, offset, http2_tree, headlen, h2session, flags); @@ -3592,12 +3592,12 @@ dissect_http2_altsvc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_tr offset += 2; remain -= 2; - proto_tree_add_item(http2_tree, hf_http2_altsvc_origin, tvb, offset, origin_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_altsvc_origin, tvb, offset, origin_len, ENC_ASCII); offset += origin_len; remain -= origin_len; if(remain) { - proto_tree_add_item(http2_tree, hf_http2_altsvc_field_value, tvb, offset, remain, ENC_ASCII|ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_altsvc_field_value, tvb, offset, remain, ENC_ASCII); offset += remain; } @@ -3622,7 +3622,7 @@ dissect_http2_origin(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *http2_tr proto_tree_add_item_ret_uint(origin_entry_tree, hf_http2_origin_origin_len, tvb, offset, 2, ENC_BIG_ENDIAN, &origin_len); offset += 2; - proto_tree_add_item(origin_entry_tree, hf_http2_origin_origin, tvb, offset, origin_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(origin_entry_tree, hf_http2_origin_origin, tvb, offset, origin_len, ENC_ASCII); offset += origin_len; } @@ -3640,7 +3640,7 @@ dissect_http2_priority_update(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 4; remain -= 4; - proto_tree_add_item(http2_tree, hf_http2_priority_update_field_value, tvb, offset, remain, ENC_ASCII|ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_priority_update_field_value, tvb, offset, remain, ENC_ASCII); offset += remain; return offset; @@ -3705,7 +3705,7 @@ dissect_http2_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat proto_item_set_len(ti, MAGIC_FRAME_LENGTH); proto_item_append_text(ti, ": Magic"); - proto_tree_add_item(http2_tree, hf_http2_magic, tvb, offset, MAGIC_FRAME_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(http2_tree, hf_http2_magic, tvb, offset, MAGIC_FRAME_LENGTH, ENC_ASCII); return MAGIC_FRAME_LENGTH; } diff --git a/epan/dissectors/packet-http3.c b/epan/dissectors/packet-http3.c index bd8d81bb60..871db5e7af 100644 --- a/epan/dissectors/packet-http3.c +++ b/epan/dissectors/packet-http3.c @@ -265,7 +265,7 @@ dissect_http3_priority_update(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* offset += lenvar; priority_field_value_len = frame_length - lenvar; - proto_tree_add_item(http3_tree, hf_http3_priority_update_field_value, tvb, offset, (int)priority_field_value_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(http3_tree, hf_http3_priority_update_field_value, tvb, offset, (int)priority_field_value_len, ENC_ASCII); offset += (int)priority_field_value_len; return offset; diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 3554fefa70..f33d591f1d 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -188,7 +188,7 @@ add_authval_str(proto_tree *tree, int type, int len, tvbuff_t *tvb, int offset) break; case IAPP_AUTH_USERNAME: case IAPP_AUTH_PROVNAME: - proto_tree_add_item(tree, hf_iapp_auth_string, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_iapp_auth_string, tvb, offset, 1, ENC_ASCII); break; case IAPP_AUTH_RXPKTS: case IAPP_AUTH_TXPKTS: @@ -251,7 +251,7 @@ append_pduval_str(proto_tree *tree, int type, int len, tvbuff_t *tvb, int offset switch (type) { case IAPP_PDU_SSID: - proto_tree_add_item(tree, hf_iapp_pdu_ssid, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_iapp_pdu_ssid, tvb, offset, len, ENC_ASCII); break; case IAPP_PDU_BSSID: case IAPP_PDU_OLDBSSID: diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index a46bae93c8..24f5ffd195 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1850,7 +1850,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset, case AST_FRAME_DTMF_BEGIN: case AST_FRAME_DTMF_END: - proto_tree_add_item(packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, ENC_ASCII); offset += 10; col_append_fstr(pinfo->cinfo, COL_INFO, " digit %c", csub); diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 7404e1278f..2b4d59cdae 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -943,7 +943,7 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* message header */ - proto_tree_add_item(icep_tree, hf_icep_magic_number, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(icep_tree, hf_icep_magic_number, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(icep_tree, hf_icep_protocol_major, diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 1287e21cc9..47d8b5d3cf 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -869,7 +869,7 @@ dissect_interface_information_object(tvbuff_t * tvb, gint offset, offset += 1; } if (obj_end_offset >= offset + int_name_length) { - proto_tree_add_item(int_name_object_tree, hf_icmp_int_info_name_string, tvb, offset, int_name_length - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(int_name_object_tree, hf_icmp_int_info_name_string, tvb, offset, int_name_length - 1, ENC_ASCII); offset += int_name_length - 1; } } @@ -915,7 +915,7 @@ dissect_interface_identification_object(tvbuff_t * tvb, gint offset, switch(c_type) { case ICMP_EXT_ECHO_IDENT_NAME: - proto_tree_add_item(ext_object_tree, hf_icmp_int_ident_name_string, tvb, offset, obj_length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(ext_object_tree, hf_icmp_int_ident_name_string, tvb, offset, obj_length - 4, ENC_ASCII); break; case ICMP_EXT_ECHO_IDENT_INDEX: proto_tree_add_item(ext_object_tree, hf_icmp_int_ident_index, tvb, offset, 4, ENC_NA); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index c23ed161ec..05d0e3cc8a 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1995,7 +1995,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; case 2: /* FQDN */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_fqdn, tvb, opt_offset, par_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_fqdn, tvb, opt_offset, par_len, ENC_ASCII); break; default: break; @@ -2530,7 +2530,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree { proto_item *ti_cp; - ti_cp = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_captive_portal, tvb, opt_offset, opt_len-2, ENC_ASCII|ENC_NA); + ti_cp = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_captive_portal, tvb, opt_offset, opt_len-2, ENC_ASCII); proto_item_set_url(ti_cp); opt_offset += opt_len - 2; diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 72624e54f9..5c72689a54 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -94,7 +94,7 @@ static void dissect_icp_payload(tvbuff_t *tvb, packet_info *pinfo, int offset, /* null terminated URL */ stringlength = tvb_strsize(tvb, offset); - proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII|ENC_NA); + proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII); break; case CODE_ICP_OP_SECHO: @@ -105,13 +105,13 @@ static void dissect_icp_payload(tvbuff_t *tvb, packet_info *pinfo, int offset, case CODE_ICP_OP_MISS_NOFETCH: case CODE_ICP_OP_DENIED: stringlength = tvb_strsize(tvb, offset); - proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII|ENC_NA); + proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII); break; case CODE_ICP_OP_HIT_OBJ: /* null terminated URL */ stringlength = tvb_strsize(tvb, offset); - proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII|ENC_NA); + proto_tree_add_item(pload_tree, hf_icp_url, tvb, offset, stringlength, ENC_ASCII); offset += stringlength; /* 2 byte object size */ diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 1360aba5dc..717950a11e 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -539,7 +539,7 @@ icqv5_decode_msgType(proto_tree *tree, tvbuff_t *tvb, int offset, int size, "Unknown msgType: %u (0x%x)", msgType, msgType); break; case MSG_TEXT: - proto_tree_add_item(subtree, hf_icq_msg, tvb, offset, left, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_icq_msg, tvb, offset, left, ENC_ASCII); break; case MSG_URL: for (n = 0; n < N_URL_FIELDS; n++) { @@ -646,7 +646,7 @@ icqv5_decode_msgType(proto_tree *tree, tvbuff_t *tvb, int offset, int size, if (n_local == 0) { /* The first element is the number of Nick/UIN pairs follow */ - proto_tree_add_item(subtree, hf_icq_num_uin_pairs, tvb, offset, sz_local, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_icq_num_uin_pairs, tvb, offset, sz_local, ENC_ASCII); n_local++; } else if (!last) { int svsz = sz_local; @@ -694,7 +694,7 @@ icqv5_cmd_send_text_code(proto_tree *tree, /* Tree to put the data in */ proto_tree_add_item(subtree, hf_icq_text_code_length, tvb, offset + CMD_SEND_TEXT_CODE_LEN, 2, ENC_LITTLE_ENDIAN); if (len>0) { - proto_tree_add_item(subtree, hf_icq_text_code, tvb, offset + CMD_SEND_TEXT_CODE_TEXT, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_icq_text_code, tvb, offset + CMD_SEND_TEXT_CODE_TEXT, len, ENC_ASCII); } proto_tree_add_item(subtree, hf_icq_x1, tvb, offset + CMD_SEND_TEXT_CODE_TEXT + len, 2, ENC_LITTLE_ENDIAN); @@ -726,7 +726,7 @@ icqv5_cmd_login(proto_tree *tree, tvbuff_t *tvb, int offset) (guint32)theTime, "%u = %s", (guint32)theTime, aTime); proto_tree_add_item(subtree, hf_icq_login_port, tvb, offset + CMD_LOGIN_PORT, 4, ENC_LITTLE_ENDIAN); passwdLen = tvb_get_letohs(tvb, offset + CMD_LOGIN_PASSLEN); - proto_tree_add_item(subtree, hf_icq_login_password, tvb, offset + CMD_LOGIN_PASSLEN, 2 + passwdLen, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_icq_login_password, tvb, offset + CMD_LOGIN_PASSLEN, 2 + passwdLen, ENC_ASCII); proto_tree_add_item(subtree, hf_icq_login_ip, tvb, offset + CMD_LOGIN_PASSWD + passwdLen + CMD_LOGIN_IP, 4, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_icq_status, tvb, offset + CMD_LOGIN_PASSWD + passwdLen + CMD_LOGIN_STATUS, 4, ENC_LITTLE_ENDIAN); } diff --git a/epan/dissectors/packet-idn.c b/epan/dissectors/packet-idn.c index 2fa4f58543..38f1e9fbc3 100644 --- a/epan/dissectors/packet-idn.c +++ b/epan/dissectors/packet-idn.c @@ -1003,7 +1003,7 @@ static int dissect_idn_servicemap_entry(tvbuff_t *tvb, int offset, proto_tree *i offset += 1; proto_tree_add_item(idn_servicemap_entry_tree, idn_relay_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(idn_servicemap_entry_tree, idn_name, tvb, offset, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(idn_servicemap_entry_tree, idn_name, tvb, offset, 20, ENC_ASCII); offset += 20; return offset; } @@ -1063,7 +1063,7 @@ static int dissect_idn_scan_response(tvbuff_t *tvb, int offset, proto_tree *idn_ offset += 1; proto_tree_add_item(idn_scanreply_header_tree, idn_unit_id, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(idn_scanreply_header_tree, idn_name, tvb, offset, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(idn_scanreply_header_tree, idn_name, tvb, offset, 20, ENC_ASCII); offset += 20; return offset; } diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 166f637e9b..62bb7e682b 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -2981,7 +2981,7 @@ dissect_iec60870_5_103(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case 0x05: /* ASDU 5 - Identification */ proto_tree_add_item(iec103_tree, hf_iec60870_5_103_col, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(iec103_tree, hf_iec60870_5_103_mfg, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(iec103_tree, hf_iec60870_5_103_mfg, tvb, offset, 8, ENC_ASCII); offset += 8; proto_tree_add_item(iec103_tree, hf_iec60870_5_103_mfg_sw, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index a90000f97e..af935ca450 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -2804,7 +2804,7 @@ dissect_17221_ctrl_val(tvbuff_t *tvb, proto_tree *tree, guint16 num_ctrl_vals, g } else if (ctrl_val_type == 0x14) { tvb_get_const_stringz(tvb, ctrl_offset, &string_length); proto_tree_add_item(ctrl_subtree, hf_aem_string, tvb, - ctrl_offset, string_length, ENC_ASCII|ENC_NA); + ctrl_offset, string_length, ENC_ASCII); /* BODE_PLOT TYPE */ } else if (ctrl_val_type == 0x15) { @@ -2961,17 +2961,17 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(aem_tree, hf_aecp_association_id, tvb, ENTITY_OFFSET_ASSOCIATION_ID, 8, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_entity_name, tvb, - ENTITY_OFFSET_ENTITY_NAME, 64, ENC_ASCII|ENC_NA); + ENTITY_OFFSET_ENTITY_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_vendor_name_string, tvb, ENTITY_OFFSET_VENDOR_NAME_STRING, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_model_name_string, tvb, ENTITY_OFFSET_MODEL_NAME_STRING, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_firmware_version, tvb, - ENTITY_OFFSET_FIRMWARE_VERSION, 64, ENC_ASCII|ENC_NA); + ENTITY_OFFSET_FIRMWARE_VERSION, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_group_name, tvb, - ENTITY_OFFSET_GROUP_NAME, 64, ENC_ASCII|ENC_NA); + ENTITY_OFFSET_GROUP_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_serial_number, tvb, - ENTITY_OFFSET_SERIAL_NUMBER, 64, ENC_ASCII|ENC_NA); + ENTITY_OFFSET_SERIAL_NUMBER, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_configurations_count, tvb, ENTITY_OFFSET_CONFIGURATIONS_COUNT, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_current_configuration, tvb, @@ -2979,7 +2979,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_CONFIGURATION: proto_tree_add_item(aem_tree, hf_aem_configuration_name, tvb, - CONFIGURATION_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + CONFIGURATION_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_configuration_name_string, tvb, CONFIGURATION_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_descriptor_counts_count, tvb, @@ -3002,7 +3002,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_AUDIO_UNIT: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - AUDIO_UNIT_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + AUDIO_UNIT_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, AUDIO_UNIT_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3121,7 +3121,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) case AEM_DESCRIPTOR_VIDEO_UNIT: case AEM_DESCRIPTOR_SENSOR_UNIT: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - VIDEO_UNIT_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + VIDEO_UNIT_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, VIDEO_UNIT_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3199,7 +3199,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) case AEM_DESCRIPTOR_STREAM_INPUT: case AEM_DESCRIPTOR_STREAM_OUTPUT: proto_tree_add_item(aem_tree, hf_aem_stream_name, tvb, - STREAM_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + STREAM_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_stream_name_string, tvb, STREAM_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3266,7 +3266,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) case AEM_DESCRIPTOR_JACK_INPUT: case AEM_DESCRIPTOR_JACK_OUTPUT: proto_tree_add_item(aem_tree, hf_aem_jack_name, tvb, - JACK_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + JACK_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_jack_name_string, tvb, JACK_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3385,7 +3385,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_AVB_INTERFACE: proto_tree_add_item(aem_tree, hf_aem_interface_name, tvb, - AVB_INTERFACE_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + AVB_INTERFACE_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_interface_name_string, tvb, AVB_INTERFACE_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3413,7 +3413,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_CLOCK_SOURCE: proto_tree_add_item(aem_tree, hf_aem_clock_source_name, tvb, - CLOCK_SOURCE_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + CLOCK_SOURCE_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_clock_source_name_string, tvb, CLOCK_SOURCE_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); /* set up clock_source_flags subtree */ @@ -3462,7 +3462,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_AUDIO_CLUSTER: proto_tree_add_item(aem_tree, hf_aem_configuration_name, tvb, - AUDIO_CLUSTER_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + AUDIO_CLUSTER_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_configuration_name_string, tvb, AUDIO_CLUSTER_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3487,7 +3487,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_CONTROL: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - CONTROL_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + CONTROL_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, CONTROL_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3525,7 +3525,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_SIGNAL_SELECTOR: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - SIGNAL_SELECTOR_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + SIGNAL_SELECTOR_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, SIGNAL_SELECTOR_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3544,7 +3544,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(aem_tree, hf_aem_control_domain, tvb, AEM_OFFSET_CONTROL_DOMAIN_SIGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - AEM_OFFSET_CONTROL_NAME_SIGS, 64, ENC_ASCII|ENC_NA); + AEM_OFFSET_CONTROL_NAME_SIGS, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, AEM_OFFSET_CONTROL_NAME_STRING_SIGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_sources_offset, tvb, @@ -3584,7 +3584,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_MIXER: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - MIXER_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + MIXER_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, MIXER_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3605,7 +3605,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(aem_tree, hf_aem_control_domain, tvb, AEM_OFFSET_CONTROL_DOMAIN_MXR, 2 ,ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - AEM_OFFSET_CONTROL_NAME_MXR, 64, ENC_ASCII|ENC_NA); + AEM_OFFSET_CONTROL_NAME_MXR, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, AEM_OFFSET_CONTROL_NAME_STRING_MXR, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_sources_offset, tvb, @@ -3646,7 +3646,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_MATRIX: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - MATRIX_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + MATRIX_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, MATRIX_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); @@ -3669,7 +3669,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(aem_tree, hf_aem_control_domain, tvb, AEM_OFFSET_CONTROL_DOMAIN_MTRX, 2 ,ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - AEM_OFFSET_CONTROL_NAME_MTRX, 64, ENC_ASCII|ENC_NA); + AEM_OFFSET_CONTROL_NAME_MTRX, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, AEM_OFFSET_CONTROL_NAME_STRING_MTRX, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_width, tvb, @@ -3702,7 +3702,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_LOCALE: proto_tree_add_item(aem_tree, hf_aem_locale_identifier, tvb, - LOCALE_OFFSET_LOCALE_IDENTIFIER, 64, ENC_ASCII|ENC_NA); + LOCALE_OFFSET_LOCALE_IDENTIFIER, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_number_of_strings, tvb, LOCALE_OFFSET_NUMBER_OF_STRINGS, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_base_strings, tvb, @@ -3712,7 +3712,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) mr_offset = STRINGS_OFFSET_STRING0; for(i = 0; i < 7; ++i) { proto_tree_add_item(aem_tree, hf_aem_string, tvb, - mr_offset, 64, ENC_ASCII|ENC_NA); + mr_offset, 64, ENC_ASCII); mr_offset += 64; } break; @@ -3747,7 +3747,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(aem_tree, hf_aem_target_descriptor_id, tvb, MEMORY_OBJECT_OFFSET_TARGET_DESCRIPTOR_INDEX, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - MEMORY_OBJECT_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + MEMORY_OBJECT_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, MEMORY_OBJECT_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_start_address, tvb, @@ -3757,7 +3757,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case AEM_DESCRIPTOR_CLOCK_DOMAIN: proto_tree_add_item(aem_tree, hf_aem_object_name, tvb, - CLOCK_DOMAIN_OFFSET_OBJECT_NAME, 64, ENC_ASCII|ENC_NA); + CLOCK_DOMAIN_OFFSET_OBJECT_NAME, 64, ENC_ASCII); proto_tree_add_item(aem_tree, hf_aem_localized_description, tvb, CLOCK_DOMAIN_OFFSET_LOCALIZED_DESCRIPTION, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aem_tree, hf_aem_clock_source_index, tvb, @@ -4017,7 +4017,7 @@ dissect_17221_aecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aecp_tree) if ((mess_type == AECP_AEM_RESPONSE_MESSAGE) || (c_type == AECP_COMMAND_SET_NAME)) { proto_tree_add_item(aecp_tree, hf_aecp_name, tvb, - AECP_OFFSET_NAME_NAME, 64, ENC_ASCII|ENC_NA); + AECP_OFFSET_NAME_NAME, 64, ENC_ASCII); } break; case AECP_COMMAND_SET_ASSOCIATION_ID: diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index 10b47148bf..f06101e008 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -2126,7 +2126,7 @@ dissect_generic_phy_device_info(tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_item(intf_tree, hf_ieee1905_local_intf_url, tvb, - offset, url_field_count, ENC_ASCII|ENC_NA); + offset, url_field_count, ENC_ASCII); offset += url_field_count; proto_tree_add_item(intf_tree, hf_ieee1905_local_intf_spec, tvb, @@ -2173,7 +2173,7 @@ dissect_control_url_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint16 len) { proto_tree_add_item(tree, hf_ieee1905_control_url, tvb, offset, - len, ENC_ASCII|ENC_NA); + len, ENC_ASCII); offset += len; return offset; @@ -2870,7 +2870,7 @@ dissect_ap_operational_bss(tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_item(local_intf_tree, hf_ieee1905_ap_local_intf_ssid, - tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + tvb, offset, ssid_len, ENC_ASCII); offset += ssid_len; proto_item_set_len(itpi, offset - local_intf_offset); @@ -4133,7 +4133,7 @@ dissect_beacon_metrics_query(tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_item(tree, hf_ieee1905_beacon_metrics_query_ssid, - tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + tvb, offset, ssid_len, ENC_ASCII); offset += ssid_len; /* @@ -5379,7 +5379,7 @@ dissect_channel_scan_result(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(neigh_tree, hf_ieee1905_channel_scan_result_ssid, - tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + tvb, offset, ssid_len, ENC_ASCII); offset += ssid_len; proto_tree_add_item(neigh_tree, @@ -5393,7 +5393,7 @@ dissect_channel_scan_result(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(neigh_tree, hf_ieee1905_channel_scan_result_bw, - tvb, offset, channel_bw_len, ENC_ASCII|ENC_NA); + tvb, offset, channel_bw_len, ENC_ASCII); offset += channel_bw_len; flags = tvb_get_guint8(tvb, offset); @@ -6519,7 +6519,7 @@ dissect_traffic_separation_policy(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(ssid_tree, hf_ieee1905_traffic_separation_policy_ssid, - tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + tvb, offset, ssid_len, ENC_ASCII); offset += ssid_len; proto_tree_add_item(ssid_tree, @@ -6648,7 +6648,7 @@ dissect_bss_configuration_report(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(bss_tree, hf_ieee1905_bss_config_report_ssid, - tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + tvb, offset, ssid_len, ENC_ASCII); offset += ssid_len; proto_item_set_len(bti, offset - bss_item_start); @@ -7500,7 +7500,7 @@ dissect_dpp_bootstrapping_uri_notification(tvbuff_t *tvb, packet_info *pinfo _U_ /* Assume we got the whole URI */ uri_len = len - 18; proto_tree_add_item(tree, hf_ieee1905_dpp_bootstrapping_uri_received, - tvb, offset, uri_len, ENC_ASCII|ENC_NA); + tvb, offset, uri_len, ENC_ASCII); offset += uri_len; return offset; @@ -7580,7 +7580,7 @@ dissect_device_inventory(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(tree, hf_ieee1905_dev_inventory_serial, tvb, offset, - lsn, ENC_ASCII|ENC_NA); + lsn, ENC_ASCII); offset += lsn; lsv = tvb_get_guint8(tvb, offset); @@ -7589,7 +7589,7 @@ dissect_device_inventory(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(tree, hf_ieee1905_dev_inventory_sw_vers, tvb, offset, - lsv, ENC_ASCII|ENC_NA); + lsv, ENC_ASCII); offset += lsv; lee = tvb_get_guint8(tvb, offset); @@ -7598,7 +7598,7 @@ dissect_device_inventory(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(tree, hf_ieee1905_dev_inventory_exec_env, tvb, offset, - lee, ENC_ASCII|ENC_NA); + lee, ENC_ASCII); offset += lee; num_radios = tvb_get_guint8(tvb, offset); @@ -7636,7 +7636,7 @@ dissect_device_inventory(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(radio_tree, hf_ieee1905_dev_inventory_chp_ven, - tvb, offset, lcv, ENC_ASCII|ENC_NA); + tvb, offset, lcv, ENC_ASCII); offset += lcv; proto_item_set_len(rti, offset - start_tree_offset); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index eefd70d087..f2dce6f2b6 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -9215,7 +9215,7 @@ dissect_venue_name_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int break; } proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_language, - tvb, offset, 3, ENC_ASCII|ENC_NA); + tvb, offset, 3, ENC_ASCII); proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_name, tvb, offset + 3, vlen - 3, ENC_UTF_8); offset += vlen; @@ -9244,7 +9244,7 @@ dissect_network_auth_type(proto_tree *tree, tvbuff_t *tvb, int offset, int end) offset += 2; if (len) proto_tree_add_item(tree, hf_ieee80211_ff_anqp_nw_auth_type_url, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); offset += len; } } @@ -9262,7 +9262,7 @@ dissect_anqp_network_auth_type_timestamp(proto_tree *tree, tvbuff_t *tvb, int of offset += 2; if(len) proto_tree_add_item(tree, hf_ieee80211_ff_anqp_nw_auth_type_ts_url, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); offset += len; /* Optional Time Value - Either 0 or 10 octets */ /* Format: Octet 0-1: Year (0-65534) @@ -9591,7 +9591,7 @@ dissect_domain_name_list(proto_tree *tree, tvbuff_t *tvb, int offset, int end) tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_ff_anqp_domain_name, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); offset += len; } } @@ -9609,7 +9609,7 @@ dissect_hs20_subscription_remediation(tvbuff_t *tvb, packet_info *pinfo _U_, offset++; if (tvb_reported_length_remaining(tvb, offset) >= url_len) { pi = proto_tree_add_item(tree, hf_ieee80211_hs20_subscription_remediation_server_url, - tvb, offset, url_len, ENC_ASCII|ENC_NA); + tvb, offset, url_len, ENC_ASCII); offset += url_len; proto_item_set_url(pi); proto_tree_add_item(tree, hf_ieee80211_hs20_subscription_remediation_server_method, @@ -9642,7 +9642,7 @@ dissect_hs20_deauthentication_imminent(tvbuff_t *tvb, packet_info *pinfo _U_, if (tvb_reported_length_remaining(tvb, offset) >= url_len) { pi = proto_tree_add_item(tree, hf_ieee80211_hs20_deauth_imminent_reason_url, - tvb, offset, url_len, ENC_ASCII|ENC_NA); + tvb, offset, url_len, ENC_ASCII); offset += url_len; proto_item_set_url(pi); } @@ -9853,7 +9853,7 @@ dissect_hs20_anqp_nai_home_realm_query(proto_tree *tree, tvbuff_t *tvb, packet_i break; } proto_tree_add_item(tree, hf_ieee80211_hs20_anqp_nai_hrq_realm_name, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); offset += len; } } @@ -9915,7 +9915,7 @@ dissect_hs20_osu_icon_available(proto_tree *tree, tvbuff_t *tvb, offset += 2; proto_tree_add_item(icon_avail, hf_ieee80211_osu_icon_avail_lang_code, tvb, offset, 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 3; icon_type_len = tvb_get_guint8(tvb, offset); @@ -9924,7 +9924,7 @@ dissect_hs20_osu_icon_available(proto_tree *tree, tvbuff_t *tvb, offset++; proto_tree_add_item(icon_avail, hf_ieee80211_osu_icon_avail_icon_type, tvb, offset, - icon_type_len, ENC_ASCII|ENC_NA); + icon_type_len, ENC_ASCII); offset += icon_type_len; icon_filename_len = tvb_get_guint8(tvb, offset); @@ -9933,7 +9933,7 @@ dissect_hs20_osu_icon_available(proto_tree *tree, tvbuff_t *tvb, offset++; proto_tree_add_item(icon_avail, hf_ieee80211_osu_icon_avail_filename, tvb, offset, - icon_filename_len, ENC_ASCII|ENC_NA); + icon_filename_len, ENC_ASCII); offset += icon_filename_len; proto_item_set_len(pi, offset - start_offset); @@ -9978,7 +9978,7 @@ dissect_hs20_osu_provider(proto_tree *tree, tvbuff_t *tvb, offset++; uri_pi = proto_tree_add_item(prov_tree, hf_ieee80211_hs20_osu_server_uri, tvb, offset, - osu_server_uri_len, ENC_ASCII|ENC_NA); + osu_server_uri_len, ENC_ASCII); offset += osu_server_uri_len; proto_item_set_url(uri_pi); @@ -10073,11 +10073,11 @@ dissect_hs20_osu_provider(proto_tree *tree, tvbuff_t *tvb, offset++; proto_tree_add_item(desc_duple, hf_ieee80211_hs20_osu_service_desc_lang, tvb, offset, - 3, ENC_ASCII|ENC_NA); + 3, ENC_ASCII); offset += 3; proto_tree_add_item(desc_duple, hf_ieee80211_hs20_osu_service_desc, tvb, offset, - serv_desc_len - 3, ENC_ASCII|ENC_NA); + serv_desc_len - 3, ENC_ASCII); offset += serv_desc_len - 3; service_desc_index++; @@ -10193,7 +10193,7 @@ dissect_hs20_anqp_operator_icon_metadata(proto_tree *tree, tvbuff_t *tvb, offset += 2; proto_tree_add_item(tree, hf_ieee80211_osu_icon_avail_lang_code, tvb, offset, 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 3; icon_type_len = tvb_get_guint8(tvb, offset); @@ -10202,7 +10202,7 @@ dissect_hs20_anqp_operator_icon_metadata(proto_tree *tree, tvbuff_t *tvb, offset++; proto_tree_add_item(tree, hf_ieee80211_osu_icon_avail_icon_type, tvb, offset, - icon_type_len, ENC_ASCII|ENC_NA); + icon_type_len, ENC_ASCII); offset += icon_type_len; icon_filename_len = tvb_get_guint8(tvb, offset); @@ -10211,7 +10211,7 @@ dissect_hs20_anqp_operator_icon_metadata(proto_tree *tree, tvbuff_t *tvb, offset++; proto_tree_add_item(tree, hf_ieee80211_osu_icon_avail_filename, tvb, offset, - icon_filename_len, ENC_ASCII|ENC_NA); + icon_filename_len, ENC_ASCII); offset += icon_filename_len; proto_item_set_len(pi, offset - start_offset); @@ -10240,7 +10240,7 @@ dissect_anqp_venue_url(proto_tree *tree, tvbuff_t *tvb, int offset, int end) offset++; url_pi = proto_tree_add_item(venue_url, hf_ieee80211_hs20_anqp_venue_url, tvb, offset, - url_duple_len -1, ENC_ASCII|ENC_NA); + url_duple_len -1, ENC_ASCII); proto_item_set_url(url_pi); offset += (url_duple_len - 1); @@ -10318,11 +10318,11 @@ dissect_hs20_anqp_advice_of_charge(proto_tree *tree, tvbuff_t *tvb, int offset, offset += 2; proto_tree_add_item(plan_info_tree, hf_ieee80211_hs20_anqp_aoc_plan_lang, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(plan_info_tree, hf_ieee80211_hs20_anqp_aoc_plan_curcy, tvb, - offset, 3, ENC_ASCII|ENC_NA); + offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(plan_info_tree, hf_ieee80211_hs20_anqp_aoc_plan_information, @@ -11386,7 +11386,7 @@ static guint add_ff_country_str(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_country_str, tvb, offset, 3, - ENC_ASCII|ENC_NA); + ENC_ASCII); return 3; } @@ -11984,7 +11984,7 @@ add_ff_fils_discovery(proto_tree *tree, tvbuff_t *tvb, offset += 4; } else { ssid_length = (fc & PA_FILS_FC_SSID_LENGTH) + 1; - proto_tree_add_item(tree, hf_ieee80211_ff_fils_discovery_ssid, tvb, offset, ssid_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ieee80211_ff_fils_discovery_ssid, tvb, offset, ssid_length, ENC_ASCII); offset += ssid_length; } @@ -13138,7 +13138,7 @@ wnm_bss_trans_mgmt_req(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int ENC_LITTLE_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_ieee80211_ff_url, tvb, offset, url_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += url_len; left -= url_len + 1; } @@ -16665,7 +16665,7 @@ dissect_qos_mgmt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* ett_qos_mgmt_domain_name, NULL, "Domain Name"); proto_tree_add_item(sub_tree, hf_ieee80211_qos_mgmt_domain_name, tvb, - offset, attr_len, ENC_ASCII|ENC_NA); + offset, attr_len, ENC_ASCII); offset += attr_len; break; default: @@ -16966,7 +16966,7 @@ dissect_owe_transition_mode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; } - proto_tree_add_item(tree, hf_ieee80211_wfa_ie_owe_ssid, tvb, offset, ssid_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ieee80211_wfa_ie_owe_ssid, tvb, offset, ssid_len, ENC_ASCII); offset += len; len -= len; @@ -17151,7 +17151,7 @@ dissect_mbo_oce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case OCE_RNR_COMPLETENESS: while (attr_len >= 4) { proto_tree_add_item(attr_tree, hf_ieee80211_wfa_ie_oce_rnr_completeness_short_ssid, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; attr_len -= 4; len -= 4; @@ -17173,7 +17173,7 @@ dissect_mbo_oce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data } while (attr_len >= 4) { proto_tree_add_item(attr_tree, hf_ieee80211_wfa_ie_oce_probe_suppr_ssid, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; attr_len -= 4; len -= 4; @@ -17459,7 +17459,7 @@ dissect_vendor_ie_extreme_mesh(proto_item *item _U_, proto_tree *ietree, break; case 2: { - proto_tree_add_item(ietree, hf_ieee80211_extreme_mesh_ie_mesh_id, tvb, offset, tag_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ietree, hf_ieee80211_extreme_mesh_ie_mesh_id, tvb, offset, tag_len, ENC_ASCII); } break; case 3: @@ -17760,7 +17760,7 @@ dissect_vendor_ie_routerboard(proto_item *item _U_, proto_tree *ietree, if(type == 1){ if(length == 30){ proto_tree_add_item(subtree, hf_ieee80211_vs_routerboard_subtype1_prefix, tvb, offset, 10, ENC_NA); - proto_tree_add_item(subtree, hf_ieee80211_vs_routerboard_subtype1_data, tvb, offset + 10, length - 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_ieee80211_vs_routerboard_subtype1_data, tvb, offset + 10, length - 10, ENC_ASCII); }else{ expert_add_info(pinfo, subitem, &ei_ieee80211_vs_routerboard_unexpected_len); } @@ -18206,7 +18206,7 @@ dissect_vendor_ie_extreme(proto_item *item _U_, proto_tree *ietree, length = tag_len; } - proto_tree_add_item(ietree, hf_ieee80211_vs_extreme_ap_name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(ietree, hf_ieee80211_vs_extreme_ap_name, tvb, offset, length, ENC_ASCII); break; default: @@ -19513,7 +19513,7 @@ dissect_ssid_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* proto_tree_add_uint(entry, hf_ieee80211_tag_length, tvb, offset, 1, len); offset++; proto_tree_add_item(entry, hf_ieee80211_tag_ssid, tvb, offset, len, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += len; } @@ -22133,7 +22133,7 @@ dissect_time_zone(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* int offset = 0; proto_tree_add_item(tree, hf_ieee80211_tag_time_zone, tvb, offset, tag_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); return tvb_captured_length(tvb); } @@ -24369,7 +24369,7 @@ ieee80211_tag_ssid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da Dot11DecryptSetLastSSID(&dot11decrypt_ctx, (CHAR *) ssid, ssid_len); } proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset, tag_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); if (ssid_len > 0) { gchar* s = format_text(wmem_packet_scope(), ssid, ssid_len); @@ -26651,7 +26651,7 @@ ieee80211_tag_measure_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v switch (sub_id) { case MEASURE_REQ_BEACON_SUB_SSID: /* SSID (0) */ - proto_tree_add_item(sub_elem_tree, hf_ieee80211_tag_measure_request_beacon_sub_ssid, tvb, offset, sub_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_elem_tree, hf_ieee80211_tag_measure_request_beacon_sub_ssid, tvb, offset, sub_length, ENC_ASCII); offset += sub_length; break; case MEASURE_REQ_BEACON_SUB_BRI: /* Beacon Reporting Information (1) */ @@ -27363,7 +27363,7 @@ ieee80211_tag_cisco_ccx1_ckip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* The Name of the sending device starts at offset 10 and is up to 15 or 16 bytes in length, \0 padded */ - proto_tree_add_item(tree, hf_ieee80211_tag_cisco_ccx1_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ieee80211_tag_cisco_ccx1_name, tvb, offset, 16, ENC_ASCII); offset += 16; /* Total number off associated clients and repeater access points */ diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 0b6b9cd1ec..2c2ccdc419 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -178,7 +178,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d asize = ACCOUNT_SIZE; } /* XXX - encoding? */ - proto_tree_add_item(tree, hf_account, tvb, offset, asize, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_account, tvb, offset, asize, ENC_ASCII); } offset += ACCOUNT_SIZE; @@ -193,7 +193,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d case IGAP_SUBTYPE_PASSWORD_LEAVE: /* Challenge field is user's password */ /* XXX - encoding? */ - proto_tree_add_item(tree, hf_igap_user_password, tvb, offset, msize, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_igap_user_password, tvb, offset, msize, ENC_ASCII); break; case IGAP_SUBTYPE_CHALLENGE_RESPONSE_JOIN: case IGAP_SUBTYPE_CHALLENGE_RESPONSE_LEAVE: diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index f5ba7e4d49..c1a629ece7 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -502,7 +502,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ uid_offset = next_token; uid_tokenlen = tvb_get_token_len(tvb, next_token, uidlen, &uid_next_token, FALSE); if (uid_tokenlen != 0) { - proto_tree_add_item(reqresp_tree, hf_imap_request_command, tvb, uid_offset, uid_tokenlen, ENC_ASCII|ENC_NA); + 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); proto_item_set_hidden(hidden_item); diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 25d317f85c..0d6867ff5d 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -404,7 +404,7 @@ dissect_imf_address(tvbuff_t *tvb, int offset, int length, proto_item *item, pac group_tree = proto_item_add_subtree(item, ett_imf_group); /* the display-name is mandatory */ - group_item = proto_tree_add_item(group_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII|ENC_NA); + group_item = proto_tree_add_item(group_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII); /* consume any whitespace */ for(addr_pos++ ;addr_pos < (offset + length); addr_pos++) { @@ -441,7 +441,7 @@ dissect_imf_mailbox(tvbuff_t *tvb, int offset, int length, proto_item *item, pac if((addr_pos = tvb_find_guint8(tvb, offset, length, '<')) == -1) { /* we can't find an angle bracket - the whole field is therefore the address */ - (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, offset, length, ENC_ASCII|ENC_NA); + (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, offset, length, ENC_ASCII); } else { /* we can find an angle bracket - let's see if we can find a display name */ @@ -454,12 +454,12 @@ dissect_imf_mailbox(tvbuff_t *tvb, int offset, int length, proto_item *item, pac } if(offset != addr_pos) { /* there is a display name */ - (void) proto_tree_add_item(mbox_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII|ENC_NA); + (void) proto_tree_add_item(mbox_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII); } end_pos = tvb_find_guint8(tvb, addr_pos + 1, length - (addr_pos + 1 - offset), '>'); if(end_pos != -1) { - (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, addr_pos + 1, end_pos - addr_pos - 1, ENC_ASCII|ENC_NA); + (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, addr_pos + 1, end_pos - addr_pos - 1, ENC_ASCII); } } } @@ -491,7 +491,7 @@ dissect_imf_address_list(tvbuff_t *tvb, int offset, int length, proto_item *item } else { item_length = end_offset - item_offset; } - addr_item = proto_tree_add_item(tree, hf_imf_address_list_item, tvb, item_offset, item_length, ENC_ASCII|ENC_NA); + addr_item = proto_tree_add_item(tree, hf_imf_address_list_item, tvb, item_offset, item_length, ENC_ASCII); dissect_imf_address(tvb, item_offset, item_length, addr_item, pinfo); if(end_offset != -1) { @@ -530,7 +530,7 @@ dissect_imf_mailbox_list(tvbuff_t *tvb, int offset, int length, proto_item *item } else { item_length = end_offset - item_offset; } - mbox_item = proto_tree_add_item(tree, hf_imf_mailbox_list_item, tvb, item_offset, item_length, ENC_ASCII|ENC_NA); + mbox_item = proto_tree_add_item(tree, hf_imf_mailbox_list_item, tvb, item_offset, item_length, ENC_ASCII); dissect_imf_mailbox(tvb, item_offset, item_length, mbox_item, pinfo); if(end_offset != -1) { @@ -589,14 +589,14 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa proto_item_append_text(item, ": %s", marking); } else if (tvb_strneql(tvb, item_offset, "fgcolor", 7) == 0) { - proto_tree_add_item(tree, hf_imf_siolabel_fgcolor, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_imf_siolabel_fgcolor, tvb, value_offset, value_length, ENC_ASCII); } else if (tvb_strneql(tvb, item_offset, "bgcolor", 7) == 0) { - proto_tree_add_item(tree, hf_imf_siolabel_bgcolor, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_imf_siolabel_bgcolor, tvb, value_offset, value_length, ENC_ASCII); } else if (tvb_strneql(tvb, item_offset, "type", 4) == 0) { type = tvb_get_string_enc(pinfo->pool, tvb, value_offset + 1, value_length - 2, ENC_ASCII); /* quoted */ - proto_tree_add_item(tree, hf_imf_siolabel_type, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_imf_siolabel_type, tvb, value_offset, value_length, ENC_ASCII); } else if (tvb_strneql(tvb, item_offset, "label", 5) == 0) { gchar *label = tvb_get_string_enc(pinfo->pool, tvb, value_offset + 1, value_length - 2, ENC_ASCII); /* quoted */ @@ -607,11 +607,11 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa proto_tree_add_string_format(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, label, "Label[%d]: \"%s\"", num, label); } else { - proto_tree_add_item(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, ENC_ASCII); } } else { - sub_item = proto_tree_add_item(tree, hf_imf_siolabel_unknown, tvb, item_offset, item_length, ENC_ASCII|ENC_NA); + sub_item = proto_tree_add_item(tree, hf_imf_siolabel_unknown, tvb, item_offset, item_length, ENC_ASCII); expert_add_info(pinfo, sub_item, &ei_imf_unknown_param); } @@ -819,16 +819,16 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if(hf_id == hf_imf_extension_type) { /* remove 2 bytes to take off the final CRLF to make things a little prettier */ - item = proto_tree_add_item(tree, hf_imf_extension, tvb, unknown_offset, end_offset - unknown_offset - 2, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(tree, hf_imf_extension, tvb, unknown_offset, end_offset - unknown_offset - 2, ENC_ASCII); proto_item_append_text(item, " (Contact Wireshark developers if you want this supported.)"); unknown_tree = proto_item_add_subtree(item, ett_imf_extension); - proto_tree_add_item(unknown_tree, hf_imf_extension_type, tvb, unknown_offset, start_offset - 1 - unknown_offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(unknown_tree, hf_imf_extension_type, tvb, unknown_offset, start_offset - 1 - unknown_offset, ENC_ASCII); /* remove 2 bytes to take off the final CRLF to make things a little prettier */ - item = proto_tree_add_item(unknown_tree, hf_imf_extension_value, tvb, value_offset, end_offset - value_offset - 2, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(unknown_tree, hf_imf_extension_value, tvb, value_offset, end_offset - value_offset - 2, ENC_ASCII); } else { /* remove 2 bytes to take off the final CRLF to make things a little prettier */ diff --git a/epan/dissectors/packet-indigocare-icall.c b/epan/dissectors/packet-indigocare-icall.c index f2ea87f224..65b0b8f0e1 100644 --- a/epan/dissectors/packet-indigocare-icall.c +++ b/epan/dissectors/packet-indigocare-icall.c @@ -134,13 +134,13 @@ dissect_icall(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *dat col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s", record_data); break; case INDIGOCARE_ICALL_CALL_ADDITION: - proto_tree_add_item(icall_header_tree, hf_icall_call_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(icall_header_tree, hf_icall_call_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_ICALL_CALL_ID: - proto_tree_add_item(icall_header_tree, hf_icall_call_id_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(icall_header_tree, hf_icall_call_id_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_ICALL_CALL_TASK: - proto_tree_add_item(icall_header_tree, hf_icall_call_task_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(icall_header_tree, hf_icall_call_task_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_ICALL_CALL_LOCATION: proto_tree_add_item_ret_string(icall_header_tree, hf_icall_call_location_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA, pinfo->pool, &record_data); @@ -155,10 +155,10 @@ dissect_icall(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *dat col_append_fstr(pinfo->cinfo, COL_INFO, " Name 2=%s", record_data); break; case INDIGOCARE_ICALL_CALL_TYPE_NUMERICAL: - proto_tree_add_item(icall_header_tree, hf_icall_call_numerical_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(icall_header_tree, hf_icall_call_numerical_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_ICALL_CALL_NURSE: - proto_tree_add_item(icall_header_tree, hf_icall_call_nurse_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(icall_header_tree, hf_icall_call_nurse_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; default: proto_tree_add_expert_format(icall_header_tree, pinfo, &ei_icall_unexpected_record, tvb, identifier_start, data_offset - identifier_start, "Unexpected record %d with value %s", record_identifier, record_data); diff --git a/epan/dissectors/packet-indigocare-netrix.c b/epan/dissectors/packet-indigocare-netrix.c index 4af6b0a6ec..b68e49a737 100644 --- a/epan/dissectors/packet-indigocare-netrix.c +++ b/epan/dissectors/packet-indigocare-netrix.c @@ -263,19 +263,19 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da case INDIGOCARE_NETRIX_SYSTEMINFO: switch (record_identifier) { case INDIGOCARE_NETRIX_SYSTEMINFO_COMPUTERNAME: - proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_computername_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_computername_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Computername=%s", record_data); break; case INDIGOCARE_NETRIX_SYSTEMINFO_IPADDRESS: - proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_ipaddress_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_ipaddress_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " IP Address=%s", record_data); break; case INDIGOCARE_NETRIX_SYSTEMINFO_VERSION: - proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_version_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_version_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Systeminfo=%s", record_data); break; case INDIGOCARE_NETRIX_SYSTEMINFO_BEEP: - proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_beep_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_systeminfo_beep_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; default: proto_tree_add_expert_format(netrix_header_tree, pinfo, &ei_netrix_unexpected_record, tvb, identifier_start, data_offset - identifier_start, "Unexpected record %d with value %s", record_identifier, record_data); @@ -290,25 +290,25 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da col_append_fstr(pinfo->cinfo, COL_INFO, " Groupnumber=%d", group_number); break; case INDIGOCARE_NETRIX_GROUP_TYPE: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_type_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_type_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s", record_data); break; case INDIGOCARE_NETRIX_GROUP_ADDITION: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_NETRIX_GROUP_IDBOSCHLOC: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_idboschloc_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_idboschloc_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_NETRIX_GROUP_NAME: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_name_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_name_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Name=%s", record_data); break; case INDIGOCARE_NETRIX_GROUP_ROOM: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_room_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_room_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Room=%s", record_data); break; case INDIGOCARE_NETRIX_GROUP_LOCATION: - proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_location_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_groupcall_location_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Location=%s", record_data); break; default: @@ -324,25 +324,25 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da col_append_fstr(pinfo->cinfo, COL_INFO, " Profilenumber=%d", profile_number); break; case INDIGOCARE_NETRIX_PROFILE_TYPE: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_type_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_type_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s", record_data); break; case INDIGOCARE_NETRIX_PROFILE_ADDITION: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_addition_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_NETRIX_PROFILE_IDBOSCHLOC: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_idboschloc_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_idboschloc_type, tvb, data_start, data_offset - data_start, ENC_ASCII); break; case INDIGOCARE_NETRIX_PROFILE_NAME: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_name_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_name_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Name=%s", record_data); break; case INDIGOCARE_NETRIX_PROFILE_ROOM: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_room_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_room_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Room=%s", record_data); break; case INDIGOCARE_NETRIX_PROFILE_LOCATION: - proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_location_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_profilecall_location_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Location=%s", record_data); break; default: @@ -353,7 +353,7 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da case INDIGOCARE_NETRIX_GET_CONVERSIONTABLE: switch (record_identifier) { case INDIGOCARE_NETRIX_GET_CONVERSIONTABLE_TABLE: - proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_table_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_table_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Table=%s", record_data); break; } @@ -361,7 +361,7 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da case INDIGOCARE_NETRIX_SEARCH_CONVERSIONTABLES: switch (record_identifier) { case INDIGOCARE_NETRIX_SEARCH_CONVERSIONTABLES_KEY: - proto_tree_add_item(netrix_header_tree, hf_netrix_search_conversiontables_key_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_search_conversiontables_key_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Key=%s", record_data); break; default: @@ -373,11 +373,11 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da if ((header >= INDIGOCARE_NETRIX_GET_CONVERSIONTABLE_BEGIN) && (header <= INDIGOCARE_NETRIX_GET_CONVERSIONTABLE_END)) { switch (record_identifier) { case INDIGOCARE_NETRIX_GET_CONVERSIONTABLE_KEY: - proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_key_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_key_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Key=%s", record_data); break; case INDIGOCARE_NETRIX_GET_CONVERSIONTABLE_VALUE: - proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_value_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_get_conversiontable_value_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Value=%s", record_data); break; default: @@ -387,7 +387,7 @@ dissect_netrix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *da } else if ((header >= INDIGOCARE_NETRIX_SEARCH_CONVERSIONTABLES_BEGIN) && (header <= INDIGOCARE_NETRIX_SEARCH_CONVERSIONTABLES_END)) { switch (record_identifier) { case INDIGOCARE_NETRIX_SEARCH_CONVERSIONTABLES_TABLE: - proto_tree_add_item(netrix_header_tree, hf_netrix_search_conversiontables_table_type, tvb, data_start, data_offset - data_start, ENC_ASCII|ENC_NA); + proto_tree_add_item(netrix_header_tree, hf_netrix_search_conversiontables_table_type, tvb, data_start, data_offset - data_start, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " Table=%s", record_data); break; default: diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index a74d165576..238bdde119 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -4658,7 +4658,7 @@ static void parse_NodeDescription(proto_tree* parentTree, tvbuff_t* tvb, gint *o return; NodeDescription_header_tree = parentTree; - proto_tree_add_item(NodeDescription_header_tree, hf_infiniband_NodeDescription_NodeString, tvb, local_offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(NodeDescription_header_tree, hf_infiniband_NodeDescription_NodeString, tvb, local_offset, 64, ENC_ASCII); } /* Parse NodeInfo Attribute @@ -5838,7 +5838,7 @@ static int parse_ServiceAssociationRecord(proto_tree* parentTree, tvbuff_t* tvb, proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceKey, tvb, local_offset, 16, ENC_NA); local_offset += 16; - proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName, tvb, local_offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName, tvb, local_offset, 64, ENC_ASCII); local_offset += 64; return local_offset; diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index c1f0e6f7af..d1cccbff81 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.c @@ -75,7 +75,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat ilh_tree = proto_tree_add_subtree(il_tree, tvb, 0, 12, ett_interlink_header, NULL, "Interlink Header"); if (ilh_tree) { - proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(ilh_tree, hf_interlink_version, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 8689da73f2..3fb2da59be 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -839,10 +839,10 @@ dissect_ipopt_security(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset += 2; proto_tree_add_item(field_tree, hf_ip_opt_sec_rfc791_hr, - tvb, curr_offset, 2, ENC_ASCII|ENC_NA); + tvb, curr_offset, 2, ENC_ASCII); curr_offset += 2; proto_tree_add_item(field_tree, hf_ip_opt_sec_rfc791_tcc, - tvb, curr_offset, 3, ENC_ASCII|ENC_NA); + tvb, curr_offset, 3, ENC_ASCII); return curr_offset; } } diff --git a/epan/dissectors/packet-ipdr.c b/epan/dissectors/packet-ipdr.c index e095057072..fa98a0fdb5 100644 --- a/epan/dissectors/packet-ipdr.c +++ b/epan/dissectors/packet-ipdr.c @@ -229,7 +229,7 @@ dissect_ipdr_samis_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text(ti, " bytes"); offset += 4; if (len > 0) { - proto_tree_add_item(samis_type_1_tree, hf_ipdr_cmts_host_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(samis_type_1_tree, hf_ipdr_cmts_host_name, tvb, offset, len, ENC_ASCII); offset += len; } @@ -252,7 +252,7 @@ dissect_ipdr_samis_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text(ti, " bytes"); offset += 4; if (len > 0) { - proto_tree_add_item(samis_type_1_tree, hf_ipdr_cmts_md_if_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(samis_type_1_tree, hf_ipdr_cmts_md_if_name, tvb, offset, len, ENC_ASCII); offset += len; } @@ -271,7 +271,7 @@ dissect_ipdr_samis_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v if (len == 16) { proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_addr, tvb, offset, len, ENC_ASCII|ENC_BIG_ENDIAN); } else if (len > 0) { - proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_addr_string, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_addr_string, tvb, offset, len, ENC_ASCII); } offset += len; @@ -281,7 +281,7 @@ dissect_ipdr_samis_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v if (len == 16) { proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_ll_addr, tvb, offset, len, ENC_ASCII|ENC_BIG_ENDIAN); } else if (len > 0) { - proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_ll_addr_string, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(samis_type_1_tree, hf_ipdr_cm_ipv6_ll_addr_string, tvb, offset, len, ENC_ASCII); } offset += len; @@ -333,7 +333,7 @@ dissect_ipdr_samis_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text(ti, " bytes"); offset += 4; if (len > 0) { - proto_tree_add_item(samis_type_1_tree, hf_ipdr_service_class_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(samis_type_1_tree, hf_ipdr_service_class_name, tvb, offset, len, ENC_ASCII); offset += len; } @@ -405,7 +405,7 @@ dissect_ipdr_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case IPDR_FLOW_STOP: proto_tree_add_item(ipdr_tree, hf_ipdr_reason_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ipdr_tree, hf_ipdr_reason_info, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ipdr_tree, hf_ipdr_reason_info, tvb, offset, -1, ENC_ASCII); break; case IPDR_CONNECT: proto_tree_add_item(ipdr_tree, hf_ipdr_initiator_id, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -443,7 +443,7 @@ dissect_ipdr_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case IPDR_SESSION_STOP: proto_tree_add_item(ipdr_tree, hf_ipdr_reason_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ipdr_tree, hf_ipdr_reason_info, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ipdr_tree, hf_ipdr_reason_info, tvb, offset, -1, ENC_ASCII); break; case IPDR_TEMPLATE_DATA: proto_tree_add_item(ipdr_tree, hf_ipdr_config_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -497,7 +497,7 @@ dissect_ipdr_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 4; proto_tree_add_item(ipdr_tree, hf_ipdr_error_code, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ipdr_tree, hf_ipdr_description, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ipdr_tree, hf_ipdr_description, tvb, offset, -1, ENC_ASCII); break; case IPDR_REQUEST: proto_tree_add_item(ipdr_tree, hf_ipdr_template_id, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index c89524f869..2a6a3852b7 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -772,7 +772,7 @@ rq39(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_39_byte1, byte1, ENC_LITTLE_ENDIAN, 0); - proto_tree_add_item(tree, hf_ipmi_app_39_user, tvb, 1, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_app_39_user, tvb, 1, 16, ENC_ASCII); } static void diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index df27d3caf3..3b6259170b 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -1964,7 +1964,7 @@ prop_02(tvbuff_t *tvb, proto_tree *tree) if (len > 12) { len = 12; } - proto_tree_add_item(tree, hf_ipmi_picmg_prop02_desc, tvb, 0, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_picmg_prop02_desc, tvb, 0, len, ENC_ASCII); } static const struct { diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index fe73736b51..916968a3e1 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -2014,7 +2014,7 @@ cfgparam_13(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_se_cp13_stringsel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_se_cp13_blocksel, tvb, 1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, -1, ENC_ASCII); } static void diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index ec36c066dc..7251fdbd95 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -408,7 +408,7 @@ static void rq27(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_27_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_stor_27_clr, tvb, 2, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_stor_27_clr, tvb, 2, 3, ENC_ASCII); proto_tree_add_item(tree, hf_ipmi_stor_27_action, tvb, 5, 1, ENC_LITTLE_ENDIAN); } @@ -605,7 +605,7 @@ static void rq47(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_47_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_stor_47_clr, tvb, 2, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_stor_47_clr, tvb, 2, 3, ENC_ASCII); proto_tree_add_item(tree, hf_ipmi_stor_47_action, tvb, 5, 1, ENC_LITTLE_ENDIAN); } diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 64cd4083c8..d509ee27f8 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -943,7 +943,7 @@ lan_15(tvbuff_t *tvb, proto_tree *tree) static void lan_16(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_lan16_comm_string, tvb, 0, 18, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_lan16_comm_string, tvb, 0, 18, ENC_ASCII); } static void @@ -1670,25 +1670,25 @@ static void serial_10(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial10_set_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_serial10_init_str, tvb, 1, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial10_init_str, tvb, 1, -1, ENC_ASCII); } static void serial_11(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, ENC_ASCII); } static void serial_12(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial12_hangup_seq, tvb, 0, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial12_hangup_seq, tvb, 0, 8, ENC_ASCII); } static void serial_13(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial13_dial_cmd, tvb, 0, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial13_dial_cmd, tvb, 0, 8, ENC_ASCII); } static void @@ -1700,7 +1700,7 @@ serial_14(tvbuff_t *tvb, proto_tree *tree) static void serial_15(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial15_comm_string, tvb, 0, 18, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial15_comm_string, tvb, 0, 18, ENC_ASCII); } static void @@ -1790,7 +1790,7 @@ serial_21(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial21_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_item(tree, hf_ipmi_trn_serial21_blockno, tvb, 1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, ENC_ASCII); } static void @@ -1835,14 +1835,14 @@ static void serial_26(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_passwd, tvb, 1, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_passwd, tvb, 1, 6, ENC_ASCII); } static void serial_27(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_pager_id, tvb, 1, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_pager_id, tvb, 1, 16, ENC_ASCII); } static void @@ -1860,7 +1860,7 @@ serial_28(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_trn_serial28_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_serial28_byte2, byte2, ENC_LITTLE_ENDIAN, 0); - proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, ENC_ASCII); proto_tree_add_item(tree, hf_ipmi_trn_serial28_ctrl_esc, tvb, 5, 4, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL, ett_ipmi_trn_serial28_byte10, byte10, ENC_LITTLE_ENDIAN, 0); @@ -1928,7 +1928,7 @@ serial_33(tvbuff_t *tvb, proto_tree *tree) static void serial_34(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_serial34_chap_name, tvb, 0, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial34_chap_name, tvb, 0, 16, ENC_ASCII); } static void @@ -1977,7 +1977,7 @@ serial_40(tvbuff_t *tvb, proto_tree *tree) if (slen > 16) { slen = 16; } - proto_tree_add_item(tree, hf_ipmi_trn_serial40_username, tvb, 1, slen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial40_username, tvb, 1, slen, ENC_ASCII); } static void @@ -1990,7 +1990,7 @@ serial_41(tvbuff_t *tvb, proto_tree *tree) if (slen > 16) { slen = 16; } - proto_tree_add_item(tree, hf_ipmi_trn_serial41_userdomain, tvb, 1, slen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial41_userdomain, tvb, 1, slen, ENC_ASCII); } static void @@ -2003,7 +2003,7 @@ serial_42(tvbuff_t *tvb, proto_tree *tree) if (slen > 16) { slen = 16; } - proto_tree_add_item(tree, hf_ipmi_trn_serial42_userpass, tvb, 1, slen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial42_userpass, tvb, 1, slen, ENC_ASCII); } static void @@ -2058,7 +2058,7 @@ serial_49(tvbuff_t *tvb, proto_tree *tree) if (slen > 16) { slen = 16; } - proto_tree_add_item(tree, hf_ipmi_trn_serial49_dialstr, tvb, 1, slen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_serial49_dialstr, tvb, 1, slen, ENC_ASCII); } static void @@ -2322,11 +2322,11 @@ rq13(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs13(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_13_code1, tvb, 0, 3, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_ipmi_trn_13_code2, tvb, 3, 3, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_ipmi_trn_13_code3, tvb, 6, 3, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_ipmi_trn_13_code4, tvb, 9, 3, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_ipmi_trn_13_code5, tvb, 12, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipmi_trn_13_code1, tvb, 0, 3, ENC_ASCII); + proto_tree_add_item(tree, hf_ipmi_trn_13_code2, tvb, 3, 3, ENC_ASCII); + proto_tree_add_item(tree, hf_ipmi_trn_13_code3, tvb, 6, 3, ENC_ASCII); + proto_tree_add_item(tree, hf_ipmi_trn_13_code4, tvb, 9, 3, ENC_ASCII); + proto_tree_add_item(tree, hf_ipmi_trn_13_code5, tvb, 12, 3, ENC_ASCII); } /* Set PPP UDP Proxy Transmit Data diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 968b22bef5..26464d3106 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -940,7 +940,7 @@ add_integer_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, int valoffset = offset + 1 + 2 + name_length + 2; if (name_length > 0) - proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII); switch (tag) { case TAG_BOOLEAN: @@ -1269,11 +1269,11 @@ add_octetstring_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, int endoffset; if (name_length > 0) - proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII); switch (tag) { case TAG_OCTETSTRING : - proto_tree_add_item(tree, hf_ipp_octetstring_value, tvb, valoffset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipp_octetstring_value, tvb, valoffset, value_length, ENC_ASCII); break; case TAG_DATETIME : @@ -1422,10 +1422,10 @@ add_charstring_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, int valoffset = offset + 1 + 2 + name_length + 2; if (name_length > 0) - proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipp_name, tvb, offset + 1 + 2, name_length, ENC_ASCII); if (tag == TAG_MEMBERATTRNAME) - proto_tree_add_item(tree, hf_ipp_memberattrname, tvb, valoffset, value_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ipp_memberattrname, tvb, valoffset, value_length, ENC_ASCII); else proto_tree_add_string_format(tree, hf_ipp_charstring_value, tvb, valoffset, value_length, NULL, "%s value: '%s'", tag_desc, tvb_format_text(wmem_packet_scope(), tvb, valoffset, value_length)); } diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 39ea471e3a..a5cb1bf3a1 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -131,7 +131,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ ipxwan_tree = proto_item_add_subtree(ti, ett_ipxwan); proto_tree_add_item(ipxwan_tree, hf_ipxwan_identifier, tvb, - offset, 4, ENC_ASCII|ENC_NA); + offset, 4, ENC_ASCII); offset += 4; packet_type = tvb_get_guint8(tvb, offset); @@ -197,7 +197,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ tvb, offset+2, 4, ENC_NA); proto_tree_add_item(option_tree, hf_ipxwan_router_name, tvb, - offset+6, 48, ENC_ASCII|ENC_NA); + offset+6, 48, ENC_ASCII); } break; diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index 3277120288..6de549aed9 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -97,7 +97,7 @@ dissect_irc_tag_data(proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offs } /* Placeholder to call CTCP dissector, strip out delimiter */ - proto_tree_add_item(tree, hf_irc_ctcp, tvb, offset+1, datalen-2, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_irc_ctcp, tvb, offset+1, datalen-2, ENC_ASCII); } static void @@ -115,7 +115,7 @@ dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int off guchar found_tag_needle = 0; gboolean first_command_param = TRUE; - request_item = proto_tree_add_item(tree, hf_irc_request, tvb, offset, linelen, ENC_ASCII|ENC_NA); + request_item = proto_tree_add_item(tree, hf_irc_request, tvb, offset, linelen, ENC_ASCII); if (linelen <= 0) return; @@ -132,7 +132,7 @@ dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int off return; } - proto_tree_add_item(request_tree, hf_irc_request_prefix, tvb, offset+1, eop_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(request_tree, hf_irc_request_prefix, tvb, offset+1, eop_offset-offset-1, ENC_ASCII); offset = eop_offset+1; } @@ -193,7 +193,7 @@ dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int off /* Check if message has a trailer */ if (tvb_get_guint8(tvb, offset) == ':') { - proto_tree_add_item(request_tree, hf_irc_request_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(request_tree, hf_irc_request_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII); dissect_irc_tag_data(request_tree, request_item, tvb, offset+1, end_offset-offset-1, pinfo, str_command); return; } @@ -219,11 +219,11 @@ dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int off if (eocp_offset == -1) { - proto_tree_add_item(command_tree, hf_irc_request_command_param, tvb, offset, end_offset-offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_irc_request_command_param, tvb, offset, end_offset-offset, ENC_ASCII); return; } - proto_tree_add_item(command_tree, hf_irc_request_command_param, tvb, offset, eocp_offset-offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_irc_request_command_param, tvb, offset, eocp_offset-offset, ENC_ASCII); offset = eocp_offset+1; /* clear out any whitespace before next command parameter */ @@ -239,7 +239,7 @@ dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int off /* Check if message has a trailer */ if (tvb_get_guint8(tvb, offset) == ':') { - proto_tree_add_item(request_tree, hf_irc_request_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(request_tree, hf_irc_request_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII); dissect_irc_tag_data(request_tree, request_item, tvb, offset+1, end_offset-offset-1, pinfo, str_command); return; } @@ -279,7 +279,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of guchar found_tag_needle = 0; gboolean first_command_param = TRUE; - response_item = proto_tree_add_item(tree, hf_irc_response, tvb, offset, linelen, ENC_ASCII|ENC_NA); + response_item = proto_tree_add_item(tree, hf_irc_response, tvb, offset, linelen, ENC_ASCII); if (linelen <= 0) return; @@ -296,7 +296,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of return; } - proto_tree_add_item(response_tree, hf_irc_response_prefix, tvb, offset+1, eop_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(response_tree, hf_irc_response_prefix, tvb, offset+1, eop_offset-offset-1, ENC_ASCII); offset = eop_offset+1; } @@ -361,7 +361,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of /* Check if message has a trailer */ if (tvb_get_guint8(tvb, offset) == ':') { - proto_tree_add_item(response_tree, hf_irc_response_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(response_tree, hf_irc_response_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII); dissect_irc_tag_data(response_tree, response_item, tvb, offset+1, end_offset-offset-1, pinfo, str_command); return; } @@ -385,11 +385,11 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of if (eocp_offset == -1) { - proto_tree_add_item(command_tree, hf_irc_response_command_param, tvb, offset, end_offset-offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_irc_response_command_param, tvb, offset, end_offset-offset, ENC_ASCII); return; } - proto_tree_add_item(command_tree, hf_irc_response_command_param, tvb, offset, eocp_offset-offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_irc_response_command_param, tvb, offset, eocp_offset-offset, ENC_ASCII); offset = eocp_offset+1; /* clear out any whitespace before next command parameter */ @@ -405,7 +405,7 @@ dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of /* Check if message has a trailer */ if (tvb_get_guint8(tvb, offset) == ':') { - proto_tree_add_item(response_tree, hf_irc_response_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(response_tree, hf_irc_response_trailer, tvb, offset+1, end_offset-offset-1, ENC_ASCII); dissect_irc_tag_data(response_tree, response_item, tvb, offset+1, end_offset-offset-1, pinfo, str_command); return; } diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index cb64173478..1cfd90d405 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -4407,7 +4407,7 @@ dissect_cert(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp offset += 20; length -= 20; - ti_url = proto_tree_add_item(tree, hf_isakmp_cert_x509_url, tvb, offset, length, ENC_ASCII|ENC_NA); + ti_url = proto_tree_add_item(tree, hf_isakmp_cert_x509_url, tvb, offset, length, ENC_ASCII); proto_item_set_url(ti_url); } break; @@ -4876,7 +4876,7 @@ dissect_notif(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_t proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6, tvb, offset+2, 16, ENC_NA); break; case 3: - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_ASCII); break; default : proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_NA); @@ -5139,7 +5139,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length >= 19 && memcmp(pVID, VID_ARUBA_VIA_AUTH_PROFILE, 19) == 0) { offset += 19; - proto_tree_add_item(tree, hf_isakmp_vid_aruba_via_auth_profile, tvb, offset, length-19, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isakmp_vid_aruba_via_auth_profile, tvb, offset, length-19, ENC_ASCII); offset += 4; } diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index e3d534aa02..b753712660 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -609,7 +609,7 @@ addTextKeys(packet_info *pinfo, proto_tree *tt, tvbuff_t *tvb, gint offset, guin } *value++ = 0; - proto_tree_add_item(tt, hf_iscsi_KeyValue, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tt, hf_iscsi_KeyValue, tvb, offset, len, ENC_ASCII); if (!strcmp(key, "TargetAddress")) { iscsi_dissect_TargetAddress(pinfo, tvb, tt, value, offset + (guint)strlen("TargetAddress") + 2); } diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c index f0f2b5d664..00d0efd688 100644 --- a/epan/dissectors/packet-isi.c +++ b/epan/dissectors/packet-isi.c @@ -679,11 +679,11 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i cmd = tvb_get_guint8(tvb, 2); switch(cmd) { case 0x00: /* DISABLE */ - proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "disable SIM startup protection"); break; case 0x01: /* ENABLE */ - proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "enable SIM startup protection"); break; case 0x04: /* STATUS */ @@ -707,8 +707,8 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i switch(code) { case 0x02: /* PIN */ col_set_str(pinfo->cinfo, COL_INFO, "update SIM PIN"); - proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII); + proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII); break; case 0x03: /* PUK */ col_set_str(pinfo->cinfo, COL_INFO, "update SIM PUK"); @@ -730,12 +730,12 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i switch(code) { case 0x02: /* PIN */ col_set_str(pinfo->cinfo, COL_INFO, "SIM Authentication with PIN"); - proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII); break; case 0x03: /* PUK */ col_set_str(pinfo->cinfo, COL_INFO, "SIM Authentication with PUK"); - proto_tree_add_item(tree, hf_isi_sim_auth_puk, tvb, 2, 11, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isi_sim_auth_puk, tvb, 2, 11, ENC_ASCII); + proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII); break; default: col_set_str(pinfo->cinfo, COL_INFO, "unknown SIM Authentication request"); diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index b327fd9bde..8977328ba9 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -692,7 +692,7 @@ dissect_hello_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree, int offset, isis_data_t *isis _U_, int length) { if ( length != 0 ) { - proto_tree_add_item( tree, hf_isis_hello_clv_ip_authentication, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_isis_hello_clv_ip_authentication, tvb, offset, length, ENC_ASCII); } } diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index d534dcb6be..c7fd1a9361 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -2710,7 +2710,7 @@ dissect_lsp_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_t isis_data_t *isis _U_, int length) { if ( length != 0 ) { - proto_tree_add_item(tree, hf_isis_lsp_ip_authentication, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isis_lsp_ip_authentication, tvb, offset, length, ENC_ASCII); } } diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c index dbe780c297..c9603753ed 100644 --- a/epan/dissectors/packet-isis-snp.c +++ b/epan/dissectors/packet-isis-snp.c @@ -96,7 +96,7 @@ dissect_csnp_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_ isis_data_t *isis _U_, int length) { if ( length != 0 ) { - proto_tree_add_item(tree, hf_isis_csnp_ip_authentication, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isis_csnp_ip_authentication, tvb, offset, length, ENC_ASCII); } } @@ -105,7 +105,7 @@ dissect_psnp_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_ isis_data_t *isis _U_, int length) { if ( length != 0 ) { - proto_tree_add_item(tree, hf_isis_psnp_ip_authentication, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_isis_psnp_ip_authentication, tvb, offset, length, ENC_ASCII); } } diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 069e7ce444..726d76c584 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -879,7 +879,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, /* delimiter has no data */ break; case ISNS_ATTR_TAG_ENTITY_IDENTIFIER: - proto_tree_add_item(attr_tree, hf_isns_entity_identifier, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_entity_identifier, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_ENTITY_PROTOCOL: ISNS_REQUIRE_ATTR_LEN(4); @@ -912,7 +912,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, dissect_isns_attr_port(tvb, offset, attr_tree, hf_isns_portal_port, ISNS_OTHER_PORT, pinfo); break; case ISNS_ATTR_TAG_PORTAL_SYMBOLIC_NAME: - proto_tree_add_item(attr_tree, hf_isns_portal_symbolic_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_portal_symbolic_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_ESI_INTERVAL: proto_tree_add_item(attr_tree, hf_isns_esi_interval, tvb, offset, len, ENC_BIG_ENDIAN); @@ -933,14 +933,14 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, dissect_isns_attr_portal_security_bitmap(tvb, offset, attr_tree); break; case ISNS_ATTR_TAG_ISCSI_NAME: - proto_tree_add_item(attr_tree, hf_isns_iscsi_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_iscsi_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_ISCSI_NODE_TYPE: ISNS_REQUIRE_ATTR_LEN(4); dissect_isns_attr_iscsi_node_type(tvb, offset, attr_tree); break; case ISNS_ATTR_TAG_ISCSI_ALIAS: - proto_tree_add_item(attr_tree, hf_isns_iscsi_alias, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_iscsi_alias, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_ISCSI_SCN_BITMAP: ISNS_REQUIRE_ATTR_LEN(4); @@ -959,10 +959,10 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_node_next_index, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_ISCSI_AUTH_METHOD: - proto_tree_add_item(attr_tree, hf_isns_iscsi_auth_method, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_iscsi_auth_method, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_PG_ISCSI_NAME: - proto_tree_add_item(attr_tree, hf_isns_pg_iscsi_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_pg_iscsi_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_PG_PORTAL_IP_ADDR: proto_tree_add_item(attr_tree, hf_isns_pg_portal_ip_addr, tvb, offset, len, ENC_NA); @@ -1002,7 +1002,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, 0xFF12 iFCP Port */ case ISNS_ATTR_TAG_SYMBOLIC_PORT_NAME: - proto_tree_add_item(attr_tree, hf_isns_symbolic_port_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_symbolic_port_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_FABRIC_PORT_NAME: ISNS_REQUIRE_ATTR_LEN(8); @@ -1021,7 +1021,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, bit 28 Fibre Channel Class 3 Supported */ case ISNS_ATTR_TAG_FC4_DESCRIPTOR: - proto_tree_add_item(attr_tree, hf_isns_fc4_descriptor, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_fc4_descriptor, tvb, offset, len, ENC_ASCII); break; /* bit 29 Control @@ -1038,7 +1038,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_fc_node_name_wwnn, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_SYMBOLIC_NODE_NAME: - proto_tree_add_item(attr_tree, hf_isns_symbolic_node_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_symbolic_node_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_NODE_IP_ADDRESS: ISNS_REQUIRE_ATTR_LEN(16); @@ -1049,7 +1049,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_node_ipa, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_PROXY_ISCSI_NAME: - proto_tree_add_item(attr_tree, hf_isns_proxy_iscsi_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_proxy_iscsi_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_SWITCH_NAME: ISNS_REQUIRE_ATTR_LEN(8); @@ -1064,7 +1064,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_assigned_id, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_VIRTUAL_FABRIC_ID: - proto_tree_add_item(attr_tree, hf_isns_virtual_fabric_id, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_virtual_fabric_id, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_VENDOR_OUI: ISNS_REQUIRE_ATTR_LEN(4); @@ -1075,7 +1075,7 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_dd_set_id, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_DD_SET_SYMBOLIC_NAME: - proto_tree_add_item(attr_tree, hf_isns_dd_set_symbolic_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_dd_set_symbolic_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_DD_SET_NEXT_ID: ISNS_REQUIRE_ATTR_LEN(4); @@ -1086,14 +1086,14 @@ AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, guint offset, proto_tree_add_item(attr_tree, hf_isns_dd_id, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_DD_SYMBOLIC_NAME: - proto_tree_add_item(attr_tree, hf_isns_dd_symbolic_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_dd_symbolic_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_DD_MEMBER_ISCSI_INDEX: ISNS_REQUIRE_ATTR_LEN(4); proto_tree_add_item(attr_tree, hf_isns_member_iscsi_index, tvb, offset, len, ENC_BIG_ENDIAN); break; case ISNS_ATTR_TAG_DD_MEMBER_ISCSI_NAME: - proto_tree_add_item(attr_tree, hf_isns_dd_member_iscsi_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_isns_dd_member_iscsi_name, tvb, offset, len, ENC_ASCII); break; case ISNS_ATTR_TAG_DD_MEMBER_FC_PORT_NAME: ISNS_REQUIRE_ATTR_LEN(4); diff --git a/epan/dissectors/packet-iso8583.c b/epan/dissectors/packet-iso8583.c index fbf9ff1e17..04c488b083 100644 --- a/epan/dissectors/packet-iso8583.c +++ b/epan/dissectors/packet-iso8583.c @@ -937,7 +937,7 @@ static int dissect_iso8583_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { len = BM_LEN*2; exp = proto_tree_add_item(iso8583_tree, hf_iso8583_bitmap1, tvb, - offset, len, ENC_ASCII|ENC_NA); + offset, len, ENC_ASCII); if(!ishex_str((gchar *)tvb_get_string_enc(pinfo->pool, tvb, offset, len , ENC_ASCII), len)) { expert_add_info(pinfo, exp, &ei_iso8583_MALFORMED); @@ -959,7 +959,7 @@ static int dissect_iso8583_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if(bin_encode_pref == BIN_ASCII_ENC) { exp = proto_tree_add_item(iso8583_tree, hf_iso8583_bitmap2, tvb, - offset, len, ENC_ASCII|ENC_NA); + offset, len, ENC_ASCII); if(!ishex_str((gchar *)tvb_get_string_enc(pinfo->pool, tvb, offset, len , ENC_ASCII), len)) { expert_add_info(pinfo, exp, &ei_iso8583_MALFORMED); diff --git a/epan/dissectors/packet-isobus-vt.c b/epan/dissectors/packet-isobus-vt.c index 4e3c403606..d17e62880c 100644 --- a/epan/dissectors/packet-isobus-vt.c +++ b/epan/dissectors/packet-isobus-vt.c @@ -4074,7 +4074,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio for(i = 0; i < number_of_versions; i++) { proto_tree_add_item(tree, - hf_isobus_vt_extendedgetversions_versionlabel, tvb, offset, 32, ENC_ASCII|ENC_NA); + hf_isobus_vt_extendedgetversions_versionlabel, tvb, offset, 32, ENC_ASCII); offset += 32; } @@ -4215,7 +4215,7 @@ dissect_vt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, enum vt_directio for(i = 0; i < number_of_versions; i++) { proto_tree_add_item(tree, - hf_isobus_vt_getversions_versionlabel, tvb, offset, 7, ENC_ASCII|ENC_NA); + hf_isobus_vt_getversions_versionlabel, tvb, offset, 7, ENC_ASCII); offset += 7; } diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index c4f7d51cba..75a1dae9fd 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -126,7 +126,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); } @@ -139,7 +139,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre guint16 info_string_length; info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } diff --git a/epan/dissectors/packet-jdwp.c b/epan/dissectors/packet-jdwp.c index 178fc77564..2f8a6de7ea 100644 --- a/epan/dissectors/packet-jdwp.c +++ b/epan/dissectors/packet-jdwp.c @@ -418,7 +418,7 @@ dissect_jdwp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * } if (packet_type == 0) { - proto_tree_add_item(jdwp_tree, hf_jdwp_type, tvb, offset, 14, ENC_ASCII|ENC_NA); + proto_tree_add_item(jdwp_tree, hf_jdwp_type, tvb, offset, 14, ENC_ASCII); return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index c8604f203c..15f9d7d1d8 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -1006,7 +1006,7 @@ after_value(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t *t case JSON_TOKEN_NUMBER: /* XXX, convert to number */ - proto_tree_add_item(tree, hf_json_value_number, tok->tvb, tok->offset, tok->len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_json_value_number, tok->tvb, tok->offset, tok->len, ENC_ASCII); break; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 14e6f0704c..f444e00222 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -515,7 +515,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr gchar *content_type = NULL; tvbuff_t *jxta_message_tvb; - proto_tree_add_item(jxta_udp_tree, hf_jxta_udpsig, tvb, tree_offset, (int)sizeof(JXTA_UDP_SIG), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_udp_tree, hf_jxta_udpsig, tvb, tree_offset, (int)sizeof(JXTA_UDP_SIG), ENC_ASCII); tree_offset += (int)sizeof(JXTA_UDP_SIG); jxta_message_framing_tvb = tvb_new_subset_remaining(tvb, tree_offset); @@ -845,7 +845,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree } if (NULL != *current_token) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_sig, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_sig, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); token_offset += (guint) strlen(*current_token) + 1; current_token++; @@ -858,7 +858,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if (NULL != *current_token) { if (jxta_welcome_tree) { proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_destAddr, tvb, token_offset, (gint) strlen(*current_token), - ENC_ASCII|ENC_NA); + ENC_ASCII); } token_offset += (guint) strlen(*current_token) + 1; @@ -871,7 +871,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if (NULL != *current_token) { if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_pubAddr, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_pubAddr, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } token_offset += (guint) strlen(*current_token) + 1; @@ -884,7 +884,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if (NULL != *current_token) { if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_peerid, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_peerid, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } col_append_str(pinfo->cinfo, COL_INFO, (initiator ? " -> " : " <- ") ); @@ -919,32 +919,32 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if( (2 == variable_tokens) && (0 == strcmp(JXTA_WELCOME_MSG_VERSION_1_1, current_token[variable_tokens -1])) ) { if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } token_offset += (guint) strlen(*current_token) + 1; current_token++; if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } } else if( (3 == variable_tokens) && (0 == strcmp(JXTA_WELCOME_MSG_VERSION_3_0, current_token[variable_tokens -1])) ) { if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } token_offset += (guint) strlen(*current_token) + 1; current_token++; if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_msgVers, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_msgVers, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } token_offset += (guint) strlen(*current_token) + 1; current_token++; if (jxta_welcome_tree) { - proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII); } } else { /* Unrecognized Welcome Version */ @@ -1344,7 +1344,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree jxta_msg_tree = proto_item_add_subtree(jxta_msg_tree_item, ett_jxta_msg); - proto_tree_add_item(jxta_msg_tree, hf_jxta_message_sig, tvb, tree_offset, (int)sizeof(JXTA_MSG_SIG), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_msg_tree, hf_jxta_message_sig, tvb, tree_offset, (int)sizeof(JXTA_MSG_SIG), ENC_ASCII); tree_offset += (int)sizeof(JXTA_MSG_SIG); tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_src, tvb, 0, 0, wmem_strbuf_get_str(src_addr)); @@ -1628,7 +1628,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p NULL }; - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, (int)sizeof(JXTA_MSGELEM_SIG), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, (int)sizeof(JXTA_MSGELEM_SIG), ENC_ASCII); tree_offset += (int)sizeof(JXTA_MSGELEM_SIG); namespaceID = tvb_get_guint8(tvb, tree_offset); @@ -1889,7 +1889,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p NULL }; - proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, (int)sizeof(JXTA_MSGELEM_SIG), ENC_ASCII|ENC_NA); + proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, (int)sizeof(JXTA_MSGELEM_SIG), ENC_ASCII); tree_offset += (int)sizeof(JXTA_MSGELEM_SIG); flags = tvb_get_guint8(tvb, tree_offset); diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index 3e8d417847..56097e4be9 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -87,7 +87,7 @@ static int dissect_kdp(tvbuff_t *tvb, if (version != 2) { /* Version other than 2 is really SDDP in UDP */ proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(kdp_tree, hf_kdp_xml_body, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdp_tree, hf_kdp_xml_body, tvb, 0, -1, ENC_ASCII); } else { proto_tree *flags_tree; header_len = tvb_get_guint8(tvb, 1) * 4; diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c index d626b0117a..b785530b6d 100644 --- a/epan/dissectors/packet-kdsp.c +++ b/epan/dissectors/packet-kdsp.c @@ -280,9 +280,9 @@ dissect_kdsp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item(kdsp_tree, hf_kdsp_version, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; proto_tree_add_item(kdsp_tree, hf_kdsp_server_version, - tvb, offset, 32, ENC_ASCII|ENC_NA); + tvb, offset, 32, ENC_ASCII); offset +=32; - proto_tree_add_item(kdsp_tree, hf_kdsp_hostname, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdsp_tree, hf_kdsp_hostname, tvb, offset, 32, ENC_ASCII); /*offset +=32;*/ break; case STRING: @@ -290,7 +290,7 @@ dissect_kdsp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset +=4; proto_tree_add_item(kdsp_tree, hf_kdsp_str_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset +=4; - proto_tree_add_item(kdsp_tree, hf_kdsp_str_msg, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdsp_tree, hf_kdsp_str_msg, tvb, offset, -1, ENC_ASCII); break; case CAPPACKET: sub_item = proto_tree_add_item(kdsp_tree, hf_kdsp_cpt_bitmap, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -493,11 +493,11 @@ dissect_kdsp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 16; proto_tree_add_item(kdsp_tree, hf_kdsp_source_invalidate, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; - proto_tree_add_item(kdsp_tree, hf_kdsp_source_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdsp_tree, hf_kdsp_source_name, tvb, offset, 16, ENC_ASCII); offset +=16; - proto_tree_add_item(kdsp_tree, hf_kdsp_source_interface, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdsp_tree, hf_kdsp_source_interface, tvb, offset, 16, ENC_ASCII); offset += 16; - proto_tree_add_item(kdsp_tree, hf_kdsp_source_type, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(kdsp_tree, hf_kdsp_source_type, tvb, offset, 16, ENC_ASCII); offset +=16; proto_tree_add_item(kdsp_tree, hf_kdsp_source_hop, tvb, offset, 1, ENC_BIG_ENDIAN); offset +=1; diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 85bf7b30e5..a05494ea15 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -115,7 +115,7 @@ dissect_kpasswd_user_data_reply(packet_info *pinfo, tvbuff_t *tvb, proto_tree *t /* optional result string */ if(tvb_reported_length_remaining(tvb, offset) > 0){ - proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); offset = tvb_reported_length(tvb); } diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c index aef22466e9..47b6abb2da 100644 --- a/epan/dissectors/packet-kt.c +++ b/epan/dissectors/packet-kt.c @@ -253,14 +253,14 @@ dissect_kt_set_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -314,7 +314,7 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_uint(tree, hf_kt_rnum, tvb, new_offset, 4, rnum); new_offset += 4; - proto_tree_add_item(tree, hf_kt_name, tvb, new_offset, nsiz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_kt_name, tvb, new_offset, nsiz, ENC_ASCII); new_offset += nsiz; while (rnum > 0) { @@ -333,14 +333,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -382,14 +382,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -447,7 +447,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; @@ -497,14 +497,14 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -559,7 +559,7 @@ dissect_kt_remove_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 90695196fe..372d31817d 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1843,7 +1843,7 @@ static int dissect_l2tp_ericsson_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pro proto_tree_add_item(l2tp_avp_tree, hf_l2tp_ericsson_conn_type, tvb, offset, 1, ENC_NA); break; case ERICSSON_STN_NAME: - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_ericsson_stn_name, tvb, offset, avp_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_ericsson_stn_name, tvb, offset, avp_len, ENC_ASCII); break; case ERICSSON_CRC_ENABLED: proto_tree_add_item(l2tp_avp_tree, hf_l2tp_ericsson_crc32_enable, tvb, offset, avp_len, ENC_NA); @@ -2122,7 +2122,7 @@ static void process_control_avps(tvbuff_t *tvb, if (avp_len == 0) break; - proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_error_message, tvb, idx, avp_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_error_message, tvb, idx, avp_len, ENC_ASCII); break; case PROTOCOL_VERSION: @@ -2230,14 +2230,14 @@ static void process_control_avps(tvbuff_t *tvb, if (avp_len == 0) break; proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_called_number, - tvb, idx, avp_len, ENC_ASCII|ENC_NA); + tvb, idx, avp_len, ENC_ASCII); break; case CALLING_NUMBER: if (avp_len == 0) break; proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_calling_number, - tvb, idx, avp_len, ENC_ASCII|ENC_NA); + tvb, idx, avp_len, ENC_ASCII); break; case SUB_ADDRESS: diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 53940d7344..64c0c7c42b 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -88,7 +88,7 @@ dissect_laplink_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d proto_tree_add_uint(laplink_tree, hf_laplink_udp_ident, tvb, offset, 4, udp_ident); offset += 4; - proto_tree_add_item(laplink_tree, hf_laplink_udp_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(laplink_tree, hf_laplink_udp_name, tvb, offset, -1, ENC_ASCII); } return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index f987aa35af..5788cf0618 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -8641,7 +8641,7 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T + index_len; break; @@ -8662,7 +8662,7 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T + index_len; break; @@ -8682,7 +8682,7 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len; break; @@ -8703,7 +8703,7 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len; break; @@ -8767,7 +8767,7 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info opt_subtree = proto_item_add_subtree(opt_subtree_item, ett_lbmc_umq_idx_cmd_resp_err); proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_err_reserved, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_RESERVED, ENC_BIG_ENDIAN); proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_err_code, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_CODE, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_CODE, ENC_BIG_ENDIAN); - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_err_error_string, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_err_error_string, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T, string_len, ENC_ASCII); len_dissected += (L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T + string_len); break; case LBMC_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_TYPE: @@ -8839,7 +8839,7 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += (L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len); break; @@ -8860,7 +8860,7 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info } else { - proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII); } len_dissected += (L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len); break; @@ -9293,7 +9293,7 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_appset_entry(tvbuff_t * tvb, len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T; appset_name_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN); len_dissected += (int)appset_name_len; - proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_name, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T, (int)appset_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_name, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T, (int)appset_name_len, ENC_ASCII); num_receiver_type_ids = tvb_get_ntohs(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_NUM_RECEIVER_TYPE_IDS); if (num_receiver_type_ids > 0) { @@ -9329,7 +9329,7 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_topic_entry(tvbuff_t * tvb, len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T; topic_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN); len_dissected += (int)topic_len; - proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T, (int)topic_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T, (int)topic_len, ENC_ASCII); num_appsets = tvb_get_ntohs(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_NUM_APPSETS); if (num_appsets > 0) { @@ -9381,7 +9381,7 @@ static int dissect_nhdr_umq_cmd_resp_err(tvbuff_t * tvb, int offset, packet_info proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_err_code, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T_CODE, L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T_CODE, ENC_BIG_ENDIAN); len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T; errmsg_len = tvb_reported_length_remaining(tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T); - proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_err_errmsg, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T, errmsg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_err_errmsg, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T, errmsg_len, ENC_ASCII); len_dissected += errmsg_len; proto_item_set_len(subtree_item, len_dissected); return (len_dissected); @@ -9632,7 +9632,7 @@ static int dissect_nhdr_auth_request(tvbuff_t * tvb, int offset, packet_info * p user_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN); if (user_len > 0) { - proto_tree_add_item(subtree, hf_lbmc_auth_request_user_name, tvb, data_offset, (int)user_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_auth_request_user_name, tvb, data_offset, (int)user_len, ENC_ASCII); len_dissected += (int)user_len; } proto_item_set_len(subtree_item, len_dissected); @@ -10041,8 +10041,8 @@ static int dissect_nhdr_extopt_cfgopt(tvbuff_t * tvb, int offset, packet_info * subtree = proto_item_add_subtree(subtree_item, ett_lbmc_extopt_cfgopt); proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_scope, tvb, curr_offset + O_LBMC_EXTOPT_CFGOPT_HDR_T_SCOPE, L_LBMC_EXTOPT_CFGOPT_HDR_T_SCOPE, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_parent, tvb, curr_offset + O_LBMC_EXTOPT_CFGOPT_HDR_T_PARENT, L_LBMC_EXTOPT_CFGOPT_HDR_T_PARENT, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_name, tvb, name_offset, name_len, ENC_ASCII|ENC_NA); - proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_value, tvb, value_offset, value_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_name, tvb, name_offset, name_len, ENC_ASCII); + proto_tree_add_item(subtree, hf_lbmc_extopt_cfgopt_value, tvb, value_offset, value_len, ENC_ASCII); curr_offset += optlen; len_dissected += optlen; } @@ -10118,7 +10118,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo, switch (reassembly->subtype) { case LBMC_EXT_NHDR_MSGSEL: - proto_tree_add_item(rtree, hf_lbmc_extopt_reassembled_data_msgsel, reassembly_tvb, 0, reassembly->len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rtree, hf_lbmc_extopt_reassembled_data_msgsel, reassembly_tvb, 0, reassembly->len, ENC_ASCII); break; case LBMC_EXT_NHDR_CFGOPT: len_dissected += dissect_nhdr_extopt_cfgopt(reassembly_tvb, 0, pinfo, rtree); @@ -10134,7 +10134,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo, switch (subtype) { case LBMC_EXT_NHDR_MSGSEL: - proto_tree_add_item(subtree, hf_lbmc_extopt_msgsel, tvb, data_offset, data_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmc_extopt_msgsel, tvb, data_offset, data_len, ENC_ASCII); break; case LBMC_EXT_NHDR_CFGOPT: len_dissected += dissect_nhdr_extopt_cfgopt(tvb, data_offset, pinfo, subtree); diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c index 8689aa88ac..1ec7fd245e 100644 --- a/epan/dissectors/packet-lbmpdm.c +++ b/epan/dissectors/packet-lbmpdm.c @@ -959,7 +959,7 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo, if (string_name_len > 0) { string_name_ofs = ofs + def_ofs + L_LBMPDM_FIELD_INFO_T; - proto_tree_add_item(field_tree, hf_lbmpdm_segment_def_field_str_name, tvb, string_name_ofs, (int)string_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(field_tree, hf_lbmpdm_segment_def_field_str_name, tvb, string_name_ofs, (int)string_name_len, ENC_ASCII); type_ofs += string_name_len; } } diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 3ba36e348f..3471d16217 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -3188,7 +3188,7 @@ static int dissect_lbmr_tnwg_name_opt(tvbuff_t * tvb, int offset, packet_info * proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_type, tvb, offset + O_LBMR_TNWG_OPT_T_TYPE, L_LBMR_TNWG_OPT_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_len, tvb, offset + O_LBMR_TNWG_OPT_T_LEN, L_LBMR_TNWG_OPT_T_LEN, ENC_BIG_ENDIAN); proto_tree_add_bitmask(opt_tree, tvb, offset + O_LBMR_TNWG_OPT_T_FLAGS, hf_lbmr_tnwg_opt_name_flags, ett_lbmr_tnwg_name_opt_flags, flags, ENC_BIG_ENDIAN); - proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_name, tvb, offset + L_LBMR_TNWG_OPT_T, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_name_name, tvb, offset + L_LBMR_TNWG_OPT_T, name_len, ENC_ASCII); return ((int)opt_len); } @@ -3282,7 +3282,7 @@ static int dissect_lbmr_tnwg_interest_rec(tvbuff_t * tvb, int offset, packet_inf proto_tree_add_item(rec_tree, hf_lbmr_tnwg_interest_rec_pattype, tvb, offset + O_LBMR_TNWG_INTEREST_REC_T_PATTYPE, L_LBMR_TNWG_INTEREST_REC_T_PATTYPE, ENC_BIG_ENDIAN); proto_tree_add_item(rec_tree, hf_lbmr_tnwg_interest_rec_domain_id, tvb, offset + O_LBMR_TNWG_INTEREST_REC_T_DOMAIN_ID, L_LBMR_TNWG_INTEREST_REC_T_DOMAIN_ID, ENC_BIG_ENDIAN); string_len = rec_len - L_LBMR_TNWG_INTEREST_REC_T; - proto_tree_add_item(rec_tree, hf_lbmr_tnwg_interest_rec_symbol, tvb, offset + L_LBMR_TNWG_INTEREST_REC_T, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(rec_tree, hf_lbmr_tnwg_interest_rec_symbol, tvb, offset + L_LBMR_TNWG_INTEREST_REC_T, string_len, ENC_ASCII); return ((int)rec_len); } @@ -3466,7 +3466,7 @@ static int dissect_lbmr_tmr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree_add_item(tinfo_tree, hf_lbmr_tmr_len, tvb, offset + O_LBMR_TMR_T_LEN, L_LBMR_TMR_T_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(tinfo_tree, hf_lbmr_tmr_type, tvb, offset + O_LBMR_TMR_T_TYPE, L_LBMR_TMR_T_TYPE, ENC_BIG_ENDIAN); proto_tree_add_bitmask(tinfo_tree, tvb, offset + O_LBMR_TMR_T_FLAGS, hf_lbmr_tmr_flags, ett_lbmr_tmr_flags, flags, ENC_BIG_ENDIAN); - proto_tree_add_item(tinfo_tree, hf_lbmr_tmr_name, tvb, name_offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tinfo_tree, hf_lbmr_tmr_name, tvb, name_offset, namelen, ENC_ASCII); return ((int) tmr_len); } @@ -3535,12 +3535,12 @@ static int dissect_lbmr_tqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, if (wildcard_tqr) { proto_tree_add_item(tqr_tree, hf_lbmr_tqr_pattern_type, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tqr_tree, hf_lbmr_tqr_pattern, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tqr_tree, hf_lbmr_tqr_pattern, tvb, offset, namelen, ENC_ASCII); add_contents_wctqr(contents, pattern_type, name); } else { - proto_tree_add_item(tqr_tree, hf_lbmr_tqr_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tqr_tree, hf_lbmr_tqr_name, tvb, offset, namelen, ENC_ASCII); add_contents_tqr(contents, name); } return (reclen); @@ -3782,7 +3782,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_len, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_LEN, L_LBMR_TOPIC_OPT_T_LEN, ENC_BIG_ENDIAN); qname_len = opt_len - L_LBMR_TOPIC_OPT_T; proto_tree_add_bitmask(opt_tree, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_FLAGS, hf_lbmr_topt_umq_qinfo_flags, ett_lbmr_topt_umq_qinfo_flags, opt_umq_qinfo_flags, ENC_BIG_ENDIAN); - proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_queue, tvb, curr_offset + L_LBMR_TOPIC_OPT_T, qname_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(opt_tree, hf_lbmr_topt_umq_qinfo_queue, tvb, curr_offset + L_LBMR_TOPIC_OPT_T, qname_len, ENC_ASCII); break; case LBMR_TOPIC_OPT_COST_TYPE: opt_item = proto_tree_add_item(otree, hf_lbmr_topt_cost, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_TYPE, opt_len, ENC_NA); @@ -4124,7 +4124,7 @@ static int dissect_lbmr_tir_entry(tvbuff_t * tvb, int offset, packet_info * pinf ti = proto_tree_add_none_format(tree, hf_lbmr_tir, tvb, offset, reclen, "%s: %s, Length %u, Index %" PRIu32 ", TTL %" PRIu16, name, val_to_str((transport & LBMR_TIR_TRANSPORT), lbmr_transport_type, "Unknown (0x%02x)"), tlen, idx, ttl); tinfo_tree = proto_item_add_subtree(ti, ett_lbmr_tir); - proto_tree_add_item(tinfo_tree, hf_lbmr_tir_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tinfo_tree, hf_lbmr_tir_name, tvb, offset, namelen, ENC_ASCII); proto_tree_add_item(tinfo_tree, hf_lbmr_tir_transport_opts, tvb, tinfo_offset + O_LBMR_TIR_T_TRANSPORT, L_LBMR_TIR_T_TRANSPORT, ENC_BIG_ENDIAN); proto_tree_add_item(tinfo_tree, hf_lbmr_tir_transport_type, tvb, tinfo_offset + O_LBMR_TIR_T_TRANSPORT, L_LBMR_TIR_T_TRANSPORT, ENC_BIG_ENDIAN); transport_len_item = proto_tree_add_item(tinfo_tree, hf_lbmr_tir_tlen, tvb, tinfo_offset + O_LBMR_TIR_T_TLEN, L_LBMR_TIR_T_TLEN, ENC_BIG_ENDIAN); @@ -4175,7 +4175,7 @@ static int dissect_lbmr_qqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, name = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &namelen, ENC_ASCII); reclen += namelen; add_contents_qqr(contents, name); - proto_tree_add_item(tree, hf_lbmr_qqr_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lbmr_qqr_name, tvb, offset, namelen, ENC_ASCII); return (reclen); } @@ -4288,8 +4288,8 @@ static int dissect_lbmr_qir_entry(tvbuff_t * tvb, int offset, packet_info * pinf queue_blks = tvb_get_ntohs(tvb, curr_offset + O_LBMR_QIR_T_QUEUE_BLKS); qirti = proto_tree_add_none_format(tree, hf_lbmr_qir, tvb, offset, reclen, "%s: %s, ID %" PRIu32, qname, tname, queue_id); qirtree = proto_item_add_subtree(qirti, ett_lbmr_qir); - proto_tree_add_item(qirtree, hf_lbmr_qir_queue_name, tvb, qnameoffset, qnamelen, ENC_ASCII|ENC_NA); - proto_tree_add_item(qirtree, hf_lbmr_qir_topic_name, tvb, tnameoffset, tnamelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(qirtree, hf_lbmr_qir_queue_name, tvb, qnameoffset, qnamelen, ENC_ASCII); + proto_tree_add_item(qirtree, hf_lbmr_qir_topic_name, tvb, tnameoffset, tnamelen, ENC_ASCII); proto_tree_add_item(qirtree, hf_lbmr_qir_queue_id, tvb, curr_offset + O_LBMR_QIR_T_QUEUE_ID, L_LBMR_QIR_T_QUEUE_ID, ENC_BIG_ENDIAN); proto_tree_add_item(qirtree, hf_lbmr_qir_queue_ver, tvb, curr_offset + O_LBMR_QIR_T_QUEUE_VER, L_LBMR_QIR_T_QUEUE_VER, ENC_BIG_ENDIAN); proto_tree_add_item(qirtree, hf_lbmr_qir_queue_prev_ver, tvb, curr_offset + O_LBMR_QIR_T_QUEUE_PREV_VER, L_LBMR_QIR_T_QUEUE_PREV_VER, ENC_BIG_ENDIAN); @@ -4385,7 +4385,7 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr proto_tree_add_item(tree, hf_lbmr_pser_topic_idx, tvb, offset + O_LBMR_PSER_T_TOPIC_IDX, L_LBMR_PSER_T_TOPIC_IDX, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_lbmr_pser_source_port, tvb, offset + O_LBMR_PSER_T_SOURCE_PORT, L_LBMR_PSER_T_SOURCE_PORT, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_lbmr_pser_store_port, tvb, offset + O_LBMR_PSER_T_STORE_PORT, L_LBMR_PSER_T_STORE_PORT, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_lbmr_pser_topic, tvb, offset + O_LBMR_PSER_T_TOPIC, topic_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lbmr_pser_topic, tvb, offset + O_LBMR_PSER_T_TOPIC, topic_len, ENC_ASCII); curr_offset += hdr_len; len = hdr_len; if ((flags_val & LBMR_PSER_OPT_FLAG) != 0) @@ -4598,7 +4598,7 @@ int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, prot int qnamelen = tvb_reported_length_remaining(tvb, curr_offset); if (qnamelen > 1) { - proto_tree_add_item(tree, hf_qmgmt_qname, tvb, curr_offset, qnamelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_qmgmt_qname, tvb, curr_offset, qnamelen, ENC_ASCII); } len_dissected += qnamelen; } @@ -4634,7 +4634,7 @@ static int dissect_lbmr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo proto_tree_add_item(tree, hf_lbmr_ctxinfo_instance, tvb, offset + O_LBMR_CTXINFO_T_INSTANCE, L_LBMR_CTXINFO_T_INSTANCE, ENC_NA); if ((flags16 & LBMR_CTXINFO_NAME_FLAG) != 0) { - proto_tree_add_item(tree, hf_lbmr_ctxinfo_name, tvb, offset + L_LBMR_CTXINFO_T, reclen - L_LBMR_CTXINFO_T, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lbmr_ctxinfo_name, tvb, offset + L_LBMR_CTXINFO_T, reclen - L_LBMR_CTXINFO_T, ENC_ASCII); } return ((int)reclen); } @@ -4753,7 +4753,7 @@ static int dissect_lbmr_rctxinfo_rec_name_opt(tvbuff_t * tvb, int offset, packet proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_name_len, tvb, offset + O_LBMR_RCTXINFO_REC_NAME_OPT_T_LEN, L_LBMR_RCTXINFO_REC_NAME_OPT_T_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_name_flags, tvb, offset + O_LBMR_RCTXINFO_REC_NAME_OPT_T_FLAGS, L_LBMR_RCTXINFO_REC_NAME_OPT_T_FLAGS, ENC_BIG_ENDIAN); name_len = ((int)len) - L_LBMR_RCTXINFO_REC_NAME_OPT_T; - proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_name_name, tvb, offset + L_LBMR_RCTXINFO_REC_NAME_OPT_T, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_name_name, tvb, offset + L_LBMR_RCTXINFO_REC_NAME_OPT_T, name_len, ENC_ASCII); return ((int)len); } diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 0ce9b47add..dab9b71cd7 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -411,7 +411,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ offset += (2*size); /* Feature Negotiation String */ if(version > 2) { - proto_tree_add_item(conn_header_tree, hf_linx_conn_feat_neg_str, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(conn_header_tree, hf_linx_conn_feat_neg_str, tvb, offset, -1, ENC_ASCII); offset += tvb_strnlen(tvb, offset, -1); } break; @@ -529,13 +529,13 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ case RLNH_QUERY_NAME: proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, tvb, offset, -1, ENC_ASCII); offset += tvb_strnlen(tvb, offset, -1); break; case RLNH_PUBLISH: proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_src_linkaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_name, tvb, offset, -1, ENC_ASCII); offset += tvb_strnlen(tvb, offset, -1); break; case RLNH_UNPUBLISH: @@ -556,7 +556,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(rlnh_version > 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_feat_neg_str, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_rlnh_feat_neg_str, tvb, offset, -1, ENC_ASCII); offset += tvb_strnlen(tvb, offset, -1); } break; @@ -915,13 +915,13 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case RLNH_QUERY_NAME: proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, tvb, offset, -1, ENC_ASCII); /*offset += tvb_strnlen(tvb, offset, -1);*/ break; case RLNH_PUBLISH: proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, tvb, offset, -1, ENC_ASCII); /*offset += tvb_strnlen(tvb, offset, -1);*/ break; case RLNH_UNPUBLISH: @@ -941,7 +941,7 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if(rlnh_version > 1) { - proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, tvb, offset, -1, ENC_ASCII); /*offset += tvb_strnlen(tvb, offset, -1);*/ } break; diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c index c8e253748f..f05e2bbf11 100644 --- a/epan/dissectors/packet-lisp-tcp.c +++ b/epan/dissectors/packet-lisp-tcp.c @@ -192,7 +192,7 @@ dissect_lisp_tcp_message_eid_prefix(tvbuff_t *tvb, packet_info *pinfo, proto_tre break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(prefix_tree, hf_lisp_tcp_message_eid_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(prefix_tree, hf_lisp_tcp_message_eid_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; } diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index fe93d360c7..dc7467ac29 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -811,7 +811,7 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_dn, tvb, offset, str_len, ENC_ASCII); proto_item_append_text(tir, " %d. Distinguished Name: %s", i, tvb_get_const_stringz(tvb, offset, NULL)); offset += str_len; remaining -= str_len; @@ -891,7 +891,7 @@ dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_lisp_lcaf_iid_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_iid_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -965,7 +965,7 @@ dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_lisp_lcaf_asn_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_asn_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -1134,7 +1134,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_lisp_lcaf_geo_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_geo_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -1283,7 +1283,7 @@ dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -1683,7 +1683,7 @@ dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(key_tree, hf_lisp_lcaf_kv_key_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(key_tree, hf_lisp_lcaf_kv_key_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -1727,7 +1727,7 @@ dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(value_tree, hf_lisp_lcaf_kv_value_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(value_tree, hf_lisp_lcaf_kv_value_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; default: @@ -2151,7 +2151,7 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree, break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_eid_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_eid_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; } @@ -2398,7 +2398,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre break; case AFNUM_DISTNAME: str_len = tvb_strsize(tvb, offset); - proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_dn, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(lisp_record_tree, hf_lisp_mreq_record_prefix_dn, tvb, offset, str_len, ENC_ASCII); offset += str_len; break; } diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 67cb2a114c..cee364337d 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1670,7 +1670,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 break; default: strPtr = tvb_bytes_to_str(pinfo->pool, tvb, offset, (dataLen-2)); - proto_tree_add_item(port_tree, hf_port_id, tvb, offset, (dataLen-2), ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_port_id, tvb, offset, (dataLen-2), ENC_ASCII); break; } @@ -1719,7 +1719,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 break; } - proto_tree_add_item(port_tree, hf_port_id, tvb, offset, (dataLen-1), ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_port_id, tvb, offset, (dataLen-1), ENC_ASCII); offset += (dataLen - 1); break; @@ -1825,7 +1825,7 @@ dissect_lldp_port_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset += 2; /* Display port description information */ - proto_tree_add_item(port_desc_tree, hf_port_desc, tvb, offset, dataLen, ENC_ASCII|ENC_NA); + proto_tree_add_item(port_desc_tree, hf_port_desc, tvb, offset, dataLen, ENC_ASCII); offset += dataLen; @@ -1876,9 +1876,9 @@ dissect_lldp_system_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* Display system name information */ if (tlvsubType == SYSTEM_NAME_TLV_TYPE) - proto_tree_add_item(system_subtree, hf_lldp_tlv_system_name, tvb, offset, dataLen, ENC_ASCII|ENC_NA); + proto_tree_add_item(system_subtree, hf_lldp_tlv_system_name, tvb, offset, dataLen, ENC_ASCII); else - proto_tree_add_item(system_subtree, hf_lldp_tlv_system_desc, tvb, offset, dataLen, ENC_ASCII|ENC_NA); + proto_tree_add_item(system_subtree, hf_lldp_tlv_system_desc, tvb, offset, dataLen, ENC_ASCII); offset += dataLen; @@ -2296,7 +2296,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tempByte > 0) { - proto_tree_add_item(tree, hf_ieee_802_1_vlan_name, tvb, offset, tempByte, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_ieee_802_1_vlan_name, tvb, offset, tempByte, ENC_ASCII); offset += tempByte; } @@ -3279,7 +3279,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - proto_tree_add_item(tree, hf_media_civic_country, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_media_civic_country, tvb, offset, 2, ENC_ASCII); offset += 2; LCI_Length -= 2; @@ -3312,7 +3312,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tempByte > 0) { /* Get CA Value */ - proto_tree_add_item(tree, hf_media_civic_addr_value, tvb, offset, tempByte, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_media_civic_addr_value, tvb, offset, tempByte, ENC_ASCII); offset += tempByte; LCI_Length -= tempByte; @@ -3325,7 +3325,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (tlvLen > 0) { - proto_tree_add_item(tree, hf_media_ecs, tvb, offset, tlvLen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_media_ecs, tvb, offset, tlvLen, ENC_ASCII); } break; @@ -3746,7 +3746,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) length -= 2; break; case 0xce: // 206 fabric-name, string - tf = proto_tree_add_item(tree, hf_cisco_aci_fabricname, tvb, offset, length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(tree, hf_cisco_aci_fabricname, tvb, offset, length, ENC_ASCII); proto_item_append_text(parent_item, ": %s", proto_item_get_display_repr(pinfo->pool, tf)); offset += length; length -= length; @@ -3761,7 +3761,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(tree, hf_cisco_aci_apicipv4, tvb, offset, 4, ENC_NA); offset += 4; length -= 4; - proto_tree_add_item(tree, hf_cisco_aci_apicuuid, tvb, offset, 36, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_cisco_aci_apicuuid, tvb, offset, 36, ENC_ASCII); offset += 36; length -= 36; } @@ -3779,7 +3779,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) length--; break; case 0xd2: // 210 fw-ver, string - tf = proto_tree_add_item(tree, hf_cisco_aci_version, tvb, offset, length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(tree, hf_cisco_aci_version, tvb, offset, length, ENC_ASCII); proto_item_append_text(parent_item, ": %s", proto_item_get_display_repr(pinfo->pool, tf)); offset += length; length -= length; @@ -3791,7 +3791,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) length -= 2; break; case 0xd4: // 212 serial-number, string - tf = proto_tree_add_item(tree, hf_cisco_aci_serialno, tvb, offset, length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(tree, hf_cisco_aci_serialno, tvb, offset, length, ENC_ASCII); proto_item_append_text(parent_item, ": %s", proto_item_get_display_repr(pinfo->pool, tf)); offset += length; length -= length; @@ -3801,13 +3801,13 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; #endif case 0xd6: // 214 model, string - tf = proto_tree_add_item(tree, hf_cisco_aci_model, tvb, offset, length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(tree, hf_cisco_aci_model, tvb, offset, length, ENC_ASCII); proto_item_append_text(parent_item, ": %s", proto_item_get_display_repr(pinfo->pool, tf)); offset += length; length -= length; break; case 0xd7: // 215 name, string - tf = proto_tree_add_item(tree, hf_cisco_aci_nodename, tvb, offset, length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(tree, hf_cisco_aci_nodename, tvb, offset, length, ENC_ASCII); proto_item_append_text(parent_item, ": %s", proto_item_get_display_repr(pinfo->pool, tf)); offset += length; length -= length; @@ -3892,7 +3892,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) case HYTEC_TID__VENDOR_PRODUCT_REVISION: maximum_data_length = 64; if(0 < msg_len && msg_len <= maximum_data_length) - proto_tree_add_item(tree, hf_hytec_transceiver_vendor_product_revision, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_hytec_transceiver_vendor_product_revision, tvb, offset, msg_len, ENC_ASCII); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) is beyond valid range (1-%d)", val_to_str_const(identifier, hytec_tid, ""), msg_len, maximum_data_length); @@ -4066,7 +4066,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case HYTEC_MC__NAME_OF_REPLYING_DEVICE: maximum_data_length = 64; - if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_name_of_replying_device, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_name_of_replying_device, tvb, offset, msg_len, ENC_ASCII); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) is beyond valid range (1-%d)", val_to_str_const(identifier, hytec_mc, ""), msg_len, maximum_data_length); @@ -4075,7 +4075,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case HYTEC_MC__OUTGOING_PORT_NAME: maximum_data_length = 64; - if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_outgoing_port_name, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_outgoing_port_name, tvb, offset, msg_len, ENC_ASCII); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) is beyond valid range (1-%d)", val_to_str_const(identifier, hytec_mc, ""), msg_len, maximum_data_length); @@ -4111,7 +4111,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) break; case HYTEC_MC__INCOMING_PORT_NAME: maximum_data_length = 64; - if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_incoming_port_name, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + if(0 < msg_len && msg_len <= maximum_data_length) proto_tree_add_item(tree, hf_hytec_incoming_port_name, tvb, offset, msg_len, ENC_ASCII); else { /* unexpected length */ expert_add_info_format(pinfo, tree, &ei_lldp_bad_length, "%s length (%d) is beyond valid range (1-%d)", val_to_str_const(identifier, hytec_mc, ""), msg_len, maximum_data_length); @@ -4224,7 +4224,7 @@ dissect_iana_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { case 0x01: /* MUDURL */ if ( msg_len > 0 ) - proto_tree_add_item(tree, hf_iana_mudurl, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_iana_mudurl, tvb, offset, msg_len, ENC_ASCII); break; default: @@ -4247,10 +4247,10 @@ dissect_onos_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) switch (subType) { case ONOS_CHASSIS_TLV_TYPE: - proto_tree_add_item(tree, hf_onos_chassis, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_onos_chassis, tvb, offset, msg_len, ENC_ASCII); break; case ONOS_PORT_TLV_TYPE: - proto_tree_add_item(tree, hf_onos_port, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_onos_port, tvb, offset, msg_len, ENC_ASCII); break; case ONOS_TTL_TLV_TYPE: proto_tree_add_item(tree, hf_onos_ttl, tvb, offset, msg_len, ENC_NA); diff --git a/epan/dissectors/packet-lnpdqp.c b/epan/dissectors/packet-lnpdqp.c index 8a4f652544..8b03be3a02 100644 --- a/epan/dissectors/packet-lnpdqp.c +++ b/epan/dissectors/packet-lnpdqp.c @@ -229,7 +229,7 @@ dissect_lnpdqp_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if(no_of_digits == 0) return; offset++; - proto_tree_add_item(subtree, hf_lnpdqp_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_lnpdqp_ia5_digits, tvb, offset, -1, ENC_ASCII); proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(pinfo->pool,tvb,offset,tvb_reported_length_remaining(tvb,offset), ENC_ASCII | ENC_NA)); break; default: diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 9ff85884e6..2cf16025bb 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -105,7 +105,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (code <= 9 && printer_len != -1) { proto_tree_add_uint_format(lpd_tree, hf_lpd_client_code, tvb, 0, 1, code, "%s", val_to_str(code, lpd_client_code, "Unknown client code: %u")); - proto_tree_add_item(lpd_tree, hf_lpd_printer_option, tvb, 1, printer_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(lpd_tree, hf_lpd_printer_option, tvb, 1, printer_len, ENC_ASCII); } else { call_data_dissector(tvb, pinfo, lpd_tree); diff --git a/epan/dissectors/packet-lsd.c b/epan/dissectors/packet-lsd.c index d5914071a9..97cb1d7d34 100644 --- a/epan/dissectors/packet-lsd.c +++ b/epan/dissectors/packet-lsd.c @@ -88,7 +88,7 @@ dissect_lsd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) ti = proto_tree_add_item(tree, proto_lsd, tvb, 0, -1, ENC_NA); lsd_tree = proto_item_add_subtree(ti, ett_lsd); - proto_tree_add_item(lsd_tree, hf_lsd_header, tvb, offset, linelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(lsd_tree, hf_lsd_header, tvb, offset, linelen, ENC_ASCII); offset = next_offset; if (!parse_string_field(lsd_tree, hf_lsd_host, pinfo, tvb, offset, &next_offset, &linelen)) diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c index ed528f5c43..ad1e6bb027 100644 --- a/epan/dissectors/packet-lustre.c +++ b/epan/dissectors/packet-lustre.c @@ -1777,7 +1777,7 @@ dissect_struct_obd_uuid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, int /* struct obd_uuid { */ /* char uuid[UUID_MAX]; */ /* }; */ - proto_tree_add_item(tree, hf_lustre_obd_uuid, tvb, offset, 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_obd_uuid, tvb, offset, 40, ENC_ASCII); offset += 40; return offset; @@ -2280,7 +2280,7 @@ dissect_struct_changelog_rec(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset = dissect_struct_lu_fid(tvb, offset, tree, hf_lustre_changelog_ext_rename_spfid); } if (flags & CLF_JOBID) { - proto_tree_add_item(tree, hf_lustre_changelog_ext_jobid_jobid, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_changelog_ext_jobid_jobid, tvb, offset, 32, ENC_ASCII); offset += 32; } if (flags & CLF_EXTRA_FLAGS) { @@ -2288,7 +2288,7 @@ dissect_struct_changelog_rec(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset += 8; } if (namelen > 0) { - proto_tree_add_item(tree, hf_lustre_changelog_ext_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_changelog_ext_name, tvb, offset, namelen, ENC_ASCII); offset += namelen; } @@ -2328,9 +2328,9 @@ dissect_struct_cfg_marker(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset += 8; proto_tree_add_item(tree, hf_lustre_cfg_marker_canceltime, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_lustre_cfg_marker_tgtname, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_cfg_marker_tgtname, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_lustre_cfg_marker_comment, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_cfg_marker_comment, tvb, offset, 64, ENC_ASCII); offset += 64; return offset; @@ -2390,7 +2390,7 @@ dissect_struct_lustre_cfg(tvbuff_t *tvb, int offset, proto_tree *parent_tree) if (count == 2) { len = tvb_get_letohl(tvb, buf_offset); len += buffer_padding_length(len+offset); - proto_tree_add_item(tree, hf_lustre_lustre_cfg_buffer, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_lustre_cfg_buffer, tvb, offset, len, ENC_ASCII); offset += len; offset = dissect_struct_lov_desc(tvb, offset, tree); break; @@ -2400,7 +2400,7 @@ dissect_struct_lustre_cfg(tvbuff_t *tvb, int offset, proto_tree *parent_tree) for (i = 0; i < count; ++i) { len = tvb_get_letohl(tvb, buf_offset+(4*i)); len += buffer_padding_length(len+offset); - proto_tree_add_item(tree, hf_lustre_lustre_cfg_buffer, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_lustre_cfg_buffer, tvb, offset, len, ENC_ASCII); offset += len; } break; @@ -2462,7 +2462,7 @@ dissect_struct_ldlm_lock_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, pro *ltype = tvb_get_letoh64(tvb, offset); proto_tree_add_item(id_tree, hf_lustre_ldlm_res_id_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); } else - proto_tree_add_item(id_tree, hf_lustre_ldlm_res_id_string, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(id_tree, hf_lustre_ldlm_res_id_string, tvb, offset, 8, ENC_ASCII); break; default: proto_tree_add_item(id_tree, hf_lustre_ldlm_res_id_name, tvb, offset, 8, ENC_LITTLE_ENDIAN); @@ -2793,7 +2793,7 @@ dissect_struct_mgs_config_body(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ /* }; */ /* MTI_NAME_MAXLEN == 64 */ - proto_tree_add_item(tree, hf_lustre_mgs_config_body_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_mgs_config_body_name, tvb, offset, 64, ENC_ASCII); offset += 64; proto_tree_add_item(tree, hf_lustre_mgs_config_body_offset, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; @@ -2888,7 +2888,7 @@ dissect_struct_mgs_target_info(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ offset += 64; proto_tree_add_item(tree, hf_lustre_mgs_target_info_mti_svname, tvb, offset, 64, ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_lustre_mgs_target_info_mti_uuid, tvb, offset, 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_mgs_target_info_mti_uuid, tvb, offset, 40, ENC_ASCII); offset += 40; for (i = 0; i < count; ++i) offset = lnet_dissect_struct_nid(tvb, tree, offset, hf_lustre_mgs_target_info_mti_nids); @@ -3231,7 +3231,7 @@ dissect_struct_lmv_mds_md_v1(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, offset += 4; proto_tree_add_item(tree, hf_lustre_lmv_mds_md_padding, tvb, offset, 20, ENC_NA); offset += 20; - proto_tree_add_item(tree, hf_lustre_lmv_mds_md_pool_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_lmv_mds_md_pool_name, tvb, offset, 16, ENC_ASCII); offset += 16; for (i = 0; i < count && magic == LMV_MAGIC_V1; ++i) @@ -3323,7 +3323,7 @@ dissect_struct_lov_mds_md(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t proto_tree_add_item(tree, hf_lustre_lov_mds_md_lmm_layout_gen, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; if (magic == LOV_MAGIC_V3) { - proto_tree_add_item(tree, hf_lustre_lov_mds_md_lmm_pool_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_lov_mds_md_lmm_pool_name, tvb, offset, 16, ENC_ASCII); offset += 16; } @@ -4229,7 +4229,7 @@ dissect_struct_ptlrpc_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent if (pb_version == LUSTRE_PTLRPC_MSG_VERSION && offset-old_offset < buf_len) { /* the length of the string is 32 bytes max, with \0 inside */ - proto_tree_add_item(tree, hf_lustre_ptlrpc_body_pb_jobid, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_ptlrpc_body_pb_jobid, tvb, offset, 32, ENC_ASCII); offset+=32; } @@ -4734,7 +4734,7 @@ dissect_xattr_buffers(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t //@@ Add name to text proto_item_append_text(item, " [%d]", i); - proto_tree_add_item(tree, hf_lustre_xattr_name, tvb, nameoffset, namesize, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_xattr_name, tvb, nameoffset, namesize, ENC_ASCII); nameoffset += namesize; proto_tree_add_item(tree, hf_lustre_xattr_data, tvb, dataoffset, datasize, ENC_NA); @@ -5022,7 +5022,7 @@ dissect_struct_obd_statfs(tvbuff_t *tvb, gint offset, proto_tree *parent_tree) offset += 8; proto_tree_add_item(tree, hf_lustre_obd_statfs_os_ffree, tvb, offset, 8, ENC_LITTLE_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_lustre_obd_statfs_os_fsid, tvb, offset, 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_lustre_obd_statfs_os_fsid, tvb, offset, 40, ENC_ASCII); offset += 40; proto_tree_add_item(tree, hf_lustre_obd_statfs_os_bsize, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index b2d18d2eaf..8331b8ce90 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -259,7 +259,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, packet_info *pinfo, pr tvb, LWRES_LWPACKET_LENGTH + 8, realnamelen, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset=LWRES_LWPACKET_LENGTH + 8 + realnamelen; @@ -285,7 +285,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, packet_info *pinfo, pr tvb, offset + 2, aliaslen, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset+=(2 + aliaslen + 1); } @@ -334,7 +334,7 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree tvb, LWRES_LWPACKET_LENGTH+10, namelen, - ENC_ASCII|ENC_NA); + ENC_ASCII); } @@ -377,7 +377,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, packet_info *pinfo, p LWRES_LWPACKET_LENGTH + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adn_resp_tree, hf_adn_realname, tvb, - LWRES_LWPACKET_LENGTH + 10, realnamelen, ENC_ASCII|ENC_NA); + LWRES_LWPACKET_LENGTH + 10, realnamelen, ENC_ASCII); offset = LWRES_LWPACKET_LENGTH + 10 + realnamelen + 1; @@ -395,7 +395,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, packet_info *pinfo, p offset, 2, aliaslen); proto_tree_add_item(alias_tree, hf_adn_aliasname, tvb, - offset + 2, aliaslen, ENC_ASCII|ENC_NA); + offset + 2, aliaslen, ENC_ASCII); offset+=(2 + aliaslen + 1); } @@ -665,7 +665,7 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree) tvb, LWRES_LWPACKET_LENGTH+10, namelen, - ENC_ASCII|ENC_NA); + ENC_ASCII); } @@ -741,7 +741,7 @@ static void dissect_rdata_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree tvb, LWRES_LWPACKET_LENGTH+18, realnamelen, - ENC_ASCII|ENC_NA); + ENC_ASCII); switch(rdtype) { diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 56bc9a8f6d..3be737a23b 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -275,7 +275,7 @@ dissect_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); } @@ -288,7 +288,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre guint16 info_string_length; info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 5d77723e84..ab2049e784 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -398,7 +398,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre guint16 info_string_length; info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); } diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 7e48c8a3a1..1b4befd6af 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2989,7 +2989,7 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Create tree for this Body */ rar_body_ti = proto_tree_add_item(tree, hf_mac_lte_rar_body, - tvb, offset, 0, ENC_ASCII|ENC_NA); + tvb, offset, 0, ENC_ASCII); rar_body_tree = proto_item_add_subtree(rar_body_ti, ett_mac_lte_rar_body); /* Dissect an RAR entry */ @@ -3232,7 +3232,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Create headers tree */ rar_headers_ti = proto_tree_add_item(tree, hf_mac_lte_rar_headers, - tvb, offset, 0, ENC_ASCII|ENC_NA); + tvb, offset, 0, ENC_ASCII); rar_headers_tree = proto_item_add_subtree(rar_headers_ti, ett_mac_lte_rar_headers); @@ -3248,7 +3248,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Create tree for this header */ rar_header_ti = proto_tree_add_item(rar_headers_tree, hf_mac_lte_rar_header, - tvb, offset, 0, ENC_ASCII|ENC_NA); + tvb, offset, 0, ENC_ASCII); rar_header_tree = proto_item_add_subtree(rar_header_ti, ett_mac_lte_rar_header); /* Extension */ @@ -7200,7 +7200,7 @@ static int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (p_mac_lte_info->oob_event) { case ltemac_send_preamble: preamble_ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_send_preamble, - tvb, 0, 0, ENC_ASCII|ENC_NA); + tvb, 0, 0, ENC_ASCII); preamble_tree = proto_item_add_subtree(preamble_ti, ett_mac_lte_oob); proto_item_set_generated(ti); diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index f252efa4a5..1c9b445ee0 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -1247,7 +1247,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Subheader */ proto_item *subheader_ti = proto_tree_add_item(tree, hf_mac_nr_rar_subheader, - tvb, offset, 0, ENC_ASCII|ENC_NA); + tvb, offset, 0, ENC_ASCII); proto_tree *rar_subheader_tree = proto_item_add_subtree(subheader_ti, ett_mac_nr_rar_subheader); /* Note extension & T bits */ @@ -1378,7 +1378,7 @@ static proto_item* dissect_me_phr_ph(tvbuff_t *tvb, packet_info *pinfo _U_, prot /* Subtree for this entry */ proto_item *entry_ti = proto_tree_add_item(tree, hf_mac_nr_control_me_phr_entry, - tvb, *offset, 0, ENC_ASCII|ENC_NA); + tvb, *offset, 0, ENC_ASCII); proto_tree *entry_tree = proto_item_add_subtree(entry_ti, ett_mac_nr_me_phr_entry); /* P */ @@ -1593,7 +1593,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Subheader */ proto_item *subheader_ti = proto_tree_add_item(tree, hf_mac_nr_subheader, - tvb, offset, 0, ENC_ASCII|ENC_NA); + tvb, offset, 0, ENC_ASCII); proto_tree *subheader_tree = proto_item_add_subtree(subheader_ti, ett_mac_nr_subheader); diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 581fae08f0..3015b8e543 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -224,11 +224,11 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 3: /* Username */ - proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_username, tvb, offset, datalength, ENC_ASCII|ENC_NA); + proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_username, tvb, offset, datalength, ENC_ASCII); break; case 4: /* Terminal type */ - proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_terminal, tvb, offset, datalength, ENC_ASCII|ENC_NA); + proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_terminal, tvb, offset, datalength, ENC_ASCII); break; case 5: /* Terminal width */ diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 3c102e0b37..b2ae81fa5d 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -5108,7 +5108,7 @@ mbim_dissect_set_ussd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint case SMS_ENCODING_8BIT: /* XXX - ASCII, or some extended ASCII? */ proto_tree_add_item(subtree, hf_mbim_set_ussd_ussd_payload_text, - ussd_tvb , 0, ussd_payload_length, ENC_ASCII|ENC_NA); + ussd_tvb , 0, ussd_payload_length, ENC_ASCII); break; case SMS_ENCODING_UCS2: case SMS_ENCODING_UCS2_LANG: @@ -5161,7 +5161,7 @@ mbim_dissect_ussd_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint case SMS_ENCODING_8BIT: /* XXX - ASCII, or some extended ASCII? */ proto_tree_add_item(subtree, hf_mbim_ussd_info_ussd_payload_text, - ussd_tvb , 0, ussd_payload_length, ENC_ASCII|ENC_NA); + ussd_tvb , 0, ussd_payload_length, ENC_ASCII); break; case SMS_ENCODING_UCS2: case SMS_ENCODING_UCS2_LANG: @@ -9255,7 +9255,7 @@ dissect_mbim_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item_set_hidden(ti); subtree = proto_tree_add_subtree(mbim_tree, tvb, 0, 0, ett_mbim_msg_header, NULL, "NCM Transfer Header"); - proto_tree_add_item(subtree, hf_mbim_bulk_nth_signature, tvb, 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_mbim_bulk_nth_signature, tvb, 0, 4, ENC_ASCII); proto_tree_add_item_ret_uint(subtree, hf_mbim_bulk_nth_header_length, tvb, 4, 2, ENC_LITTLE_ENDIAN, &length); proto_item_set_len(ti, length); proto_tree_add_item(subtree, hf_mbim_bulk_nth_sequence_number, tvb, 6, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 1eff78dd02..39ffc58fc8 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -1530,7 +1530,7 @@ dissect_modbus_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *modbus_tr if (object_type < 7) { - proto_tree_add_item(device_objects_item_tree, hf_modbus_object_str_value, tvb, payload_start+6+object_index, object_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(device_objects_item_tree, hf_modbus_object_str_value, tvb, payload_start+6+object_index, object_len, ENC_ASCII); } else { diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 9dc46d71a7..186bdbfd6c 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -379,7 +379,7 @@ dissect_key (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean missing = FALSE; /* Set when key is missing */ if (key_len) { - ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, ENC_ASCII); offset += key_len; if ((opcode == OP_QUIT) || (opcode == OP_QUIT_Q) || (opcode == OP_NO_OP) || (opcode == OP_VERSION)) { @@ -434,7 +434,7 @@ dissect_value (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expert_add_info_format(pinfo, ti, &ei_value_length, "Illegal Value length, should be 8"); } } else { - ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, ENC_ASCII); } offset += value_len; } @@ -581,7 +581,7 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat dissect_value (tvb, pinfo, memcache_tree, offset, value_len, opcode, request); /*offset += value_len;*/ } else if (body_len) { - proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, ENC_ASCII|ENC_NA); + proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, ENC_ASCII); /*offset += body_len;*/ col_append_fstr (pinfo->cinfo, COL_INFO, " (%s)", @@ -1052,7 +1052,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) tokenlen = get_token_len (line, lineend, &next_token); if ((tokenlen == 4) && strncmp (line, "STAT", tokenlen) == 0) { - proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; occurrences = find_stat_colon (line, lineend, &first_colon, &last_colon); @@ -1069,7 +1069,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) case 2: /* stats items: 2 colons */ /* subcommand 'items' */ tokenlen = (int) (first_colon - line); - proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII); offset += tokenlen + 1; /* slabclass */ @@ -1115,7 +1115,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) return -1; /* invalid token */ } - proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; @@ -1124,7 +1124,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) if (tokenlen == 0) { return -1; /* invalid token */ } - proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, ENC_ASCII); offset = next_offset; } @@ -1288,7 +1288,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree return -1; } - proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; @@ -1327,7 +1327,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree (tokenlen == 2 && strncmp (line, "OK", tokenlen) == 0) || (tokenlen == 3 && strncmp (line, "END", tokenlen) == 0)) { - proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); return offset; } @@ -1365,7 +1365,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { return -1; } - proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; @@ -1452,7 +1452,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tokenlen = get_token_len (line, lineend, &next_token); if (tokenlen != 0) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII); } offset += (int) (next_token - line); } @@ -1481,7 +1481,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { return -1; } - proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; @@ -1491,7 +1491,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; /* reached CRLF */ } if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; } else { @@ -1527,7 +1527,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen <= 10) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII); } else { /* expiration */ memcpy (response_chars, line, tokenlen); @@ -1574,7 +1574,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen == 0) { /* just the 'stats' command;*/ return offset; } else { /* there is a sub command; record it*/ - proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); line = next_token; } @@ -1598,7 +1598,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tokenlen <= 10) { if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII); } else { /* expiration */ memcpy (response_chars, line, tokenlen); @@ -1620,7 +1620,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) { /* noreply */ - proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII); offset += (int) (next_token - line); } else { return -1; /* expecting CRLF and if not noreply*/ diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index a03f50dd70..0c7c324340 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -356,7 +356,7 @@ static guint16 evaluate_meta_item_dxt(proto_tree *meta_tree, tvbuff_t *tvb, pack break; case META_ID_APN: proto_tree_add_item(meta_tree, hf_meta_item_apn, tvb, - offs, len, ENC_ASCII|ENC_NA); + offs, len, ENC_ASCII); break; case META_ID_RAT: rat = tvb_get_guint8(tvb, offs); @@ -438,11 +438,11 @@ static guint16 evaluate_meta_item_dxt(proto_tree *meta_tree, tvbuff_t *tvb, pack break; case META_ID_CALLING: proto_tree_add_item(meta_tree, hf_meta_item_calling, tvb, - offs, len, ENC_ASCII|ENC_NA); + offs, len, ENC_ASCII); break; case META_ID_CALLED: proto_tree_add_item(meta_tree, hf_meta_item_called, tvb, - offs, len, ENC_ASCII|ENC_NA); + offs, len, ENC_ASCII); break; default: subti = proto_tree_add_item(meta_tree, hf_meta_item, tvb, offs - 4, diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 62c7af7d0b..55e77cac0e 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -281,7 +281,7 @@ dissect_metamako(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data case 31: /* Tag String */ metamako_tlv_pos -= ( metamako_tlv_len + 1 ) * 4; - proto_tree_add_item(extensions_tree, hf_metamako_tagstring, tvb, metamako_tlv_pos + 4, metamako_tlv_len * 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(extensions_tree, hf_metamako_tagstring, tvb, metamako_tlv_pos + 4, metamako_tlv_len * 4, ENC_ASCII); /* Increment the offset by the Data + Tag size */ offset += ( metamako_tlv_len + 1 ) * 4; break; diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 8581510581..828cad2e9b 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1584,7 +1584,7 @@ dissect_mgcp_connectionparams(proto_tree *parent_tree, tvbuff_t *tvb, gint offse gchar **tokens; guint i; - item = proto_tree_add_item(parent_tree, hf_mgcp_param_connectionparam, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(parent_tree, hf_mgcp_param_connectionparam, tvb, offset, param_type_len+param_val_len, ENC_ASCII); tree = proto_item_add_subtree(item, ett_mgcp_param_connectionparam); /* The P: line */ @@ -1691,7 +1691,7 @@ dissect_mgcp_localconnectionoptions(proto_tree *parent_tree, tvbuff_t *tvb, gint gchar **tokens; guint i; - item = proto_tree_add_item(parent_tree, hf_mgcp_param_localconnoptions, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(parent_tree, hf_mgcp_param_localconnoptions, tvb, offset, param_type_len+param_val_len, ENC_ASCII); tree = proto_item_add_subtree(item, ett_mgcp_param_localconnectionoptions); /* The L: line */ @@ -1853,7 +1853,7 @@ dissect_mgcp_localvoicemetrics(proto_tree *parent_tree, tvbuff_t *tvb, gint offs if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mgcp_param_localvoicemetrics, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(parent_tree, hf_mgcp_param_localvoicemetrics, tvb, offset, param_type_len+param_val_len, ENC_ASCII); tree = proto_item_add_subtree(item, ett_mgcp_param_localvoicemetrics); } @@ -2004,7 +2004,7 @@ dissect_mgcp_remotevoicemetrics(proto_tree *parent_tree, tvbuff_t *tvb, gint off if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mgcp_param_remotevoicemetrics, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(parent_tree, hf_mgcp_param_remotevoicemetrics, tvb, offset, param_type_len+param_val_len, ENC_ASCII); tree = proto_item_add_subtree(item, ett_mgcp_param_remotevoicemetrics); } diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 66a63397a3..78920b2558 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -1004,7 +1004,7 @@ static gint16 dissect_link_addr(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tr case 4 :/*3GPP2_ADDR*/ case 5 :/*OTHER_L2_ADDR*/ len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_link_addr_string, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_link_addr_string, tvb, offset+2, len, ENC_ASCII); return (offset + 2 + len); } return 0; @@ -1021,7 +1021,7 @@ static gint16 dissect_tsp_container(tvbuff_t *tvb, gint16 offset, proto_tree *tl else if(tvb_get_guint8(tvb, offset) == 2) { len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_tsp_carrier, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_tsp_carrier, tvb, offset+2, len, ENC_ASCII); return (offset + len + 2); } else @@ -1034,12 +1034,12 @@ static gint16 dissect_iq_rdf_data(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_ if(tvb_get_guint8(tvb, offset)) { len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_rdf_mime_type, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_rdf_mime_type, tvb, offset+2, len, ENC_ASCII); offset += len + 1; } offset++; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_rdf_data, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_rdf_data, tvb, offset+1, len, ENC_ASCII); return (offset+len+1); } @@ -1082,7 +1082,7 @@ static gint16 dissect_dev_states(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_t /*DEVICE INFO*/ offset++; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(sub_tree, hf_dev_info, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_dev_info, tvb, offset+1, len, ENC_ASCII); return (offset + len + 1); } @@ -1138,7 +1138,7 @@ static gint16 dissect_net_type(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tre { /*TYPE_EXT*/ len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_link_type_ext, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_link_type_ext, tvb, offset+2, len, ENC_ASCII); offset += len + 2; } return (offset); @@ -1169,14 +1169,14 @@ static gint16 dissect_tgt_net_info(tvbuff_t *tvb, gint16 offset, proto_tree *tlv /*NETWORK_ID*/ len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII); offset += len + 2; if(!tvb_get_guint8(tvb, offset)) { /*NET_AUX_ID*/ offset +=1; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_net_aux_id, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_net_aux_id, tvb, offset+1, len, ENC_ASCII); return (offset + 1); } return (offset + 2); @@ -1274,10 +1274,10 @@ static gint16 dissect_link_det_info(tvbuff_t *tvb, gint16 offset, proto_tree *tl } offset++; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII); offset += len + 1; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_net_aux_id, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_net_aux_id, tvb, offset+1, len, ENC_ASCII); offset += len + 1; if(tvb_get_guint8(tvb, offset)) proto_tree_add_item(tlv_tree, hf_sig_strength_per, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -1300,7 +1300,7 @@ static gint16 dissect_link_scan_rsp(tvbuff_t *tvb, gint16 offset, proto_tree *tl guint8 len = 0; offset = dissect_link_addr(tvb, offset, tlv_tree); len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+1, len, ENC_ASCII); offset = offset + len + 1; if(tvb_get_guint8(tvb, offset)) proto_tree_add_item(tlv_tree, hf_sig_strength_per, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -1555,7 +1555,7 @@ static gint16 dissect_link_det_cfg(tvbuff_t *tvb, gint16 offset, proto_tree *tlv if(tvb_get_guint8(tvb, offset)) { len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_network_id, tvb, offset+2, len, ENC_ASCII); offset += len + 1; } offset++; @@ -1629,7 +1629,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin value.*/ mihf_id_first_char = (char)tvb_get_guint8(tvb, offset+1); if(mihf_id_first_char!='\\') - proto_tree_add_item(tlv_tree, hf_mihf_id, tvb, offset+1, mihf_id_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_mihf_id, tvb, offset+1, mihf_id_len, ENC_ASCII); else { if(mihf_id_len<tvb_reported_length_remaining(tvb,0) && (mihf_id_len==12 || mihf_id_len==64 || mihf_id_len==128)) @@ -1878,7 +1878,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin case IQ_BIN_DATA_LIST : /*IQ_BIN_DATA LIST*/ - proto_tree_add_item(tlv_tree, hf_iq_bin_data_x, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_iq_bin_data_x, tvb, offset, length, ENC_ASCII); break; case IQ_RDF_DATA_LIST : @@ -1893,7 +1893,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin for(i=0; i < tvb_get_guint8(tvb, offset); i++) { len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_rdf_sch, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_rdf_sch, tvb, offset+2, len, ENC_ASCII); offset += len; } break; @@ -1905,7 +1905,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin case IR_BIN_DATA_LIST : /*IR_BIN_DATA LIST*/ - proto_tree_add_item(tlv_tree, hf_ir_bin_data, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ir_bin_data, tvb, offset, length, ENC_ASCII); break; case IR_SCHM_URL_LIST : @@ -1913,7 +1913,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin for(i=0; i < tvb_get_guint8(tvb, offset); i++) { len = tvb_get_guint8(tvb, offset+1); - proto_tree_add_item(tlv_tree, hf_rdf_sch_url, tvb, offset+2, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_rdf_sch_url, tvb, offset+2, len, ENC_ASCII); offset += len; } break; @@ -1958,7 +1958,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin case VEND_SPECIFIC_TLV : /*Vendor specific tlv*/ - proto_tree_add_item(tlv_tree, hf_vendor_specific_tlv, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_vendor_specific_tlv, tvb, offset, length, ENC_ASCII); break; default :/*did not match type*/ @@ -1966,15 +1966,15 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin /*RESERVED TLVs*/ if(type > 63 && type < 100) - proto_tree_add_item(tlv_tree, hf_reserved_tlv, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_reserved_tlv, tvb, offset, length, ENC_ASCII); /*EXPERIMENTAL TLVs*/ else if(type > 100 && type < 255) - proto_tree_add_item(tlv_tree, hf_experimental_tlv, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_experimental_tlv, tvb, offset, length, ENC_ASCII); /*UNKNOWN TLVs*/ else - proto_tree_add_item(tlv_tree, hf_unknown_tlv, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_unknown_tlv, tvb, offset, length, ENC_ASCII); } return; } diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index df573fc89e..851d6cd59f 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -1201,7 +1201,7 @@ dissect_payload_general_ext(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinf parent = proto_tree_get_parent(tree); if (type == 1) { /* For SDP-IDs, show a string instead of raw bytes */ - proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_VALUE], tvb, 4, data_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_VALUE], tvb, 4, data_len, ENC_ASCII); } else { proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_DATA], tvb, 4, data_len, ENC_NA); } diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c index 50adf6fee4..6639f41f80 100644 --- a/epan/dissectors/packet-miop.c +++ b/epan/dissectors/packet-miop.c @@ -177,7 +177,7 @@ static int dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, miop_tree = proto_item_add_subtree (ti, ett_miop); /* XXX - Should we bail out if we don't have the right magic number? */ - proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_uint_format_value(miop_tree, hf_miop_hdr_version, tvb, offset, 1, hdr_version, "%u.%u", version_major, version_minor); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 21b821abe8..5209fa7841 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -593,7 +593,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info break; case MN_NAI_EXT: proto_tree_add_item(ext_tree, hf_mip_next_nai, tvb, offset, - ext_len, ENC_ASCII|ENC_NA); + ext_len, ENC_ASCII); break; case GEN_AUTH_EXT: /* RFC 3012 */ @@ -638,7 +638,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info proto_tree_add_item(ext_tree, hf_mip_mstrext_stype, tvb, offset, 1, ENC_BIG_ENDIAN); /* text */ - proto_tree_add_item(ext_tree, hf_mip_mstrext_text, tvb, offset + 1, ext_len-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ext_tree, hf_mip_mstrext_text, tvb, offset + 1, ext_len-1, ENC_ASCII); break; case UDP_TUN_REQ_EXT: /* RFC 3519 */ { diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c index ad93f0a8e9..4e219a6cfe 100644 --- a/epan/dissectors/packet-mojito.c +++ b/epan/dissectors/packet-mojito.c @@ -231,7 +231,7 @@ dissect_mojito_contact(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int contact_tree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_mojito_contact, &contact_item, "Contact"); } - proto_tree_add_item(contact_tree, hf_mojito_contactvendor, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(contact_tree, hf_mojito_contactvendor, tvb, offset, 4, ENC_ASCII); offset += 4; version_item = proto_tree_add_item(contact_tree, hf_mojito_contactversion, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -293,7 +293,7 @@ dissect_mojito_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, contact_start_offset = offset; contact_tree = proto_tree_add_subtree(header_tree, tvb, offset, 35, ett_mojito_contact, &contact_item, "Originating Contact"); - proto_tree_add_item(contact_tree, hf_mojito_vendor, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(contact_tree, hf_mojito_vendor, tvb, offset, 4, ENC_ASCII); offset += 4; version_tree = proto_tree_add_subtree(contact_tree, tvb, offset, 2, ett_mojito_contact_version, NULL, "Contact Version"); @@ -414,7 +414,7 @@ dissect_mojito_store_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_kuid, tvb, offset, 20, ENC_NA); offset += 20; - proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_valuetype, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_valuetype, tvb, offset, 4, ENC_ASCII); offset += 4; /* Version */ @@ -430,7 +430,7 @@ dissect_mojito_store_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII|ENC_NA); + proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII); offset += dhtvaluelength; proto_item_set_len(dht_item, offset-start_offset); @@ -474,7 +474,7 @@ dissect_mojito_store_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_item(sc_tree, hf_mojito_dhtvalue_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(sc_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII|ENC_NA); + proto_tree_add_item(sc_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII); offset += dhtvaluelength; proto_item_set_len(sc_item, offset-start_offset); @@ -534,7 +534,7 @@ dissect_mojito_find_value_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset += 20; } - proto_tree_add_item(tree, hf_mojito_dhtvaluetype, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mojito_dhtvaluetype, tvb, offset, 4, ENC_ASCII); /*offset += 4;*/ } @@ -568,7 +568,7 @@ dissect_mojito_find_value_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_kuid, tvb, offset, 20, ENC_NA); offset += 20; - proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_valuetype, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_valuetype, tvb, offset, 4, ENC_ASCII); offset += 4; /* Version */ @@ -586,7 +586,7 @@ dissect_mojito_find_value_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 2; /* Value */ - proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII|ENC_NA); + proto_tree_add_item(dht_tree, hf_mojito_dhtvalue_value, tvb, offset, dhtvaluelength, ENC_ASCII); offset += dhtvaluelength; proto_item_set_len(dht_item, offset-start_offset); diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c index 09d02f6c2c..7e211695cf 100644 --- a/epan/dissectors/packet-moldudp.c +++ b/epan/dissectors/packet-moldudp.c @@ -152,7 +152,7 @@ dissect_moldudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data moldudp_tree = proto_item_add_subtree(ti, ett_moldudp); proto_tree_add_item(moldudp_tree, hf_moldudp_session, - tvb, offset, MOLDUDP_SESSION_LEN, ENC_ASCII|ENC_NA); + tvb, offset, MOLDUDP_SESSION_LEN, ENC_ASCII); offset += MOLDUDP_SESSION_LEN; sequence = tvb_get_letohl(tvb, offset); diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index c503e18122..78ccd9c0b8 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -155,7 +155,7 @@ dissect_moldudp64(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat moldudp64_tree = proto_item_add_subtree(ti, ett_moldudp64); proto_tree_add_item(moldudp64_tree, hf_moldudp64_session, - tvb, offset, MOLDUDP64_SESSION_LEN, ENC_ASCII|ENC_NA); + tvb, offset, MOLDUDP64_SESSION_LEN, ENC_ASCII); offset += MOLDUDP64_SESSION_LEN; proto_tree_add_item(moldudp64_tree, hf_moldudp64_sequence, diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 892374eda2..b37c1a1a62 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -290,16 +290,16 @@ dissect_fullcollectionname(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree *fcn_tree; fcn_length = tvb_strsize(tvb, offset); - ti = proto_tree_add_item(tree, hf_mongo_fullcollectionname, tvb, offset, fcn_length, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_mongo_fullcollectionname, tvb, offset, fcn_length, ENC_ASCII); /* If this doesn't find anything, we'll just throw an exception below */ dbn_length = tvb_find_guint8(tvb, offset, fcn_length, '.') - offset; fcn_tree = proto_item_add_subtree(ti, ett_mongo_fcn); - proto_tree_add_item(fcn_tree, hf_mongo_database_name, tvb, offset, dbn_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(fcn_tree, hf_mongo_database_name, tvb, offset, dbn_length, ENC_ASCII); - proto_tree_add_item(fcn_tree, hf_mongo_collection_name, tvb, offset + 1 + dbn_length, fcn_length - dbn_length - 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(fcn_tree, hf_mongo_collection_name, tvb, offset + 1 + dbn_length, fcn_length - dbn_length - 2, ENC_ASCII); return fcn_length; } @@ -507,7 +507,7 @@ dissect_mongo_reply(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree static int dissect_mongo_msg(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_mongo_message, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mongo_message, tvb, offset, -1, ENC_ASCII); offset += tvb_strsize(tvb, offset); return offset; @@ -652,11 +652,11 @@ dissect_mongo_op_command(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_ gint32 db_length, cmd_length; db_length = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_mongo_database, tvb, offset, db_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mongo_database, tvb, offset, db_length, ENC_ASCII); offset += db_length; cmd_length = tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_mongo_commandname, tvb, offset, cmd_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mongo_commandname, tvb, offset, cmd_length, ENC_ASCII); offset += cmd_length; offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_metadata); @@ -806,7 +806,7 @@ dissect_op_msg_section(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tr to_read -= 4; dsi_length = tvb_strsize(tvb, offset); - proto_tree_add_item(section_tree, hf_mongo_msg_sections_section_doc_sequence_id, tvb, offset, dsi_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(section_tree, hf_mongo_msg_sections_section_doc_sequence_id, tvb, offset, dsi_length, ENC_ASCII); offset += dsi_length; to_read -= dsi_length; diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 2b4e24fed2..0cc0bb38c7 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -551,7 +551,7 @@ static void proto_mpeg_descriptor_dissect_iso639(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree) { if (len > 1) - proto_tree_add_item(tree, hf_mpeg_descr_iso639_lang, tvb, offset, len - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_iso639_lang, tvb, offset, len - 1, ENC_ASCII); offset += len - 1; proto_tree_add_item(tree, hf_mpeg_descr_iso639_type, tvb, offset, 1, ENC_BIG_ENDIAN); } @@ -1272,7 +1272,7 @@ proto_mpeg_descriptor_dissect_country_availability_descriptor(tvbuff_t *tvb, gui countries_tree = proto_tree_add_subtree_format(tree, tvb, offset, end - offset, ett_mpeg_descriptor_country_availability_countries, NULL, "Countries"); while (offset < end) { - proto_tree_add_item(countries_tree, hf_mpeg_descr_country_availability_country_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(countries_tree, hf_mpeg_descr_country_availability_country_code, tvb, offset, 3, ENC_ASCII); offset += 3; } } @@ -1507,7 +1507,7 @@ proto_mpeg_descriptor_dissect_short_event(tvbuff_t *tvb, guint offset, proto_tre guint enc_len; dvb_encoding_e encoding; - proto_tree_add_item(tree, hf_mpeg_descr_short_event_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_short_event_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; name_len = tvb_get_guint8(tvb, offset); @@ -1566,7 +1566,7 @@ proto_mpeg_descriptor_dissect_extended_event(tvbuff_t *tvb, guint offset, proto_ proto_tree_add_item(tree, hf_mpeg_descr_extended_event_last_descriptor_number, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_mpeg_descr_extended_event_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_extended_event_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; items_len = tvb_get_guint8(tvb, offset); @@ -1582,14 +1582,14 @@ proto_mpeg_descriptor_dissect_extended_event(tvbuff_t *tvb, guint offset, proto_ proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_description_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_description_char, tvb, offset, item_descr_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_description_char, tvb, offset, item_descr_len, ENC_ASCII); offset += item_descr_len; item_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_char, tvb, offset, item_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(item_tree, hf_mpeg_descr_extended_event_item_char, tvb, offset, item_len, ENC_ASCII); offset += item_len; } @@ -1903,7 +1903,7 @@ mpeg_descr_component_tail: proto_tree_add_item(tree, hf_mpeg_descr_component_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_mpeg_descr_component_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_component_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; if (offset < end) @@ -2288,7 +2288,7 @@ static value_string_ext mpeg_descr_parental_rating_vals_ext = VALUE_STRING_EXT_I static void proto_mpeg_descriptor_dissect_parental_rating(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_country_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_country_code, tvb, offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_mpeg_descr_parental_rating_rating, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2321,7 +2321,7 @@ proto_mpeg_descriptor_dissect_teletext(tvbuff_t *tvb, guint offset, guint len, p guint end = offset + len; while (offset < end) { - proto_tree_add_item(tree, hf_mpeg_descr_teletext_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_teletext_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_mpeg_descr_teletext_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2463,7 +2463,7 @@ proto_mpeg_descriptor_dissect_local_time_offset(tvbuff_t *tvb, guint offset, gui nstime_t local_time_offset, time_of_change, next_time_offset; while (offset < end) { - proto_tree_add_item(tree, hf_mpeg_descr_local_time_offset_country_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_local_time_offset_country_code, tvb, offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_mpeg_descr_local_time_offset_region_id, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2532,7 +2532,7 @@ proto_mpeg_descriptor_dissect_subtitling(tvbuff_t *tvb, guint offset, guint len, guint end = offset + len; while (offset < end) { - proto_tree_add_item(tree, hf_mpeg_descr_subtitling_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_subtitling_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; proto_tree_add_item(tree, hf_mpeg_descr_subtitling_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2744,7 +2744,7 @@ proto_mpeg_descriptor_dissect_multilng_network_name_desc(tvbuff_t *tvb, guint of lng_tree = proto_tree_add_subtree_format(tree, tvb, offset, lng_len, ett_mpeg_descriptor_multilng_network_name_desc_lng, NULL, "Language \"%s\"", lng); - proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_network_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_network_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII); offset += 3; cnt -= 3; @@ -2814,7 +2814,7 @@ proto_mpeg_descriptor_dissect_multilng_bouquet_name_desc(tvbuff_t *tvb, guint of lng_tree = proto_tree_add_subtree_format(tree, tvb, offset, lng_len, ett_mpeg_descriptor_multilng_bouquet_name_desc_lng, NULL, "Language \"%s\"", lng); - proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_bouquet_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_bouquet_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII); offset += 3; cnt -= 3; @@ -2896,7 +2896,7 @@ proto_mpeg_descriptor_dissect_multilng_srv_name_desc(tvbuff_t *tvb, guint offset lng_tree = proto_tree_add_subtree_format(tree, tvb, offset, lng_len, ett_mpeg_descriptor_multilng_srv_name_desc_lng, NULL, "Language \"%s\"", lng); - proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_srv_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_srv_name_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII); offset += 3; cnt -= 3; @@ -2987,7 +2987,7 @@ proto_mpeg_descriptor_dissect_multilng_component_desc(tvbuff_t *tvb, guint offse lng_tree = proto_tree_add_subtree_format(tree, tvb, offset, lng_len, ett_mpeg_descriptor_multilng_component_desc_lng, NULL, "Language \"%s\"", lng); - proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_component_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(lng_tree, hf_mpeg_descr_multilng_component_desc_iso639_language_code, tvb, offset, 3, ENC_ASCII); offset += 3; cnt -= 3; @@ -3226,7 +3226,7 @@ proto_mpeg_descriptor_dissect_data_bcast(tvbuff_t *tvb, guint offset, proto_tree offset += selector_len; } - proto_tree_add_item(tree, hf_mpeg_descr_data_bcast_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_data_bcast_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; text_len = tvb_get_guint8(tvb, offset); @@ -3234,7 +3234,7 @@ proto_mpeg_descriptor_dissect_data_bcast(tvbuff_t *tvb, guint offset, proto_tree offset += 1; if (text_len > 0) - proto_tree_add_item(tree, hf_mpeg_descr_data_bcast_text, tvb, offset, text_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_data_bcast_text, tvb, offset, text_len, ENC_ASCII); } /* 0x66 Data Broadcast ID Descriptor */ @@ -3407,7 +3407,7 @@ static int hf_mpeg_descr_service_identifier = -1; static void proto_mpeg_descriptor_dissect_service_identifier(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree) { - proto_tree_add_item(tree, hf_mpeg_descr_service_identifier, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_service_identifier, tvb, offset, len, ENC_ASCII); } /* 0x72 Service Availability Descriptor */ @@ -3452,7 +3452,7 @@ static int hf_mpeg_descr_default_authority_name = -1; static void proto_mpeg_descriptor_dissect_default_authority(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree) { - proto_tree_add_item(tree, hf_mpeg_descr_default_authority_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_default_authority_name, tvb, offset, len, ENC_ASCII); } /* 0x76 Content Identifier Descriptor */ @@ -3635,7 +3635,7 @@ proto_mpeg_descriptor_dissect_extension(tvbuff_t *tvb, guint offset, guint len, proto_tree_add_item(tree, hf_mpeg_descr_extension_supp_audio_lang_code_present, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (lang_code_present) { - proto_tree_add_item(tree, hf_mpeg_descr_extension_supp_audio_lang_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_extension_supp_audio_lang_code, tvb, offset, 3, ENC_ASCII); offset += 3; } already_dissected = offset-offset_start; @@ -3837,14 +3837,14 @@ proto_mpeg_descriptor_dissect_ac3_system_a(tvbuff_t *tvb, guint offset, guint le if (offset >= end) return; if (lang & 0x80) { - proto_tree_add_item(tree, hf_mpeg_descr_ac3_sysa_lang1_bytes, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_ac3_sysa_lang1_bytes, tvb, offset, 3, ENC_ASCII); offset += 3; } if (offset >= end) return; if (lang & 0x40) { - proto_tree_add_item(tree, hf_mpeg_descr_ac3_sysa_lang2_bytes, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_ac3_sysa_lang2_bytes, tvb, offset, 3, ENC_ASCII); offset += 3; } @@ -3971,7 +3971,7 @@ proto_mpeg_descriptor_dissect_nordig_lcd_v2(tvbuff_t *tvb, guint offset, guint l cnt -= channel_list_name_length; if (cnt < 3) return; - proto_tree_add_item(channel_list_tree, hf_mpeg_descr_nordig_lcd_v2_country_code, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(channel_list_tree, hf_mpeg_descr_nordig_lcd_v2_country_code, tvb, offset, 3, ENC_ASCII); offset += 3; cnt -= 3; @@ -4252,10 +4252,10 @@ proto_mpeg_descriptor_dissect_private_ciplus(tvbuff_t *tvb, guint offset, proto_ proto_tree_add_item(tree, hf_mpeg_descr_ciplus_cl_cb_max, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_mpeg_descr_ciplus_cl_lang, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_ciplus_cl_lang, tvb, offset, 3, ENC_ASCII); offset += 3; - proto_tree_add_item(tree, hf_mpeg_descr_ciplus_cl_label, tvb, offset, len-offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mpeg_descr_ciplus_cl_label, tvb, offset, len-offset, ENC_ASCII); offset += len-offset; } else if (tag==CIPLUS_DESC_TAG_SVC) { diff --git a/epan/dissectors/packet-mqtt-sn.c b/epan/dissectors/packet-mqtt-sn.c index b4e6e61b03..d86a91f9db 100644 --- a/epan/dissectors/packet-mqtt-sn.c +++ b/epan/dissectors/packet-mqtt-sn.c @@ -314,7 +314,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Gateway Address is only present if message is sent by client. */ if (offset < mqttsn_msg_len) { - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_gw_addr, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_gw_addr, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); } break; @@ -325,7 +325,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 1; proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_keep_alive, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_client_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_client_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Connection Acknowledgement */ @@ -343,13 +343,13 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Will Topic */ case MQTTSN_WILLTOPIC: /* | 1:n - Will topic | */ - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Will Message */ case MQTTSN_WILLMSG: /* | 1:n - Will message | */ - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Register */ @@ -359,7 +359,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 2; proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Register Acknowledgement */ @@ -379,7 +379,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 2; proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_pub_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_pub_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Publish Acknowledgement */ @@ -406,7 +406,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* | 1,2 - Message ID | 5:n - Topic name _OR_ 5,6 - Topic ID | */ proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_topic_name_or_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_topic_name_or_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Subscribe Acknowledgment */ @@ -430,7 +430,7 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* | 1:n - Client ID (optional) | */ if (offset < mqttsn_msg_len) { - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_client_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_client_id, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); } break; @@ -451,13 +451,13 @@ static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Will Topic Update */ case MQTTSN_WILLTOPICUPD: /* | 1:n - Will topic | */ - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_topic, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Will Message Update */ case MQTTSN_WILLMSGUPD: /* | 1:n - Will message | */ - proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(mqttsn_msg_tree, hf_mqttsn_will_msg, tvb, offset, (mqttsn_msg_len - offset), ENC_ASCII); break; /* Will Topic Response + Will Message Response */ diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index cb6d388051..2ef78f3336 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -611,7 +611,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (content_length > 0) { /* content length > 0 and CRLF detected, this has to be msg body */ offset += 2; /* skip separating CRLF */ - proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Data, tvb, offset, tvb_len - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Data, tvb, offset, tvb_len - offset, ENC_ASCII); next_offset = tvb_len; /* we are done */ } continue; diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index dce8a64fd8..2510b7662e 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -378,7 +378,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_set_str(pinfo->cinfo, COL_INFO, "Command: "); /* Add hidden filter for "msmms.command" */ - ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, ENC_ASCII); proto_item_set_hidden(ti); /* Create MSMMS control protocol tree */ @@ -421,7 +421,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree { return offset; } - proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_protocol_type, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_protocol_type, tvb, offset, 4, ENC_ASCII); offset += 4; /* Remaining length in multiples of 8 bytes */ diff --git a/epan/dissectors/packet-msgpack.c b/epan/dissectors/packet-msgpack.c index b9a7081012..7cdf5a0b9f 100644 --- a/epan/dissectors/packet-msgpack.c +++ b/epan/dissectors/packet-msgpack.c @@ -245,11 +245,11 @@ static void dissect_msgpack_string(tvbuff_t* tvb, packet_info* pinfo, proto_tree if (lensize == 0) { proto_tree_add_uint_format(subtree, hf_msgpack_type, tvb, *offset, 1, type, "Type: String"); proto_tree_add_uint_format(subtree, hf_msgpack_string_len, tvb, *offset, 1, lensize, "Length: 1"); - proto_tree_add_item(subtree, hf_msgpack_string, tvb, *offset + 1 + lensize, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_msgpack_string, tvb, *offset + 1 + lensize, len, ENC_ASCII); } else { proto_tree_add_item(subtree, hf_msgpack_type, tvb, *offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_msgpack_string_len, tvb, *offset + 1, lensize, ENC_BIG_ENDIAN); - proto_tree_add_item(subtree, hf_msgpack_string, tvb, *offset + 1 + lensize, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_msgpack_string, tvb, *offset + 1 + lensize, len, ENC_ASCII); } *offset += 1 + lensize + len; diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 09868c93e7..6918f96ad5 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -301,7 +301,7 @@ static int display_application_name(tvbuff_t *tvb, int offset, int length; length = tvb_strnlen( tvb, offset, 255); - proto_tree_add_item(tree, hf_msproxy_application, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_msproxy_application, tvb, offset, length, ENC_ASCII); return length; } @@ -362,19 +362,19 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, length = tvb_strnlen( tvb, offset, 255); if (length == -1) return; - proto_tree_add_item(tree, hf_msproxy_user_name, tvb, offset, length + 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_msproxy_user_name, tvb, offset, length + 1, ENC_ASCII); offset += length + 2; length = tvb_strnlen( tvb, offset, 255); if (length == -1) return; - proto_tree_add_item(tree, hf_msproxy_application_name, tvb, offset, length + 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_msproxy_application_name, tvb, offset, length + 1, ENC_ASCII); offset += length + 1; length = tvb_strnlen( tvb, offset, 255); if (length == -1) return; - proto_tree_add_item(tree, hf_msproxy_client_computer_name, tvb, offset, length + 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_msproxy_client_computer_name, tvb, offset, length + 1, ENC_ASCII); } } @@ -569,7 +569,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset, ++offset; offset += 17; - proto_tree_add_item(name_tree, hf_msproxy_host_name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(name_tree, hf_msproxy_host_name, tvb, offset, length, ENC_ASCII); } } @@ -777,7 +777,7 @@ static void dissect_auth_1_ack(tvbuff_t *tvb, int offset, offset += 48; /* XXX - always 255? */ - proto_tree_add_item(tree, hf_msproxy_nt_domain, tvb, offset, 255, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_msproxy_nt_domain, tvb, offset, 255, ENC_ASCII); } } diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 40e75a395b..e109ce4f9e 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -558,7 +558,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary = (guint8 *)m_info->boundary; gint boundary_len = m_info->boundary_length; - ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, ENC_ASCII); subtree = proto_item_add_subtree(ti, ett_multipart_body); /* find the next boundary to find the end of this body part */ diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 5f3c84f0ec..2c37462633 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1435,7 +1435,7 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset, tvb_format_text(pinfo->pool, tvb, conn_data->is_mariadb_server ? offset + 6 : offset, conn_data->is_mariadb_server ? lenstr - 7 : lenstr-1)); col_set_fence(pinfo->cinfo, COL_INFO); - proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, offset, lenstr, ENC_ASCII); conn_data->major_version = 0; for (ver_offset = 0; ver_offset < lenstr; ver_offset++) { guint8 ver_char = tvb_get_guint8(tvb, offset + ver_offset); @@ -1450,7 +1450,7 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset, /* salt string */ lenstr = tvb_strsize(tvb,offset); - proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; /* rest is optional */ @@ -1491,14 +1491,14 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset, /* 4.1+ server: rest of salt */ if (tvb_reported_length_remaining(tvb, offset)) { lenstr = tvb_strsize(tvb,offset); - proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } /* 5.x server: auth plugin */ if (tvb_reported_length_remaining(tvb, offset)) { lenstr = tvb_strsize(tvb,offset); - proto_tree_add_item(greeting_tree, hf_mysql_auth_plugin, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(greeting_tree, hf_mysql_auth_plugin, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } @@ -1601,7 +1601,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, lenstr = my_tvb_strsize(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " user=%s ", tvb_format_text(pinfo->pool, tvb, offset, lenstr-1)); - proto_tree_add_item(login_tree, hf_mysql_user, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(login_tree, hf_mysql_user, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; /* rest is optional */ @@ -1634,7 +1634,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, tvb_format_text(pinfo->pool, tvb, offset, lenstr-1)); col_set_fence(pinfo->cinfo, COL_INFO); - proto_tree_add_item(login_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(login_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } @@ -1643,7 +1643,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, { mysql_set_conn_state(pinfo, conn_data, AUTH_SWITCH_REQUEST); lenstr= my_tvb_strsize(tvb,offset); - proto_tree_add_item(login_tree, hf_mysql_client_auth_plugin, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(login_tree, hf_mysql_client_auth_plugin, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } @@ -1882,14 +1882,14 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * case MYSQL_CREATE_DB: case MYSQL_DROP_DB: lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; mysql_set_conn_state(pinfo, conn_data, RESPONSE_OK); break; case MYSQL_QUERY: lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, lenstr, ENC_ASCII); if (mysql_showquery) { col_append_fstr(pinfo->cinfo, COL_INFO, " { %s } ", tvb_format_text(pinfo->pool, tvb, offset, lenstr)); @@ -1901,7 +1901,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * case MYSQL_STMT_PREPARE: lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; mysql_set_conn_state(pinfo, conn_data, RESPONSE_PREPARE); break; @@ -1920,7 +1920,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * case MYSQL_FIELD_LIST: lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_table_name, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_table_name, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; mysql_set_conn_state(pinfo, conn_data, RESPONSE_SHOW_FIELDS); break; @@ -1933,7 +1933,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * case MYSQL_CHANGE_USER: lenstr = tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_user, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_user, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; if (conn_data->clnt_caps & MYSQL_CAPS_SC) { @@ -1946,7 +1946,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * offset += lenstr; lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; if (tvb_reported_length_remaining(tvb, offset) > 0) { @@ -1960,7 +1960,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * { mysql_set_conn_state(pinfo, conn_data, AUTH_SWITCH_REQUEST); lenstr= my_tvb_strsize(tvb,offset); - proto_tree_add_item(req_tree, hf_mysql_client_auth_plugin, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_client_auth_plugin, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } @@ -2164,7 +2164,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree * /* binlog file name ? */ lenstr = tvb_reported_length_remaining(tvb, offset); if (tree && lenstr > 0) { - proto_tree_add_item(req_tree, hf_mysql_binlog_file_name, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_binlog_file_name, tvb, offset, lenstr, ENC_ASCII); } offset += lenstr; @@ -2291,7 +2291,7 @@ mysql_dissect_response(tvbuff_t *tvb, packet_info *pinfo, int offset, switch (current_state) { case RESPONSE_MESSAGE: if ((lenstr = tvb_reported_length_remaining(tvb, offset))) { - proto_tree_add_item(tree, hf_mysql_message, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_message, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; } mysql_set_conn_state(pinfo, conn_data, REQUEST); @@ -2351,11 +2351,11 @@ mysql_dissect_error_packet(tvbuff_t *tvb, packet_info *pinfo, if (tvb_get_guint8(tvb, offset) == '#') { offset += 1; - proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_ASCII); offset += 5; } - proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_ASCII); offset += tvb_reported_length_remaining(tvb, offset); return offset; @@ -2392,14 +2392,14 @@ add_session_tracker_entry_to_tree(tvbuff_t *tvb, packet_info *pinfo, proto_item proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_sysvar_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_sysvar_name, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_sysvar_name, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; lenfle = tvb_get_fle(tvb, session_track_tree, offset, &lenstr, NULL); proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_sysvar_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_sysvar_value, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_sysvar_value, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; break; case 1: /* CURRENT_SCHEMA_TRACKER */ @@ -2407,11 +2407,11 @@ add_session_tracker_entry_to_tree(tvbuff_t *tvb, packet_info *pinfo, proto_item proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_schema_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_schema, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_schema, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; break; case 2: /* SESSION_STATE_CHANGE_TRACKER */ - proto_tree_add_item(session_track_tree, hf_mysql_session_state_change, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_state_change, tvb, offset, 1, ENC_ASCII); offset++; break; case 3: /* SESSION_TRACK_GTIDS */ @@ -2421,7 +2421,7 @@ add_session_tracker_entry_to_tree(tvbuff_t *tvb, packet_info *pinfo, proto_item proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_gtids_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_gtids, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_gtids, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; break; case 4: /* SESSION_TRACK_TRANSACTION_CHARACTERISTICS */ @@ -2429,7 +2429,7 @@ add_session_tracker_entry_to_tree(tvbuff_t *tvb, packet_info *pinfo, proto_item proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_transaction_characteristics_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_transaction_characteristics, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_transaction_characteristics, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; break; case 5: /* SESSION_TRACK_TRANSACTION_STATE */ @@ -2437,7 +2437,7 @@ add_session_tracker_entry_to_tree(tvbuff_t *tvb, packet_info *pinfo, proto_item proto_tree_add_uint64(session_track_tree, hf_mysql_session_track_transaction_state_length, tvb, offset, lenfle, lenstr); offset += lenfle; - proto_tree_add_item(session_track_tree, hf_mysql_session_track_transaction_state, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(session_track_tree, hf_mysql_session_track_transaction_state, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; break; default: /* unsupported types skipped */ @@ -2493,7 +2493,7 @@ mysql_dissect_ok_packet(tvbuff_t *tvb, packet_info *pinfo, int offset, offset += tvb_get_fle(tvb, tree, offset, &lenstr, NULL); /* first read the optional message */ if (lenstr) { - proto_tree_add_item(tree, hf_mysql_message, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_message, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; } @@ -2516,7 +2516,7 @@ mysql_dissect_ok_packet(tvbuff_t *tvb, packet_info *pinfo, int offset, /* optional: message string */ if (tvb_reported_length_remaining(tvb, offset) > 0) { lenstr = tvb_reported_length_remaining(tvb, offset); - proto_tree_add_item(tree, hf_mysql_message, tvb, offset, (gint)lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_message, tvb, offset, (gint)lenstr, ENC_ASCII); offset += (int)lenstr; } } @@ -2771,7 +2771,7 @@ mysql_dissect_auth_switch_request(tvbuff_t *tvb, packet_info *pinfo, int offset, /* name */ lenstr = my_tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_mysql_auth_switch_request_name, tvb, offset, lenstr, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_mysql_auth_switch_request_name, tvb, offset, lenstr, ENC_ASCII); offset += lenstr; /* Data */ diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index e92b308a54..3b7005fd5d 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -212,7 +212,7 @@ stock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offse { char *stock_p = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 6, ENC_ASCII); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_stock, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_stock, tvb, offset, 6, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, "<%s> ", stock_p); return offset + 6; @@ -229,7 +229,7 @@ order(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offse value = tvb_get_guint8(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, "%c ", value); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_buy_sell, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_buy_sell, tvb, offset, 1, ENC_ASCII); offset += 1; offset = number_of_shares(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_shares, offset, big); @@ -248,7 +248,7 @@ executed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int of offset = number_of_shares(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_executed, offset, big); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII); offset += 9; return offset; } @@ -324,7 +324,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d offset += 1; proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_financial_status, tvb, offset, 1, ENC_ASCII|ENC_NA); offset += 1; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lot_size, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lot_size, tvb, offset, 6, ENC_ASCII); offset += 6; proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lots_only, tvb, offset, 1, ENC_ASCII|ENC_NA); /*offset += 1;*/ @@ -333,11 +333,11 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case 'H': /* Stock trading action */ offset = stock(tvb, pinfo, nasdaq_itch_tree, offset); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_trading_state, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_trading_state, tvb, offset, 1, ENC_ASCII); offset += 1; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reserved, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reserved, tvb, offset, 1, ENC_ASCII); offset += 1; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reason, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reason, tvb, offset, 4, ENC_ASCII); /*offset += 4;*/ break; @@ -347,14 +347,14 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case 'A': /* Add order, no MPID */ offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big); if (version == 2) { - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII); /*offset += 1;*/ } break; case 'F': /* Add order, MPID */ offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_attribution, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_attribution, tvb, offset, 4, ENC_ASCII); /*offset += 4;*/ break; @@ -367,7 +367,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case 'C' : /* Order executed with price */ offset = executed(tvb, pinfo, nasdaq_itch_tree, offset, big); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII); offset += 1; /*offset = */price(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_execution_price, offset, big); @@ -391,7 +391,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d /* FALL THROUGH */ case 'P' : /* Trade identifier */ offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII); /*offset += 9;*/ break; @@ -402,27 +402,27 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d offset = price(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_price, offset, big); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII); offset += 9; - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII); /*offset += 1;*/ break; case 'B' : /* Broken Trade */ - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII); /*offset += 9;*/ break; case 'I': /* NOII, FIXME */ offset = stock(tvb, pinfo, nasdaq_itch_tree, offset); - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII); /*offset += 1;*/ break; default: /* unknown */ - proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, ENC_ASCII); /*offset += 5-1;*/ break; } diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index c53b44472f..961dfc6bbf 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -74,14 +74,14 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent switch (nasdaq_soup_type) { case '+': /* debug msg */ - proto_tree_add_item(tree, hf_nasdaq_soup_text, tvb, offset, linelen -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_text, tvb, offset, linelen -1, ENC_ASCII); offset += linelen -1; break; case 'A': /* login accept */ - proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII); offset += 10; - proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII); offset += 10; break; case 'J': /* login reject */ @@ -94,22 +94,22 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent if (linelen > 1 && nasdaq_itch_handle) { new_tvb = tvb_new_subset_length(tvb, offset,linelen -1); } else { - proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII); } offset += linelen -1; break; case 'L': /* login request */ - proto_tree_add_item(tree, hf_nasdaq_soup_username, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_username, tvb, offset, 6, ENC_ASCII); offset += 6; - proto_tree_add_item(tree, hf_nasdaq_soup_password, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_password, tvb, offset, 10, ENC_ASCII); offset += 10; - proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII); offset += 10; - proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII); offset += 10; break; @@ -120,12 +120,12 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent break; default: /* unknown */ - proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII); offset += linelen -1; break; } - proto_tree_add_item(tree, hf_nasdaq_soup_packet_eol, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nasdaq_soup_packet_eol, tvb, offset, 1, ENC_ASCII); if (new_tvb) { call_dissector(nasdaq_itch_handle, new_tvb, pinfo, parent_tree); } diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index f7c7eb9dbe..8c034ab422 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -989,7 +989,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, packet type field is the first two bytes of "Lip Echo Data" (with "Lip" not capitalized, and with "Echo Data" not followed by blanks) */ - proto_tree_add_item(ncp_tree, hf_lip_echo_magic, tvb, commhdr, 13, ENC_ASCII|ENC_NA); + proto_tree_add_item(ncp_tree, hf_lip_echo_magic, tvb, commhdr, 13, ENC_ASCII); break; case NCP_BURST_MODE_XFER: /* Packet Burst Packet */ @@ -1196,7 +1196,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case NCP_ALLOCATE_SLOT: /* Allocate Slot Request */ if (is_lip_echo_allocate_slot) { length_remaining = tvb_reported_length_remaining(tvb, commhdr + 4); - proto_tree_add_item(ncp_tree, hf_lip_echo_magic, tvb, commhdr + 4, LIP_ECHO_MAGIC_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(ncp_tree, hf_lip_echo_magic, tvb, commhdr + 4, LIP_ECHO_MAGIC_LEN, ENC_ASCII); if (length_remaining > LIP_ECHO_MAGIC_LEN) proto_tree_add_item(ncp_tree, hf_lip_echo_payload, tvb, commhdr+4+LIP_ECHO_MAGIC_LEN, length_remaining - LIP_ECHO_MAGIC_LEN, ENC_NA); } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 19b6e3d789..a06e5a5b54 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7783,12 +7783,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case 34002: /* cts_sgt_source_name */ ti = proto_tree_add_item(pdutree, hf_cflow_cts_sgt_source_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case 34003: /* cts_sgt_destination_name */ ti = proto_tree_add_item(pdutree, hf_cflow_cts_sgt_destination_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case 37000: /* packets_dropped */ @@ -8032,7 +8032,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case 40000: /* NF_F_USERNAME[_MAX] */ proto_tree_add_item(pdutree, hf_cflow_aaa_username, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; /* CACE Technologies */ @@ -8130,27 +8130,27 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_FASTIP << 16) | 0) : /* METER_VERSION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_version, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 1) : /* METER_OS_SYSNAME */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_sysname, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 2) : /* METER_OS_NODENAME */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_nodename, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 3) : /* METER_OS_RELASE */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_release, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 4) : /* METER_OS_VERSION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_version, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 5) : /* METER_OS_MACHINE */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_machine, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 6) : /* TCP_FLAGS */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_tcp_flags, @@ -8158,7 +8158,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_FASTIP << 16) | 23) : /* METER_OS_DISTRIBUTION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_meter_os_distribution, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 13) : /* EPOCH_SECOND */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_epoch_second, @@ -8166,7 +8166,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_FASTIP << 16) | 14) : /* NIC_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 15) : /* NIC_ID */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_id, @@ -8194,15 +8194,15 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, */ case ((VENDOR_FASTIP << 16) | 20) : /* NIC_DRIVER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_driver_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 21) : /* NIC_DRIVER_VERSION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_driver_version, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_FASTIP << 16) | 22) : /* NIC_FIRMWARE_VERSION */ ti = proto_tree_add_item(pdutree, hf_pie_fastip_nic_firmware_version, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; /* START NTOP */ @@ -8300,25 +8300,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 101): /* SRC_IP_COUNTRY */ case ((VENDOR_NTOP << 16) | 101): /* SRC_IP_COUNTRY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_country, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 102): /* SRC_IP_CITY */ case ((VENDOR_NTOP << 16) | 102): /* SRC_IP_CITY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_city, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 103): /* DST_IP_COUNTRY */ case ((VENDOR_NTOP << 16) | 103): /* DST_IP_COUNTRY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_country, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 104): /* DST_IP_CITY */ case ((VENDOR_NTOP << 16) | 104): /* DST_IP_CITY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_city, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 105): /* FLOW_PROTO_PORT */ @@ -8408,7 +8408,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 119): /* L7_PROTO_NAME */ case ((VENDOR_NTOP << 16) | 119): /* L7_PROTO_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_l7_proto_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 120): /* DOWNSTREAM_TUNNEL_ID */ @@ -8420,13 +8420,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 121): /* FLOW_USER_NAME */ case ((VENDOR_NTOP << 16) | 121): /* FLOW_USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_flow_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 122): /* FLOW_SERVER_NAME */ case ((VENDOR_NTOP << 16) | 122): /* FLOW_SERVER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_flow_server_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 123): /* CLIENT_NW_LATENCY_MS */ @@ -8450,7 +8450,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 126): /* PLUGIN_NAME */ case ((VENDOR_NTOP << 16) | 126): /* PLUGIN_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_plugin_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 127): /* RETRANSMITTED_IN_BYTES */ @@ -8468,25 +8468,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 130): /* SIP_CALL_ID */ case ((VENDOR_NTOP << 16) | 130): /* SIP_CALL_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_call_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 131): /* SIP_CALLING_PARTY */ case ((VENDOR_NTOP << 16) | 131): /* SIP_CALLING_PARTY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_calling_party, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 132): /* SIP_CALLED_PARTY */ case ((VENDOR_NTOP << 16) | 132): /* SIP_CALLED_PARTY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_called_party, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 133): /* SIP_RTP_CODECS */ case ((VENDOR_NTOP << 16) | 133): /* SIP_RTP_CODECS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_rtp_codecs, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 134): /* SIP_INVITE_TIME */ @@ -8663,13 +8663,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 169): /* SRC_PROC_NAME */ case ((VENDOR_NTOP << 16) | 169): /* SRC_PROC_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_proc_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 180): /* HTTP_URL */ case ((VENDOR_NTOP << 16) | 180): /* HTTP_URL */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_url, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 181): /* HTTP_RET_CODE */ @@ -8681,73 +8681,73 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 182): /* HTTP_REFERER */ case ((VENDOR_NTOP << 16) | 182): /* HTTP_REFERER */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_referer, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 183): /* HTTP_UA */ case ((VENDOR_NTOP << 16) | 183): /* HTTP_UA */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_ua, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 184): /* HTTP_MIME */ case ((VENDOR_NTOP << 16) | 184): /* HTTP_MIME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_mime, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 185): /* SMTP_MAIL_FROM */ case ((VENDOR_NTOP << 16) | 185): /* SMTP_MAIL_FROM */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_smtp_mail_from, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 186): /* SMTP_RCPT_TO */ case ((VENDOR_NTOP << 16) | 186): /* SMTP_RCPT_TO */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_smtp_rcpt_to, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 187): /* HTTP_HOST */ case ((VENDOR_NTOP << 16) | 187): /* HTTP_HOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_host, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 188): /* SSL_SERVER_NAME */ case ((VENDOR_NTOP << 16) | 188): /* SSL_SERVER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssl_server_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 189): /* BITTORRENT_HASH */ case ((VENDOR_NTOP << 16) | 189): /* BITTORRENT_HASH */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_bittorrent_hash, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 195): /* MYSQL_SRV_VERSION */ case ((VENDOR_NTOP << 16) | 195): /* MYSQL_SRV_VERSION */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_mysql_srv_version, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 196): /* MYSQL_USERNAME */ case ((VENDOR_NTOP << 16) | 196): /* MYSQL_USERNAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_mysql_username, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 197): /* MYSQL_DB */ case ((VENDOR_NTOP << 16) | 197): /* MYSQL_DB */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_mysql_db, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 198): /* MYSQL_QUERY */ case ((VENDOR_NTOP << 16) | 198): /* MYSQL_QUERY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_mysql_query, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 199): /* MYSQL_RESPONSE */ @@ -8759,13 +8759,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 200): /* ORACLE_USERNAME */ case ((VENDOR_NTOP << 16) | 200): /* ORACLE_USERNAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_oracle_username, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 201): /* ORACLE_QUERY */ case ((VENDOR_NTOP << 16) | 201): /* ORACLE_QUERY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_oracle_query, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 202): /* ORACLE_RSP_CODE */ @@ -8777,7 +8777,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 203): /* ORACLE_RSP_STRING */ case ((VENDOR_NTOP << 16) | 203): /* ORACLE_RSP_STRING */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_oracle_resp_string, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 204): /* ORACLE_QUERY_DURATION */ @@ -8789,7 +8789,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 205): /* DNS_QUERY */ case ((VENDOR_NTOP << 16) | 205): /* DNS_QUERY */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dns_query, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 206): /* DNS_QUERY_ID */ @@ -8819,7 +8819,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 210): /* POP_USER */ case ((VENDOR_NTOP << 16) | 210): /* POP_USER */ ti = proto_tree_add_item(pdutree, df_pie_ntop_pop_user, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 220): /* GTPV1_REQ_MSG_TYPE */ @@ -8867,25 +8867,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 227): /* GTPV1_END_USER_IMSI */ case ((VENDOR_NTOP << 16) | 227): /* GTPV1_END_USER_IMSI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv1_end_user_imsi, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 228): /* GTPV1_END_USER_MSISDN */ case ((VENDOR_NTOP << 16) | 228): /* GTPV1_END_USER_MSISDN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv1_end_user_msisdn, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 229): /* GTPV1_END_USER_IMEI */ case ((VENDOR_NTOP << 16) | 229): /* GTPV1_END_USER_IMEI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv1_end_user_imei, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 230): /* GTPV1_APN_NAME */ case ((VENDOR_NTOP << 16) | 230): /* GTPV1_APN_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv1_apn_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 231): /* GTPV1_RAI_MCC */ @@ -8939,19 +8939,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 242): /* RADIUS_USER_NAME */ case ((VENDOR_NTOP << 16) | 242): /* RADIUS_USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 243): /* RADIUS_CALLING_STATION_ID */ case ((VENDOR_NTOP << 16) | 243): /* RADIUS_CALLING_STATION_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_calling_station_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 244): /* RADIUS_CALLED_STATION_ID */ case ((VENDOR_NTOP << 16) | 244): /* RADIUS_CALLED_STATION_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_called_station_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 245): /* RADIUS_NAS_IP_ADDR */ @@ -8963,19 +8963,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 246): /* RADIUS_NAS_IDENTIFIER */ case ((VENDOR_NTOP << 16) | 246): /* RADIUS_NAS_IDENTIFIER */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_nas_identifier, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 247): /* RADIUS_USER_IMSI */ case ((VENDOR_NTOP << 16) | 247): /* RADIUS_USER_IMSI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_user_imsi, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 248): /* RADIUS_USER_IMEI */ case ((VENDOR_NTOP << 16) | 248): /* RADIUS_USER_IMEI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_user_imei, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 249): /* RADIUS_FRAMED_IP_ADDR */ @@ -8987,13 +8987,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 250): /* RADIUS_ACCT_SESSION_ID */ case ((VENDOR_NTOP << 16) | 250): /* RADIUS_ACCT_SESSION_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_acct_session_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 251): /* RADIUS_ACCT_STATUS_TYPE */ case ((VENDOR_NTOP << 16) | 251): /* RADIUS_ACCT_STATUS_TYPE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_radius_acct_status_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 252): /* RADIUS_ACCT_IN_OCTETS */ @@ -9023,7 +9023,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 260): /* IMAP_LOGIN */ case ((VENDOR_NTOP << 16) | 260): /* IMAP_LOGIN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_imap_login, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 270): /* GTPV2_REQ_MSG_TYPE */ @@ -9053,7 +9053,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 274): /* GTPV2_S2C_S1U_GTPU_TEID */ case ((VENDOR_NTOP << 16) | 274): /* GTPV2_S2C_S1U_GTPU_TEID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv2_s2c_s1u_gtpu_teid, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 275): /* GTPV2_S2C_S1U_GTPU_IP */ @@ -9065,19 +9065,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 276): /* GTPV2_END_USER_IMSI */ case ((VENDOR_NTOP << 16) | 276): /* GTPV2_END_USER_IMSI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv2_end_user_imsi, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 277): /* GTPV2_END_USER_MSISDN */ case ((VENDOR_NTOP << 16) | 277): /* GTPV2_END_USER_MSISDN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv2_and_user_msisdn, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 278): /* GTPV2_APN_NAME */ case ((VENDOR_NTOP << 16) | 278): /* GTPV2_APN_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv2_apn_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 279): /* GTPV2_ULI_MCC */ @@ -9119,7 +9119,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 285): /* GTPV2_END_USER_IMEI */ case ((VENDOR_NTOP << 16) | 285): /* GTPV2_END_USER_IMEI */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv2_end_user_imei, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 290): /* SRC_AS_PATH_1 */ @@ -9275,13 +9275,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 325): /* GTPV0_END_USER_MSISDN */ case ((VENDOR_NTOP << 16) | 325): /* GTPV0_END_USER_MSISDN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv0_end_user_msisdn, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 326): /* GTPV0_APN_NAME */ case ((VENDOR_NTOP << 16) | 326): /* GTPV0_APN_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gtpv0_apn_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 327): /* GTPV0_RAI_MCC */ @@ -9413,25 +9413,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 348): /* RTP_SIP_CALL_ID */ case ((VENDOR_NTOP << 16) | 348): /* RTP_SIP_CALL_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_sip_call_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 349): /* IN_SRC_OSI_SAP */ case ((VENDOR_NTOP << 16) | 349): /* IN_SRC_OSI_SAP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_in_src_osi_sap, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 350): /* OUT_DST_OSI_SAP */ case ((VENDOR_NTOP << 16) | 350): /* OUT_DST_OSI_SAP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_out_dst_osi_sap, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 351): /* WHOIS_DAS_DOMAIN */ case ((VENDOR_NTOP << 16) | 351): /* WHOIS_DAS_DOMAIN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_whois_das_domain, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 352): /* DNS_TTL_ANSWER */ @@ -9455,25 +9455,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 355): /* DHCP_CLIENT_NAME */ case ((VENDOR_NTOP << 16) | 355): /* DHCP_CLIENT_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dhcp_client_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 356): /* FTP_LOGIN */ case ((VENDOR_NTOP << 16) | 356): /* FTP_LOGIN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ftp_login, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 357): /* FTP_PASSWORD */ case ((VENDOR_NTOP << 16) | 357): /* FTP_PASSWORD */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ftp_password, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 358): /* FTP_COMMAND */ case ((VENDOR_NTOP << 16) | 358): /* FTP_COMMAND */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ftp_command, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 359): /* FTP_COMMAND_RET_CODE */ @@ -9485,25 +9485,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 360): /* HTTP_METHOD */ case ((VENDOR_NTOP << 16) | 360): /* HTTP_METHOD */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_method, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 361): /* HTTP_SITE */ case ((VENDOR_NTOP << 16) | 361): /* HTTP_SITE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_site, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 362): /* SIP_C_IP */ case ((VENDOR_NTOP << 16) | 362): /* SIP_C_IP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_c_ip, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 363): /* SIP_CALL_STATE */ case ((VENDOR_NTOP << 16) | 363): /* SIP_CALL_STATE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_sip_call_state, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 370): /* RTP_IN_MOS */ @@ -9521,7 +9521,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 372): /* SRC_PROC_USER_NAME */ case ((VENDOR_NTOP << 16) | 372): /* SRC_PROC_USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_proc_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 373): /* SRC_FATHER_PROC_PID */ @@ -9533,7 +9533,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 374): /* SRC_FATHER_PROC_NAME */ case ((VENDOR_NTOP << 16) | 374): /* SRC_FATHER_PROC_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_father_proc_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 375): /* DST_PROC_PID */ @@ -9545,13 +9545,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 376): /* DST_PROC_NAME */ case ((VENDOR_NTOP << 16) | 376): /* DST_PROC_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_proc_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 377): /* DST_PROC_USER_NAME */ case ((VENDOR_NTOP << 16) | 377): /* DST_PROC_USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_proc_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 378): /* DST_FATHER_PROC_PID */ @@ -9563,7 +9563,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 379): /* DST_FATHER_PROC_NAME */ case ((VENDOR_NTOP << 16) | 379): /* DST_FATHER_PROC_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_father_proc_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 380): /* RTP_RTT */ @@ -9659,7 +9659,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 395): /* RTP_DTMF_TONES */ case ((VENDOR_NTOP << 16) | 395): /* RTP_DTMF_TONES */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_rtp_dtmf_tones, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 396): /* UNTUNNELED_IPV6_SRC_ADDR */ @@ -9677,7 +9677,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 398): /* DNS_RESPONSE */ case ((VENDOR_NTOP << 16) | 398): /* DNS_RESPONSE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dns_response, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 399): /* DIAMETER_REQ_MSG_TYPE */ @@ -9695,19 +9695,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 401): /* DIAMETER_REQ_ORIGIN_HOST */ case ((VENDOR_NTOP << 16) | 401): /* DIAMETER_REQ_ORIGIN_HOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_diameter_req_origin_host, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 402): /* DIAMETER_RSP_ORIGIN_HOST */ case ((VENDOR_NTOP << 16) | 402): /* DIAMETER_RSP_ORIGIN_HOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_diameter_rsp_origin_host, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 403): /* DIAMETER_REQ_USER_NAME */ case ((VENDOR_NTOP << 16) | 403): /* DIAMETER_REQ_USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_diameter_req_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 404): /* DIAMETER_RSP_RESULT_CODE */ @@ -9827,13 +9827,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 423): /* DHCP_REMOTE_ID */ case ((VENDOR_NTOP << 16) | 423): /* DHCP_REMOTE_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dhcp_remote_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 424): /* DHCP_SUBSCRIBER_ID */ case ((VENDOR_NTOP << 16) | 424): /* DHCP_SUBSCRIBER_ID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dhcp_subscriber_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 425): /* SRC_PROC_UID */ @@ -9851,19 +9851,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 427): /* APPLICATION_NAME */ case ((VENDOR_NTOP << 16) | 427): /* APPLICATION_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_application_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 428): /* USER_NAME */ case ((VENDOR_NTOP << 16) | 428): /* USER_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_user_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 429): /* DHCP_MESSAGE_TYPE */ case ((VENDOR_NTOP << 16) | 429): /* DHCP_MESSAGE_TYPE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dhcp_message_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 430): /* RTP_IN_PKT_DROP */ @@ -9899,7 +9899,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 435): /* GTPV2_S5_S8_GTPC_TEID */ case ((VENDOR_NTOP << 16) | 435): /* GTPV2_S5_S8_GTPC_TEID */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_gptv2_s5_s8_gtpc_teid, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 436): /* RTP_R_FACTOR */ @@ -9947,13 +9947,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 443): /* SRC_AS_MAP */ case ((VENDOR_NTOP << 16) | 443): /* SRC_AS_MAP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_as_map, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 444): /* DST_AS_MAP */ case ((VENDOR_NTOP << 16) | 444): /* DST_AS_MAP */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_as_map, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 445): /* DIAMETER_HOP_BY_HOP_ID */ @@ -9977,25 +9977,25 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 448): /* SRC_IP_LONG */ case ((VENDOR_NTOP << 16) | 448): /* SRC_IP_LONG */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_long, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 449): /* SRC_IP_LAT */ case ((VENDOR_NTOP << 16) | 449): /* SRC_IP_LAT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_lat, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 450): /* DST_IP_LONG */ case ((VENDOR_NTOP << 16) | 450): /* DST_IP_LONG */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_long, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 451): /* DST_IP_LAT */ case ((VENDOR_NTOP << 16) | 451): /* DST_IP_LAT */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_lat, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 452): /* DIAMETER_CLR_CANCEL_TYPE */ @@ -10049,67 +10049,67 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case (NTOP_BASE + 460): /* HTTP_X_FORWARDED_FOR */ case ((VENDOR_NTOP << 16) | 460): /* HTTP_X_FORWARDED_FOR */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_x_forwarded_for, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 461): /* HTTP_VIA */ case ((VENDOR_NTOP << 16) | 461): /* HTTP_VIA */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_http_via, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 462): /* SSDP_HOST */ case ((VENDOR_NTOP << 16) | 462): /* SSDP_HOST */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssdp_host, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 463): /* SSDP_USN */ case ((VENDOR_NTOP << 16) | 463): /* SSDP_USN */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssdp_usn, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 464): /* NETBIOS_QUERY_NAME */ case ((VENDOR_NTOP << 16) | 464): /* NETBIOS_QUERY_NAME */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_netbios_query_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 465): /* NETBIOS_QUERY_TYPE */ case ((VENDOR_NTOP << 16) | 465): /* NETBIOS_QUERY_TYPE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_netbios_query_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 466): /* NETBIOS_RESPONSE */ case ((VENDOR_NTOP << 16) | 466): /* NETBIOS_RESPONSE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_netbios_response, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 467): /* NETBIOS_QUERY_OS */ case ((VENDOR_NTOP << 16) | 467): /* NETBIOS_QUERY_OS */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_netbios_query_os, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 468): /* SSDP_SERVER */ case ((VENDOR_NTOP << 16) | 468): /* SSDP_SERVER */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssdp_server, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 469): /* SSDP_TYPE */ case ((VENDOR_NTOP << 16) | 469): /* SSDP_TYPE */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssdp_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 470): /* SSDP_METHOD */ case ((VENDOR_NTOP << 16) | 470): /* SSDP_METHOD */ ti = proto_tree_add_item(pdutree, hf_pie_ntop_ssdp_method, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case (NTOP_BASE + 471): /* NPROBE_IPV4_ADDRESS */ @@ -10222,23 +10222,23 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_IXIA << 16) | 120): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_country_code, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 121): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_country_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 122): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_region_code, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 123): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_region_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 125): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_city_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 126): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_ip_latitude, @@ -10251,23 +10251,23 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_IXIA << 16) | 140): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_country_code, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 141): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_country_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 142): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_region_code, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 143): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_region_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 145): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_city_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 146): ti = proto_tree_add_item(pdutree, hf_pie_ixia_destination_ip_latitude, @@ -10283,7 +10283,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 161): ti = proto_tree_add_item(pdutree, hf_pie_ixia_os_device_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 162): ti = proto_tree_add_item(pdutree, hf_pie_ixia_browser_id, @@ -10291,7 +10291,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 163): ti = proto_tree_add_item(pdutree, hf_pie_ixia_browser_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 176): ti = proto_tree_add_item(pdutree, hf_pie_ixia_reverse_octet_delta_count, @@ -10303,11 +10303,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 178): ti = proto_tree_add_item(pdutree, hf_pie_ixia_conn_encryption_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 179): ti = proto_tree_add_item(pdutree, hf_pie_ixia_encryption_cipher, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 180): ti = proto_tree_add_item(pdutree, hf_pie_ixia_encryption_keylen, @@ -10315,31 +10315,31 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 181): ti = proto_tree_add_item(pdutree, hf_pie_ixia_imsi, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 182): ti = proto_tree_add_item(pdutree, hf_pie_ixia_user_agent, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 183): ti = proto_tree_add_item(pdutree, hf_pie_ixia_host_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 184): ti = proto_tree_add_item(pdutree, hf_pie_ixia_uri, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 185): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_txt, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 186): ti = proto_tree_add_item(pdutree, hf_pie_ixia_source_as_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 187): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dest_as_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 188): ti = proto_tree_add_item(pdutree, hf_pie_ixia_transaction_latency, @@ -10347,19 +10347,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 189): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_query_names, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 190): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_answer_names, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 191): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_classes, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 192): ti = proto_tree_add_item(pdutree, hf_pie_ixia_threat_type, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 193): ti = proto_tree_add_item(pdutree, hf_pie_ixia_threat_ipv4, @@ -10385,7 +10385,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 198): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 199): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_ipv4, @@ -10397,7 +10397,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 201): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_sni, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 202): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dhcp_client_id, @@ -10426,7 +10426,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 208): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dhcp_servername, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 209): ti = proto_tree_add_item(pdutree, hf_pie_ixia_radius_events, @@ -10443,7 +10443,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 212): ti = proto_tree_add_item(pdutree, hf_pie_ixia_radius_username, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 213): ti = proto_tree_add_item(pdutree, hf_pie_ixia_radius_nas_ipv4, @@ -10471,27 +10471,27 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 219): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_connection, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 220): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_accept, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 221): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_accept_language, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 222): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_accept_encoding, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 223): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_reason, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 224): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_server, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 225): ti = proto_tree_add_item(pdutree, hf_pie_ixia_radius_calling_station_id, @@ -10503,11 +10503,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 227): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_referer, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 228): ti = proto_tree_add_item(pdutree, hf_pie_ixia_http_useragent_cpu, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 229): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_messages, @@ -10516,35 +10516,35 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 230): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 231): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_date, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 232): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_subject, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 233): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_to, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 234): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_from, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 235): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_cc, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 236): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_bcc, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 237): ti = proto_tree_add_item(pdutree, hf_pie_ixia_email_msg_attachments, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 238): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert, @@ -10558,11 +10558,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 240): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_issuer_attr, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 241): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_issuer_val, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 242): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_subject, @@ -10571,31 +10571,31 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 243): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_subject_attr, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 244): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_subject_val, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 245): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_vld_nt_bfr, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 246): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_vld_nt_aftr, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 247): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_srl_num, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 248): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_sign_algo, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 249): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_subj_pki_algo, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 250): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_altnames, @@ -10604,11 +10604,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 251): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_altnames_attr, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 252): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tls_srvr_cert_altnames_val, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 253): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_packets, @@ -10637,7 +10637,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 259): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_raw_rdata, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 260): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_response_type, @@ -10645,7 +10645,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 261): ti = proto_tree_add_item(pdutree, hf_pie_ixia_radius_framed_ip, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 262): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_qdcount, @@ -10694,7 +10694,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 273): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_query_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 274): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_section_type, @@ -10706,19 +10706,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_IXIA << 16) | 276): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_canonical_name, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 277): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dns_mx_domain, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 278): ti = proto_tree_add_item(pdutree, hf_pie_ixia_dhcp_agent_circuit_id, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 279): ti = proto_tree_add_item(pdutree, hf_pie_ixia_ja3_fingerprint_string, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_IXIA << 16) | 280): ti = proto_tree_add_item(pdutree, hf_pie_ixia_tcp_conn_setup_time, @@ -11659,7 +11659,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, break; case ((VENDOR_CISCO << 16) | 12235): cti = proto_tree_add_item(pdutree, hf_pie_cisco_application_http_host, - tvb, offset + 6 , length - 6, ENC_ASCII|ENC_NA); + tvb, offset + 6 , length - 6, ENC_ASCII); string_tree = proto_item_add_subtree(cti, ett_str_len); proto_tree_add_item(string_tree, hf_pie_cisco_application_http_host_app_id, tvb, offset, 4, ENC_NA); @@ -11731,7 +11731,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 106): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslservercompressionmethod, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 107): @@ -11866,7 +11866,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 210): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsbits, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 211): @@ -11936,7 +11936,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 224): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponserdata, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 225): @@ -12041,17 +12041,17 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 304): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiususername, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 305): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiuscallingstationid, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 306): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiuscalledstationid, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 307): @@ -12066,7 +12066,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 309): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiusnasidentifier, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 310): @@ -12081,12 +12081,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case ((VENDOR_NIAGARA_NETWORKS << 16) | 312): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiusacctsessionid, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 313): ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiusacctstatustype, - tvb, offset, length, ENC_ASCII|ENC_NA); + tvb, offset, length, ENC_ASCII); break; case ((VENDOR_NIAGARA_NETWORKS << 16) | 314): diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 2e545d4210..f9aeedd743 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -148,7 +148,7 @@ static gint dissect_netsync_cmd_error( tvbuff_t *tvb, gint offset, proto_tree * offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len, ENC_VARINT_PROTOBUF ); proto_tree_add_item(tree, hf_netsync_cmd_error_msg, tvb, - offset, (gint)len, ENC_ASCII|ENC_NA ); + offset, (gint)len, ENC_ASCII ); offset += (gint)len; return offset; @@ -166,7 +166,7 @@ static gint dissect_netsync_cmd_hello(tvbuff_t *tvb, gint offset, proto_tree *t offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len, ENC_VARINT_PROTOBUF ); proto_tree_add_item(tree, hf_netsync_cmd_hello_keyname, tvb, - offset, (gint)len, ENC_ASCII|ENC_NA ); + offset, (gint)len, ENC_ASCII ); offset += (gint)len; @@ -193,7 +193,7 @@ static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb, gint offset, proto_tre offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len, ENC_VARINT_PROTOBUF ); proto_tree_add_item(tree, hf_netsync_cmd_anonymous_collection, tvb, - offset, (gint)len, ENC_ASCII|ENC_NA ); + offset, (gint)len, ENC_ASCII ); offset += (gint)len; proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb, @@ -215,7 +215,7 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb, gint offset, proto_tree *tr offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len, ENC_VARINT_PROTOBUF ); proto_tree_add_item(tree, hf_netsync_cmd_auth_collection, tvb, - offset, (gint)len, ENC_ASCII|ENC_NA ); + offset, (gint)len, ENC_ASCII ); offset += (gint)len; proto_tree_add_item(tree, hf_netsync_cmd_auth_id, tvb, diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 267dc2cfbf..acb3258b10 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -234,7 +234,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_checksum(nsrp_tree, tvb, offset, hf_nsrp_checksum, -1, NULL, pinfo, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NO_FLAGS); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII); } @@ -284,7 +284,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_checksum(nsrp_tree, tvb, offset, hf_nsrp_authchecksum, -1, NULL, pinfo, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NO_FLAGS); offset += 2; - proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII); } @@ -329,7 +329,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII); } diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index c953576b94..da91349e4e 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -511,11 +511,11 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case NSPR_HEADER_VERSION205: if(src_vmname_len){ - proto_tree_add_item(ns_tree,hf_ns_src_vm,tvb,pnstr->data_offset,src_vmname_len,ENC_ASCII|ENC_NA); + proto_tree_add_item(ns_tree,hf_ns_src_vm,tvb,pnstr->data_offset,src_vmname_len,ENC_ASCII); } if(dst_vmname_len){ - proto_tree_add_item(ns_tree,hf_ns_dst_vm,tvb,pnstr->data_offset+src_vmname_len,dst_vmname_len,ENC_ASCII|ENC_NA); + proto_tree_add_item(ns_tree,hf_ns_dst_vm,tvb,pnstr->data_offset+src_vmname_len,dst_vmname_len,ENC_ASCII); } /* fall through */ @@ -878,7 +878,7 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr case NSREC_INFO: subitem = proto_tree_add_item(ns_tree, hf_ns_inforec, tvb, offset, reclen, ENC_NA); subtree = proto_item_add_subtree(subitem, ett_ns_inforec); - proto_tree_add_item(subtree, hf_ns_inforec_info, tvb, offset+3, reclen-3, ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_ns_inforec_info, tvb, offset+3, reclen-3, ENC_ASCII); offset += reclen; cur_record = nextrec; @@ -908,9 +908,9 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr subitem = proto_tree_add_item(ns_tree, hf_ns_vmnamerec, tvb, offset, reclen, ENC_NA); subtree = proto_item_add_subtree(subitem, ett_ns_vmnamerec); proto_tree_add_item(subtree, hf_ns_vmnamerec_srcvmname, tvb, offset+5, - srcvmnamelen, ENC_ASCII|ENC_NA); + srcvmnamelen, ENC_ASCII); proto_tree_add_item(subtree, hf_ns_vmnamerec_dstvmname, tvb, offset+5+srcvmnamelen, - dstvmnamelen, ENC_ASCII|ENC_NA); + dstvmnamelen, ENC_ASCII); offset += reclen; cur_record = nextrec; diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 950279a7b4..3f097ad60b 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2400,7 +2400,7 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data TRY { /* NTLMSSP constant */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth, - tvb, offset, 8, ENC_ASCII|ENC_NA); + tvb, offset, 8, ENC_ASCII); offset += 8; /* NTLMSSP Message Type */ diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 55a33ed086..ce3016d53a 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -1557,23 +1557,23 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt } break; case NTPCTRL_OP_ASYNCMSG: - proto_tree_add_item(data_tree, hf_ntpctrl_trapmsg, tvb, data_offset, datalen, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_ntpctrl_trapmsg, tvb, data_offset, datalen, ENC_ASCII); break; case NTPCTRL_OP_CONFIGURE: case NTPCTRL_OP_SAVECONFIG: - proto_tree_add_item(data_tree, hf_ntpctrl_configuration, tvb, data_offset, datalen, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_ntpctrl_configuration, tvb, data_offset, datalen, ENC_ASCII); auth_diss = TRUE; break; case NTPCTRL_OP_READ_MRU: - proto_tree_add_item(data_tree, hf_ntpctrl_mru, tvb, data_offset, datalen, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_ntpctrl_mru, tvb, data_offset, datalen, ENC_ASCII); auth_diss = TRUE; break; case NTPCTRL_OP_READ_ORDLIST_A: - proto_tree_add_item(data_tree, hf_ntpctrl_ordlist, tvb, data_offset, datalen, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_ntpctrl_ordlist, tvb, data_offset, datalen, ENC_ASCII); auth_diss = TRUE; break; case NTPCTRL_OP_REQ_NONCE: - proto_tree_add_item(data_tree, hf_ntpctrl_nonce, tvb, data_offset, datalen, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_ntpctrl_nonce, tvb, data_offset, datalen, ENC_ASCII); auth_diss = TRUE; break; /* these opcodes doesn't carry any data: NTPCTRL_OP_SETTRAP, NTPCTRL_OP_UNSETTRAP, NTPCTRL_OP_UNSPEC */ @@ -2210,7 +2210,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt offset += 2; proto_tree_add_item(mode7_item_tree, hf_ntp_keyid, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_key_file, tvb, offset, 128, ENC_ASCII|ENC_NA); + proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_key_file, tvb, offset, 128, ENC_ASCII); offset += 128; proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_v6_flag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -2521,7 +2521,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt } proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_v6_flag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_int_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_int_name, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(mode7_item_tree, hf_ntppriv_mode7_int_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-nvme.c b/epan/dissectors/packet-nvme.c index 2be5ff25f5..a0f439b33f 100644 --- a/epan/dissectors/packet-nvme.c +++ b/epan/dissectors/packet-nvme.c @@ -1710,9 +1710,9 @@ static void dissect_nvme_identify_ctrl_resp(tvbuff_t *cmd_tvb, proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_vid, cmd_tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_ssvid, cmd_tvb, 2, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_sn, cmd_tvb, 4, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_sn, cmd_tvb, 4, 20, ENC_ASCII); - proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_mn, cmd_tvb, 24, 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_mn, cmd_tvb, 24, 40, ENC_ASCII); proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_fr, cmd_tvb, 64, 8, ENC_NA); proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_rab, cmd_tvb, 72, 1, ENC_LITTLE_ENDIAN); @@ -1811,7 +1811,7 @@ static void dissect_nvme_identify_ctrl_resp(tvbuff_t *cmd_tvb, proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_mnan, cmd_tvb, 540, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_rsvd4, cmd_tvb, 544, 224, ENC_NA); - proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_subnqn, cmd_tvb, 768, 256, ENC_ASCII|ENC_NA); + proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_subnqn, cmd_tvb, 768, 256, ENC_ASCII); proto_tree_add_item(cmd_tree, hf_nvme_identify_ctrl_rsvd5, cmd_tvb, 1024, 68, ENC_NA); dissect_nvme_identify_ctrl_resp_nvmeof(cmd_tvb, cmd_tree); @@ -1997,16 +1997,16 @@ static void dissect_nvme_get_logpage_ify_rcrd_resp(tvbuff_t *cmd_tvb, proto_tree proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_rsvd0, cmd_tvb, off-roff+10, 22, ENC_NA); if (roff <= 32 && (62-roff) <= len) - proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_trsvcid, cmd_tvb, off-roff+32, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_trsvcid, cmd_tvb, off-roff+32, 32, ENC_ASCII); if (roff <= 64 && (256-roff) <= len) proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_rsvd1, cmd_tvb, off-roff+64, 192, ENC_NA); if (roff <= 256 && (512-roff) <= len) - proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_subnqn, cmd_tvb, off-roff+256, 256, ENC_ASCII|ENC_NA); + proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_subnqn, cmd_tvb, off-roff+256, 256, ENC_ASCII); if (roff <= 512 && (768-roff) <= len) - proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_traddr, cmd_tvb, off-roff+512, 256, ENC_ASCII|ENC_NA); + proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_traddr, cmd_tvb, off-roff+512, 256, ENC_ASCII); if (roff <= 768 && (1024-roff) <= len) { ti = proto_tree_add_item(grp, hf_nvme_get_logpage_ify_rcrd_tsas, cmd_tvb, off-roff+768, 256, ENC_NA); diff --git a/epan/dissectors/packet-obd-ii.c b/epan/dissectors/packet-obd-ii.c index ba6509ccae..3ea826f38b 100644 --- a/epan/dissectors/packet-obd-ii.c +++ b/epan/dissectors/packet-obd-ii.c @@ -1259,7 +1259,7 @@ dissect_obdii_mode_09(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, oinfo->value_bytes, ENC_NA); break; case OBDII_MODE09_VIN02: - proto_tree_add_item(tree, hf_obdii_vin, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_obdii_vin, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII); break; case OBDII_MODE09_CALIBRATION_ID04: case OBDII_MODE09_CAL_VER_NUMBERS06: @@ -1267,7 +1267,7 @@ dissect_obdii_mode_09(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, oinfo->value_bytes, ENC_NA); break; case OBDII_MODE09_ECU_NAME0A: - proto_tree_add_item(tree, hf_obdii_ecu_name, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_obdii_ecu_name, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII); break; case OBDII_MODE09_PERFORMANCE_COMPRESSION0B: default: diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 4d874662c9..03cad2d062 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -1863,7 +1863,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, case 0x02: proto_tree_add_item(parameter_tree, hf_authentication_info_charset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(parameter_tree, hf_authentication_info, tvb, offset, sub_parameter_length - 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_authentication_info, tvb, offset, sub_parameter_length - 1, ENC_ASCII); offset += sub_parameter_length - 1; break; default: diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c index c0379a9807..a9c0111f28 100644 --- a/epan/dissectors/packet-ocfs2.c +++ b/epan/dissectors/packet-ocfs2.c @@ -492,7 +492,7 @@ static int dlm_name_handler(proto_tree *tree, tvbuff_t *tvb, guint offset, int n guint64 blkno; proto_item *ti; - ti = proto_tree_add_item(tree, hf_dlm_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(tree, hf_dlm_name, tvb, offset, namelen, ENC_ASCII); lock_type = tvb_get_guint8(tvb, offset); if (lock_type == 'N') { blkno = tvb_get_ntoh64(tvb, offset + OCFS2_DENTRY_LOCK_INO_START); @@ -574,7 +574,7 @@ static void dissect_dlm_migrate_lockres(proto_tree *tree, tvbuff_t *tvb, int off offset = dlm_cookie_handler(tree, tvb, offset, hf_dlm_mres_mig_cookie); /* lockname */ - proto_tree_add_item(tree, hf_dlm_name, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dlm_name, tvb, offset, 32, ENC_ASCII); offset += 32; /* lvb */ @@ -678,7 +678,7 @@ static void dissect_dlm_query_join_request(proto_tree *tree, tvbuff_t *tvb, int } /* domain */ - proto_tree_add_item(tree, hf_dlm_domain_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dlm_domain_name, tvb, offset, 64, ENC_ASCII); offset += 64; /* node_map */ @@ -720,7 +720,7 @@ static void dissect_dlm_query_region(proto_tree *tree, tvbuff_t *tvb, offset += 1; /* qr_domain */ - proto_tree_add_item(tree, hf_dlm_qr_domain, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dlm_qr_domain, tvb, offset, 64, ENC_ASCII); offset += 64; /* qr_regions */ @@ -748,7 +748,7 @@ static void dissect_dlm_query_nodeinfo(proto_tree *tree, tvbuff_t *tvb, guint of offset += 1; /* qn_domain */ - proto_tree_add_item(tree, hf_dlm_qn_domain, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dlm_qn_domain, tvb, offset, 64, ENC_ASCII); offset += 64; /* qn_nodes */ @@ -960,7 +960,7 @@ static int dissect_dlm_joined_msg(proto_tree *tree, tvbuff_t *tvb, int offset) proto_tree_add_item(tree, hf_dlm_domain_name_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_dlm_domain_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dlm_domain_name, tvb, offset, 64, ENC_ASCII); offset += 64; return offset; diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 0e500a6c93..37ddc41031 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -139,7 +139,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, ENC_ASCII); } diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 91601bb750..cdfb14a2b0 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -505,7 +505,7 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ "Not enough bytes for content of last nameservice entry"); return message_end; } - proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, ENC_ASCII); offset += 4 + 16 + ((length - 1) | 3) + 1; } return message_end; diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index 961585c9e4..5a7f9065cb 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -154,7 +154,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U while (msglength) { ptvcursor_add(cursor, hf_omapi_msg_name_len, 2, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_omapi_msg_name, msglength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_omapi_msg_name, msglength, ENC_ASCII); msglength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_omapi_msg_value_len, 4, ENC_BIG_ENDIAN); @@ -168,7 +168,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U } else { - ptvcursor_add(cursor, hf_omapi_msg_value, msglength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_omapi_msg_value, msglength, ENC_ASCII); } msglength = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor)); @@ -180,7 +180,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U while (objlength) { ptvcursor_add(cursor, hf_omapi_obj_name_len, 2, ENC_BIG_ENDIAN); - ptvcursor_add(cursor, hf_omapi_obj_name, objlength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_omapi_obj_name, objlength, ENC_ASCII); objlength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_omapi_obj_value_len, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index 0e63174769..f3192d1ddf 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1824,7 +1824,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(command_tree, hf_omron_protect_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+3),4,ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_last_word, tvb, (offset+7),4,ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,ENC_ASCII); offset = offset + 15; } } @@ -1985,9 +1985,9 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 94) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII|ENC_NA); - proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII|ENC_NA); - proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII); + proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII); + proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII); /* add area data sub tree */ area_data_tree = proto_tree_add_subtree(command_tree, tvb, (offset+82), 12, ett_area_data, NULL, "Area Data"); proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, ENC_BIG_ENDIAN); @@ -2021,7 +2021,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+28), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+30), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+32), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+34), 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+34), 32, ENC_ASCII); /* Remote IO Data tree */ io_data_tree = proto_tree_add_subtree(command_tree, tvb, (offset+66), 2, ett_io_data, NULL, "Remote I/O data"); proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+66), 1, ENC_BIG_ENDIAN); @@ -2035,9 +2035,9 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t else if(reported_length_remaining == 161) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII|ENC_NA); - proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII|ENC_NA); - proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII); + proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII); + proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII); /* add area data sub tree */ area_data_tree = proto_tree_add_subtree(command_tree, tvb, (offset+82), 12, ett_area_data, NULL, "Area Data"); proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, ENC_BIG_ENDIAN); @@ -2066,7 +2066,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+120), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+122), 2, ENC_BIG_ENDIAN); proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+124), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+126), 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+126), 32, ENC_ASCII); /* Remote IO Data tree */ io_data_tree = proto_tree_add_subtree(command_tree, tvb, (offset+158), 2, ett_io_data, NULL, "Remote I/O data"); proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+158), 1, ENC_BIG_ENDIAN); @@ -2108,7 +2108,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t while(reported_length_remaining >= 21) { proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_model_number, tvb, offset+1, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_model_number, tvb, offset+1, 20, ENC_ASCII); offset = offset + 21; reported_length_remaining = reported_length_remaining - 21; } @@ -2139,7 +2139,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t ett_message_fields, message_fields, ENC_BIG_ENDIAN); /* Add rest of fields */ proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+10), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+12), 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+12), 16, ENC_ASCII); offset = offset + 28; } } @@ -2569,7 +2569,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+2), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+4), 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+4), 16, ENC_ASCII); offset = offset + 20; } else if(reported_length_remaining >= 4) @@ -2584,7 +2584,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t while (reported_length_remaining >= 32) { - proto_tree_add_item(command_tree, hf_omron_read_message, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_read_message, tvb, offset, 32, ENC_ASCII); offset = offset + 32; reported_length_remaining = reported_length_remaining - 32; } @@ -2772,7 +2772,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); omron_disk_data_tree = proto_tree_add_subtree(command_tree, tvb, (offset+2), 26, ett_omron_disk_data, NULL, "Disk data"); - proto_tree_add_item(omron_disk_data_tree, hf_omron_volume_label, tvb, (offset+2), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(omron_disk_data_tree, hf_omron_volume_label, tvb, (offset+2), 12, ENC_ASCII); omron_byte = tvb_get_guint8(tvb, (offset+14)); proto_tree_add_uint_format_value(omron_disk_data_tree, hf_omron_date_year, tvb, (offset+14), 1, omron_byte, @@ -2799,7 +2799,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t { omron_file_data_tree = proto_tree_add_subtree(command_tree, tvb, offset, 20, ett_omron_file_data, NULL, "File data"); - proto_tree_add_item(omron_file_data_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(omron_file_data_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII); omron_byte = tvb_get_guint8(tvb, (offset+12)); proto_tree_add_uint_format_value(omron_file_data_tree, hf_omron_date_year, tvb, (offset+12), 1, omron_byte, @@ -2831,7 +2831,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 20) { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII); proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+14), 4, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+18), 2, ENC_BIG_ENDIAN); offset = offset + 20; @@ -2865,7 +2865,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_file_parameter_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+4), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+4), 12, ENC_ASCII); proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+16), 4, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+20), 2, ENC_BIG_ENDIAN); if(reported_length_remaining > 22) @@ -2921,7 +2921,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t while(reported_length_remaining >= 12) { - proto_tree_add_item(command_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII); offset = offset + 12; reported_length_remaining = reported_length_remaining - 12; } @@ -2951,7 +2951,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 16) { - proto_tree_add_item(command_tree, hf_omron_volume_label, tvb, (offset+4), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_volume_label, tvb, (offset+4), 12, ENC_ASCII); offset = offset + 12; } offset = offset + 4; @@ -2976,9 +2976,9 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 28) { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII); proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+14), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+16), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+16), 12, ENC_ASCII); offset = offset + 28; } } @@ -3001,8 +3001,8 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 26) { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII); offset = offset + 26; } } @@ -3025,7 +3025,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if(reported_length_remaining == 14) { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII); offset = offset + 14; } } @@ -3052,7 +3052,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+6), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII); offset = offset + 22; } } @@ -3080,7 +3080,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+4), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII); offset = offset + 22; } } @@ -3108,7 +3108,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+8), 4, ENC_BIG_ENDIAN); proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+12), 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII); offset = offset + 26; } } @@ -3297,7 +3297,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t { if((reported_length_remaining > 0) && (reported_length_remaining <= 8)) { - proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII); offset = offset + reported_length_remaining; } } @@ -3337,7 +3337,7 @@ dissect_omron_fins_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *omron_t if((reported_length_remaining > 2) && (reported_length_remaining <= (2+8))) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII); offset = offset + reported_length_remaining; } } diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index df5417815d..5c7c719717 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -423,7 +423,7 @@ dissect_openflow_phy_port(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset+=2; proto_tree_add_item(tree, hf_openflow_hw_addr, tvb, offset, 6, ENC_NA); offset+=6; - proto_tree_add_item(tree, hf_openflow_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_PORT_NAME_LEN; /* Bitmap of OFPPC_* flags. */ diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index 1efa748cdf..5bbdfd5bfc 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -2157,7 +2157,7 @@ dissect_openflow_port_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree offset+=2; /* char name[OFP_MAX_PORT_NAME_LEN]; Null-terminated */ - proto_tree_add_item(port_tree, hf_openflow_v4_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_openflow_v4_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_PORT_NAME_LEN; /* uint32_t config; */ @@ -3007,7 +3007,7 @@ dissect_openflow_table_features_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ offset+=5; /* char name[OFP_MAX_TABLE_NAME_LEN]; */ - proto_tree_add_item(feat_tree, hf_openflow_v4_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(feat_tree, hf_openflow_v4_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_TABLE_NAME_LEN; /* uint64_t metadata_match; */ @@ -3241,23 +3241,23 @@ static void dissect_openflow_switch_description_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_) { /* char mfr_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char hw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char sw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char serial_num[SERIAL_NUM_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII); offset+=SERIAL_NUM_LEN; /* char dp_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v4_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v4_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); /*offset+=DESC_STR_LEN;*/ } diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 8769cf2386..5a959220a6 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -2697,7 +2697,7 @@ dissect_openflow_port_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree offset+=2; /* char name[OFP_MAX_PORT_NAME_LEN]; Null-terminated */ - proto_tree_add_item(port_tree, hf_openflow_v5_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_openflow_v5_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_PORT_NAME_LEN; /* uint32_t config; */ @@ -3717,7 +3717,7 @@ dissect_openflow_table_features_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ offset+=5; /* char name[OFP_MAX_TABLE_NAME_LEN]; */ - proto_tree_add_item(feat_tree, hf_openflow_v5_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(feat_tree, hf_openflow_v5_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_TABLE_NAME_LEN; /* uint64_t metadata_match; */ @@ -4043,23 +4043,23 @@ static void dissect_openflow_switch_description_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_) { /* char mfr_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char hw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char sw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char serial_num[SERIAL_NUM_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII); offset+=SERIAL_NUM_LEN; /* char dp_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v5_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v5_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); /*offset+=DESC_STR_LEN;*/ } diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c index abff32a7c4..aab8829fbc 100644 --- a/epan/dissectors/packet-openflow_v6.c +++ b/epan/dissectors/packet-openflow_v6.c @@ -2956,7 +2956,7 @@ dissect_openflow_port_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree offset+=2; /* char name[OFP_MAX_PORT_NAME_LEN]; Null-terminated */ - proto_tree_add_item(port_tree, hf_openflow_v6_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(port_tree, hf_openflow_v6_port_name, tvb, offset, OFP_MAX_PORT_NAME_LEN, ENC_ASCII); proto_item_append_text(port_tree, " (%s)", tvb_get_string_enc(pinfo->pool, tvb, offset, OFP_ETH_ALEN, ENC_ASCII)); offset+=OFP_MAX_PORT_NAME_LEN; @@ -4020,7 +4020,7 @@ dissect_openflow_table_features_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ offset+=5; /* char name[OFP_MAX_TABLE_NAME_LEN]; */ - proto_tree_add_item(feat_tree, hf_openflow_v6_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(feat_tree, hf_openflow_v6_table_features_name, tvb, offset, OFP_MAX_TABLE_NAME_LEN, ENC_ASCII); offset+=OFP_MAX_TABLE_NAME_LEN; /* uint64_t metadata_match; */ @@ -4481,23 +4481,23 @@ static void dissect_openflow_switch_description_v6(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 length _U_) { /* char mfr_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v6_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_switch_description_mfr_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char hw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v6_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_switch_description_hw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char sw_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v6_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_switch_description_sw_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); offset+=DESC_STR_LEN; /* char serial_num[SERIAL_NUM_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v6_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_switch_description_serial_num, tvb, offset, SERIAL_NUM_LEN, ENC_ASCII); offset+=SERIAL_NUM_LEN; /* char dp_desc[DESC_STR_LEN]; */ - proto_tree_add_item(tree, hf_openflow_v6_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII); /*offset+=DESC_STR_LEN;*/ } @@ -5675,7 +5675,7 @@ dissect_openflow_controller_status_prop_v6(tvbuff_t *tvb, packet_info *pinfo _U_ switch (prop_type) { case OFPCSPT_URI: /* uint8_t uri[0]; */ - proto_tree_add_item(tree, hf_openflow_v6_controller_status_prop_uri, tvb, offset, prop_length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openflow_v6_controller_status_prop_uri, tvb, offset, prop_length - 4, ENC_ASCII); offset += body_end; break; case OFPCSPT_EXPERIMENTER: diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index 11ae0eaef1..3909144dd8 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -1085,7 +1085,7 @@ dissect_openwire_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in { if (tvb_reported_length_remaining(tvb, offset) >= 17) { - proto_tree_add_item(tree, hf_openwire_wireformatinfo_magic, tvb, offset + 0, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_openwire_wireformatinfo_magic, tvb, offset + 0, 8, ENC_ASCII); proto_tree_add_item(tree, hf_openwire_wireformatinfo_version, tvb, offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_openwire_wireformatinfo_data, tvb, offset + 12, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_openwire_wireformatinfo_length, tvb, offset + 13, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 6d046198c8..a39e38b302 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1511,7 +1511,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ break; case OSPF_AUTH_SIMPLE: - proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_data_simple, tvb, 16, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(ospf_header_tree, hf_ospf_header_auth_data_simple, tvb, 16, 8, ENC_ASCII); break; case OSPF_AUTH_CRYPT: @@ -2954,7 +2954,7 @@ dissect_ospf_lsa_opaque_ri(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_ proto_tree_add_item(tlv_tree, hf_ospf_tlv_length, tvb, offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_tree, hf_ospf_dyn_hostname, tvb, offset+4, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ospf_dyn_hostname, tvb, offset+4, tlv_length, ENC_ASCII); break; case OPAQUE_TLV_SA:{ diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index 7c552ab1f8..3b1cf0c1e8 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -475,7 +475,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -493,7 +493,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 8; proto_tree_add_item(ouch_tree, @@ -511,7 +511,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 4; proto_tree_add_item(ouch_tree, @@ -562,7 +562,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -580,7 +580,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 8; proto_tree_add_item(ouch_tree, @@ -598,7 +598,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 4; proto_tree_add_item(ouch_tree, @@ -656,13 +656,13 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_existing_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, hf_ouch_replacement_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -706,7 +706,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -720,7 +720,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -758,7 +758,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_replacement_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -776,7 +776,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 8; proto_tree_add_item(ouch_tree, @@ -794,7 +794,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 4; proto_tree_add_item(ouch_tree, @@ -842,7 +842,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_previous_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; if (reported_len >= 80) { /* Added in 4.2 */ @@ -863,7 +863,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -888,7 +888,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -931,7 +931,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -968,7 +968,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -993,7 +993,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -1036,7 +1036,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -1085,7 +1085,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -1116,7 +1116,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -1135,7 +1135,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; break; @@ -1148,7 +1148,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; break; @@ -1161,7 +1161,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, @@ -1192,7 +1192,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 14; proto_tree_add_item(ouch_tree, diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c index ab65bc7fbb..a4cead14ac 100644 --- a/epan/dissectors/packet-packetlogger.c +++ b/epan/dissectors/packet-packetlogger.c @@ -103,23 +103,23 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; len = tvb_strsize (tvb, offset); - proto_tree_add_item (sub_tree, hf_syslog_process, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (sub_tree, hf_syslog_process, tvb, offset, len, ENC_ASCII); offset += len; len = tvb_strsize (tvb, offset); - proto_tree_add_item (sub_tree, hf_syslog_sender, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (sub_tree, hf_syslog_sender, tvb, offset, len, ENC_ASCII); offset += len; len = tvb_strsize (tvb, offset); - proto_tree_add_item (sub_tree, hf_syslog_subsystem, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (sub_tree, hf_syslog_subsystem, tvb, offset, len, ENC_ASCII); offset += len; len = tvb_strsize (tvb, offset); - proto_tree_add_item (sub_tree, hf_syslog_category, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (sub_tree, hf_syslog_category, tvb, offset, len, ENC_ASCII); offset += len; len = tvb_strsize (tvb, offset); - proto_tree_add_item (sub_tree, hf_syslog_message, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (sub_tree, hf_syslog_message, tvb, offset, len, ENC_ASCII); col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (pinfo->pool, tvb, offset, len)); } @@ -199,7 +199,7 @@ static int dissect_packetlogger(tvbuff_t *tvb, packet_info *pinfo, case PKT_NOTE: case PKT_CONFIG: case PKT_NEW_CONTROLLER: - proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_ASCII); col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (pinfo->pool, next_tvb, 0, len)); break; default: diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 5b62cdea57..b43d2ce86c 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -1625,7 +1625,7 @@ dissect_pcep_tlvs_with_scope(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gi break; case 17: /* SYMBOLIC-PATH-NAME TLV */ - proto_tree_add_item(tlv, hf_pcep_symbolic_path_name, tvb, offset+4+j, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv, hf_pcep_symbolic_path_name, tvb, offset+4+j, tlv_length, ENC_ASCII); break; case 18: /* IPV4-LSP-IDENTIFIERS TLV */ @@ -1649,7 +1649,7 @@ dissect_pcep_tlvs_with_scope(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gi break; case 21: /* RSVP-ERROR-SPEC TLV */ - proto_tree_add_item(tlv, hf_pcep_rsvp_user_error_spec, tvb, offset+4+j, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv, hf_pcep_rsvp_user_error_spec, tvb, offset+4+j, tlv_length, ENC_ASCII); break; case 23: /* LSP-DB-VERSION TLV */ @@ -1657,7 +1657,7 @@ dissect_pcep_tlvs_with_scope(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gi break; case 24: /* SPEAKER-ENTITY-ID TLV */ - proto_tree_add_item(tlv, hf_pcep_speaker_entity_id, tvb, offset+4+j, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv, hf_pcep_speaker_entity_id, tvb, offset+4+j, tlv_length, ENC_ASCII); break; case 26: /* SR-PCE-CAPABILITY TLV Deprecated */ @@ -1744,7 +1744,7 @@ dissect_pcep_tlvs_with_scope(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gi break; case 56: /* SRPOLICY-POL-NAME */ - proto_tree_add_item(tlv, hf_pcep_sr_policy_name, tvb, offset+4+j, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv, hf_pcep_sr_policy_name, tvb, offset+4+j, tlv_length, ENC_ASCII); break; case 57: /* SRPOLICY-CPATH-ID */ @@ -1755,7 +1755,7 @@ dissect_pcep_tlvs_with_scope(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gi break; case 58: /* SRPOLICY-CPATH-NAME */ - proto_tree_add_item(tlv, hf_pcep_sr_policy_cpath_name, tvb, offset+4+j, tlv_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv, hf_pcep_sr_policy_cpath_name, tvb, offset+4+j, tlv_length, ENC_ASCII); break; case 59: /* SRPOLICY-CPATH-PREFERENCE */ diff --git a/epan/dissectors/packet-pcomtcp.c b/epan/dissectors/packet-pcomtcp.c index 6243f02c6f..b658a0f365 100644 --- a/epan/dissectors/packet-pcomtcp.c +++ b/epan/dissectors/packet-pcomtcp.c @@ -283,11 +283,11 @@ dissect_pcomascii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pinfo->srcport == global_pcomtcp_tcp_port ){ // Reply proto_tree_add_item(pcomascii_tree, hf_pcomascii_stx, tvb, - offset, 2, ENC_ASCII|ENC_NA); // "/A" + offset, 2, ENC_ASCII); // "/A" offset += 2; }else{ proto_tree_add_item(pcomascii_tree, hf_pcomascii_stx, tvb, - offset, 1, ENC_ASCII|ENC_NA); // "/" + offset, 1, ENC_ASCII); // "/" offset += 1; } @@ -364,17 +364,17 @@ dissect_pcomascii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if(pinfo->destport == global_pcomtcp_tcp_port){ // request if(op_type == 1 || op_type == 2) { // read & write op proto_tree_add_item(pcomascii_tree, hf_pcomascii_address, - tvb, offset, 4, ENC_ASCII|ENC_NA); + tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(pcomascii_tree, hf_pcomascii_length, - tvb, offset, 2, ENC_ASCII|ENC_NA); + tvb, offset, 2, ENC_ASCII); offset += 2; } if(op_type == 2) { // write only nvalues = (tvb_reported_length(tvb)-3-offset) / op_size; for (i = 0; i < nvalues; i++) { proto_tree_add_item(pcomascii_tree, hf_pcomascii_address_value, - tvb, offset, op_size , ENC_ASCII|ENC_NA); + tvb, offset, op_size , ENC_ASCII); offset += op_size; } } @@ -383,7 +383,7 @@ dissect_pcomascii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, nvalues = (tvb_reported_length(tvb)-offset-3) / op_size; for (i = 0; i < nvalues; i++) { proto_tree_add_item(pcomascii_tree, hf_pcomascii_address_value, - tvb, offset, op_size , ENC_ASCII|ENC_NA); + tvb, offset, op_size , ENC_ASCII); offset += op_size; } } @@ -393,7 +393,7 @@ dissect_pcomascii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tvb_reported_length(tvb)-offset-3 > 0){ // remaining (variable) bytes between CC and checksum hf_pcomascii_command_item = proto_tree_add_item(pcomascii_tree, hf_pcomascii_command, tvb, - offset, tvb_reported_length(tvb)-offset-3, ENC_ASCII|ENC_NA); + offset, tvb_reported_length(tvb)-offset-3, ENC_ASCII); offset += (tvb_reported_length(tvb)-offset-3); //-3 from checksum and etx if(cc_len <= 0){ expert_add_info_format(pinfo, hf_pcomascii_command_item, @@ -405,7 +405,7 @@ dissect_pcomascii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pcomascii_tree, hf_pcomascii_etx, tvb, - offset, 1, ENC_ASCII|ENC_NA); + offset, 1, ENC_ASCII); return tvb_reported_length(tvb); } @@ -433,7 +433,7 @@ dissect_pcombinary(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pcombinary_tree = proto_item_add_subtree(ti, ett_pcombinary); proto_tree_add_item(pcombinary_tree, hf_pcombinary_stx, tvb, - offset, 6, ENC_ASCII|ENC_NA); + offset, 6, ENC_ASCII); offset += 6; if (pinfo->srcport == global_pcomtcp_tcp_port){ //these bytes are transposed @@ -508,7 +508,7 @@ dissect_pcombinary(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(pcombinary_tree, hf_pcombinary_etx, tvb, - offset, 1, ENC_ASCII|ENC_NA); + offset, 1, ENC_ASCII); return tvb_reported_length(tvb); } diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index 1895669fe0..3111e4b278 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -799,7 +799,7 @@ static int dissect_pcp_message_pmns_traverse(tvbuff_t *tvb, packet_info *pinfo, name_len = tvb_get_ntohl(tvb, offset); /* get the actual length out so we can use it in the next item */ offset += 4; /* name */ - proto_tree_add_item(pcp_pmns_traverse_tree, hf_pcp_pmns_name, tvb, offset, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pcp_pmns_traverse_tree, hf_pcp_pmns_name, tvb, offset, name_len, ENC_ASCII); offset += name_len; /* increment by whatever the length of the name string was */ /* "padding" (not really padding, just what is left over in the old buffer) */ @@ -891,7 +891,7 @@ static int dissect_pcp_message_pmns_names(tvbuff_t *tvb, packet_info *pinfo, pro add_candidate_name_for_pmid_resolution(pinfo, tvb, offset, name_len); } proto_tree_add_item(pcp_pmns_names_name_tree, hf_pcp_pmns_names_nametree_name, - tvb, offset, name_len, ENC_ASCII|ENC_NA); + tvb, offset, name_len, ENC_ASCII); offset += name_len; /* padding */ padding = name_len % 4; /* names are padded to the nearest 4 byte boundary */ @@ -935,7 +935,7 @@ static int dissect_pcp_message_pmns_child(tvbuff_t *tvb, packet_info *pinfo, pro offset += 4; /* name */ - proto_tree_add_item(pcp_pmns_child_tree, hf_pcp_pmns_name, tvb, offset, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pcp_pmns_child_tree, hf_pcp_pmns_name, tvb, offset, name_len, ENC_ASCII); offset += 4; return offset; } @@ -1229,7 +1229,7 @@ static int dissect_pcp_message_result(tvbuff_t *tvb, packet_info *pinfo, proto_t break; case PM_TYPE_STRING: proto_tree_add_item(pcp_result_instance_tree, hf_pcp_instance_value_ptr, tvb, - pmvalueblock_offset, pmvalueblock_value_length-4, ENC_ASCII|ENC_NA); + pmvalueblock_offset, pmvalueblock_value_length-4, ENC_ASCII); break; case PM_TYPE_AGGREGATE: case PM_TYPE_AGGREGATE_STATIC: @@ -1398,7 +1398,7 @@ static int dissect_pcp_message_instance_req(tvbuff_t *tvb, packet_info *pinfo, p /* name */ if (name_len > 0) { - proto_tree_add_item(pcp_instance_req_tree, hf_pcp_instance_name, tvb, offset, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pcp_instance_req_tree, hf_pcp_instance_name, tvb, offset, name_len, ENC_ASCII); offset += name_len; } return offset; @@ -1473,7 +1473,7 @@ static int dissect_pcp_message_text(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset += 4; /* buffer */ - proto_tree_add_item(pcp_text_tree, hf_pcp_text_buffer, tvb, offset, buflen, ENC_ASCII|ENC_NA); + proto_tree_add_item(pcp_text_tree, hf_pcp_text_buffer, tvb, offset, buflen, ENC_ASCII); offset += buflen; return offset; @@ -1616,7 +1616,7 @@ static int dissect_pcp_message_instance(tvbuff_t *tvb, packet_info *pinfo, proto /* name */ if (name_len > 0) { - proto_tree_add_item(pcp_instance_tree, hf_pcp_instance_name, tvb, offset, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pcp_instance_tree, hf_pcp_instance_name, tvb, offset, name_len, ENC_ASCII); offset += name_len; } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index ab0acb2cba..714d09c8ec 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -1144,7 +1144,7 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree proto_tree *configuration_tree; proto_item *configuration_ti = proto_tree_add_item(tree, hf_pdcp_lte_configuration, - tvb, 0, 0, ENC_ASCII|ENC_NA); + tvb, 0, 0, ENC_ASCII); configuration_tree = proto_item_add_subtree(configuration_ti, ett_pdcp_configuration); /* Direction */ diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c index 68e27f4269..7e333dbfe5 100644 --- a/epan/dissectors/packet-pdcp-nr.c +++ b/epan/dissectors/packet-pdcp-nr.c @@ -1153,7 +1153,7 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree proto_tree *configuration_tree; proto_item *configuration_ti = proto_tree_add_item(tree, hf_pdcp_nr_configuration, - tvb, 0, 0, ENC_ASCII|ENC_NA); + tvb, 0, 0, ENC_ASCII); configuration_tree = proto_item_add_subtree(configuration_ti, ett_pdcp_configuration); /* Direction */ diff --git a/epan/dissectors/packet-pfcp.c b/epan/dissectors/packet-pfcp.c index cbdc4bfdff..e4508797f3 100644 --- a/epan/dissectors/packet-pfcp.c +++ b/epan/dissectors/packet-pfcp.c @@ -2394,7 +2394,7 @@ dissect_pfcp_sdf_filter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro * The Flow Description field, when present, shall be encoded as an OctetString * as specified in subclause 5.4.2 of 3GPP TS 29.212 */ - proto_tree_add_item(flow_desc_tree, hf_pfcp_flow_desc, tvb, offset, fd_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(flow_desc_tree, hf_pfcp_flow_desc, tvb, offset, fd_length, ENC_ASCII); offset += fd_length; } if ((flags_val & 0x2) == 2) { @@ -3732,7 +3732,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (m+2) to p Flow Description */ - proto_tree_add_item(tree, hf_pfcp_flow_desc, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_flow_desc, tvb, offset, len, ENC_ASCII); offset += len; } @@ -3745,7 +3745,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (q+2) to r URL */ - proto_tree_add_item(tree, hf_pfcp_url, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_url, tvb, offset, len, ENC_ASCII); offset += len; } @@ -3759,7 +3759,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (s+2) to t Domain Name */ - proto_tree_add_item(tree, hf_pfcp_dn, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_dn, tvb, offset, len, ENC_ASCII); offset += len; } @@ -3789,7 +3789,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (w+2) to x Domain Name Protocol */ - proto_tree_add_item(tree, hf_pfcp_dnp, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_dnp, tvb, offset, len, ENC_ASCII); offset += len; } @@ -3814,7 +3814,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p dissected_len += 2; /* (y+4) to i Flow Description */ - proto_tree_add_item(afd_tree, hf_pfcp_flow_desc, tvb, offset+2, flow_desc_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(afd_tree, hf_pfcp_flow_desc, tvb, offset+2, flow_desc_len, ENC_ASCII); offset += flow_desc_len; dissected_len += flow_desc_len; } @@ -3840,7 +3840,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (a+4) to o URL */ - proto_tree_add_item(aurl_tree, hf_pfcp_url, tvb, offset, url_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(aurl_tree, hf_pfcp_url, tvb, offset, url_len, ENC_ASCII); dissected_len += url_len; offset += url_len; } @@ -3866,7 +3866,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (c+4) to pd Domain Name */ - proto_tree_add_item(adnp_tree, hf_pfcp_dn, tvb, offset, domain_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(adnp_tree, hf_pfcp_dn, tvb, offset, domain_name_len, ENC_ASCII); dissected_len += domain_name_len; offset += domain_name_len; @@ -3876,7 +3876,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p offset += 2; /* (pe+2) to ph Domain Name Protocol */ - proto_tree_add_item(adnp_tree, hf_pfcp_dnp, tvb, offset, domain_name_prot_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(adnp_tree, hf_pfcp_dnp, tvb, offset, domain_name_prot_len, ENC_ASCII); dissected_len += domain_name_prot_len; offset += domain_name_prot_len; } @@ -4680,7 +4680,7 @@ dissect_pfcp_flow_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, p * The Flow Description field, when present, shall be encoded as an OctetString * as specified in subclause 5.4.2 of 3GPP TS 29.212 */ - proto_tree_add_item(tree, hf_pfcp_flow_desc, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_flow_desc, tvb, offset, len, ENC_ASCII); offset += len; if (offset < length) { @@ -6062,7 +6062,7 @@ static void dissect_pfcp_user_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item_ret_uint(tree, hf_pfcp_user_id_length_of_nai, tvb, offset, 1, ENC_BIG_ENDIAN, &length_nai); offset += 1; /* (f+1) to g NAI */ - proto_tree_add_item(tree, hf_pfcp_user_id_nai, tvb, offset, length_nai, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_user_id_nai, tvb, offset, length_nai, ENC_ASCII); offset += length_nai; } @@ -6072,7 +6072,7 @@ static void dissect_pfcp_user_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item_ret_uint(tree, hf_pfcp_user_id_length_of_supi, tvb, offset, 1, ENC_BIG_ENDIAN, &length_supi); offset += 1; /* (f+1) to g SUPI */ - proto_tree_add_item(tree, hf_pfcp_user_id_supi, tvb, offset, length_supi, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_user_id_supi, tvb, offset, length_supi, ENC_ASCII); offset += length_supi; } @@ -6082,7 +6082,7 @@ static void dissect_pfcp_user_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item_ret_uint(tree, hf_pfcp_user_id_length_of_gpsi, tvb, offset, 1, ENC_BIG_ENDIAN, &length_gpsi); offset += 1; /* (f+1) to g GPSI */ - proto_tree_add_item(tree, hf_pfcp_user_id_gpsi, tvb, offset, length_gpsi, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_user_id_gpsi, tvb, offset, length_gpsi, ENC_ASCII); offset += length_gpsi; } @@ -6092,7 +6092,7 @@ static void dissect_pfcp_user_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item_ret_uint(tree, hf_pfcp_user_id_length_of_pei, tvb, offset, 1, ENC_BIG_ENDIAN, &length_pei); offset += 1; /* (f+1) to g PEI */ - proto_tree_add_item(tree, hf_pfcp_user_id_pei, tvb, offset, length_pei, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pfcp_user_id_pei, tvb, offset, length_pei, ENC_ASCII); offset += length_pei; } diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index e257d9addc..f592044fa5 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -300,7 +300,7 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U proto_tree_add_item_ret_string(pflog_tree, hf_pflog_ifname, tvb, offset, 16, ENC_ASCII|ENC_NA, pinfo->pool, &ifname); offset += 16; - proto_tree_add_item(pflog_tree, hf_pflog_ruleset, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(pflog_tree, hf_pflog_ruleset, tvb, offset, 16, ENC_ASCII); offset += 16; proto_tree_add_item_ret_int(pflog_tree, hf_pflog_rulenr, tvb, offset, 4, ENC_BIG_ENDIAN, &rulenr); diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index dd79880278..c935eec1f8 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -207,7 +207,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, case PGSQL_AUTH_SASL_REQUESTED: /* SASLInitResponse */ siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_sasl_auth_mech, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_sasl_auth_mech, tvb, n, siz, ENC_ASCII); n += siz; proto_tree_add_item_ret_int(tree, hf_sasl_auth_data_length, tvb, n, 4, ENC_BIG_ENDIAN, &data_length); n += 4; @@ -226,7 +226,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, default: siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_passwd, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_passwd, tvb, n, siz, ENC_ASCII); break; } break; @@ -234,17 +234,17 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, /* Simple query */ case 'Q': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII); break; /* Parse */ case 'P': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII); n += siz; siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII); n += siz; i = tvb_get_ntohs(tvb, n); @@ -259,11 +259,11 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, /* Bind */ case 'B': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII); n += siz; siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII); n += siz; i = tvb_get_ntohs(tvb, n); @@ -299,7 +299,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, /* Execute */ case 'E': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII); n += siz; i = tvb_get_ntohl(tvb, n); @@ -339,9 +339,9 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, if ((signed)length <= 0) { break; } - proto_tree_add_item(tree, hf_parameter_name, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_parameter_name, tvb, n, siz, ENC_ASCII); i = tvb_strsize(tvb, n+siz); - proto_tree_add_item(tree, hf_parameter_value, tvb, n + siz, i, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_parameter_value, tvb, n + siz, i, ENC_ASCII); length -= i; n += siz+i; @@ -372,7 +372,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, /* Copy failure */ case 'f': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_error, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_error, tvb, n, siz, ENC_ASCII); break; /* Function call */ @@ -439,7 +439,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, n += 4; while ((guint)n < length) { siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_sasl_auth_mech, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_sasl_auth_mech, tvb, n, siz, ENC_ASCII); n += siz; } break; @@ -489,7 +489,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, while (i-- > 0) { proto_tree *twig; siz = tvb_strsize(tvb, n); - ti = proto_tree_add_item(shrub, hf_val_name, tvb, n, siz, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item(shrub, hf_val_name, tvb, n, siz, ENC_ASCII); twig = proto_item_add_subtree(ti, ett_values); n += siz; proto_tree_add_item(twig, hf_tableoid, tvb, n, 4, ENC_BIG_ENDIAN); @@ -527,7 +527,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, /* Command completion */ case 'C': siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_tag, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tag, tvb, n, siz, ENC_ASCII); break; /* Ready */ @@ -575,11 +575,11 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, proto_tree_add_item(tree, hf_pid, tvb, n, 4, ENC_BIG_ENDIAN); n += 4; siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_condition, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_condition, tvb, n, siz, ENC_ASCII); n += siz; siz = tvb_strsize(tvb, n); if (siz > 1) - proto_tree_add_item(tree, hf_text, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_text, tvb, n, siz, ENC_ASCII); break; /* Copy in/out */ @@ -617,7 +617,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, n += 4; while (num_nonsupported_options > 0) { siz = tvb_strsize(tvb, n); - proto_tree_add_item(tree, hf_nonsupported_option, tvb, n, siz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_nonsupported_option, tvb, n, siz, ENC_ASCII); n += siz; num_nonsupported_options--; } diff --git a/epan/dissectors/packet-pktap.c b/epan/dissectors/packet-pktap.c index 7c9e6553eb..b4dc188594 100644 --- a/epan/dissectors/packet-pktap.c +++ b/epan/dissectors/packet-pktap.c @@ -153,7 +153,7 @@ dissect_pktap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U dlt = tvb_get_letohl(tvb, offset); offset += 4; proto_tree_add_item(pktap_tree, hf_pktap_ifname, tvb, offset, 24, - ENC_ASCII|ENC_NA); + ENC_ASCII); offset += 24; proto_tree_add_item(pktap_tree, hf_pktap_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index d15deee8d7..e9b520670b 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -213,7 +213,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo, proto_tree *parent_tree, tvbu offset+=1; /* usmUserName */ - proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, ENC_ASCII); offset+=len; break; @@ -314,7 +314,7 @@ dissect_pktc_wakeup(proto_tree *tree, tvbuff_t *tvb, int offset) /* Server Kerberos Principal Identifier */ string_len=tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII); offset+=string_len; return offset; @@ -417,7 +417,7 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs /* Server Kerberos Principal Identifier */ string_len=tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII); offset+=string_len; /* Timestamp: YYMMDDhhmmssZ */ @@ -513,7 +513,7 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr case PKTC_MTAFQDN_REP: /* MTA FQDN */ string_len = tvb_reported_length_remaining(tvb, offset) - 4; - proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, ENC_ASCII); offset+=string_len; /* MTA IP address */ diff --git a/epan/dissectors/packet-pmproxy.c b/epan/dissectors/packet-pmproxy.c index 39e6baf408..d645d7eb87 100644 --- a/epan/dissectors/packet-pmproxy.c +++ b/epan/dissectors/packet-pmproxy.c @@ -119,7 +119,7 @@ static int is_client_exchange(tvbuff_t *tvb) { static int dissect_server_exchange(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pmproxy_tree) { int offset = PMPROXY_START_OF_PACKET; col_set_str(pinfo->cinfo, COL_INFO, "Server exchange"); - proto_tree_add_item(pmproxy_tree, hf_pmproxy_server_version, tvb, offset, PMPROXY_CLIENT_SERVER_VERSION_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(pmproxy_tree, hf_pmproxy_server_version, tvb, offset, PMPROXY_CLIENT_SERVER_VERSION_LENGTH, ENC_ASCII); offset += PMPROXY_CLIENT_SERVER_VERSION_LENGTH; return offset; } @@ -127,7 +127,7 @@ static int dissect_server_exchange(tvbuff_t *tvb, packet_info *pinfo, proto_tree static int dissect_client_exchange(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pmproxy_tree) { int offset = PMPROXY_START_OF_PACKET; col_set_str(pinfo->cinfo, COL_INFO, "Client exchange"); - proto_tree_add_item(pmproxy_tree, hf_pmproxy_client_version, tvb, offset, PMPROXY_CLIENT_SERVER_VERSION_LENGTH, ENC_ASCII|ENC_NA); + proto_tree_add_item(pmproxy_tree, hf_pmproxy_client_version, tvb, offset, PMPROXY_CLIENT_SERVER_VERSION_LENGTH, ENC_ASCII); offset += PMPROXY_CLIENT_SERVER_VERSION_LENGTH; return offset; } diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index fd38a0c21b..9e8d7d73a4 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1001,7 +1001,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* Friendly Name Length */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_friendlyName_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); /* Friendly Name */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_friendlyName, tvb, offset+2, tvb_get_letohs(tvb,offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_friendlyName, tvb, offset+2, tvb_get_letohs(tvb,offset), ENC_ASCII); offset +=tvb_get_letohs(tvb,offset)+2; } /* Service Address List */ @@ -1086,10 +1086,10 @@ static void dissect_publicKey_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_unused_bits, tvb, offset, 1, ENC_NA); offset +=1; /* Algorithm ObjID */ - proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_objID, tvb, offset, objIDLength, ENC_ASCII|ENC_NA); + proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_objID, tvb, offset, objIDLength, ENC_ASCII); offset += objIDLength; /* Public Key Data */ - proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_publicKeyData, tvb, offset, cbDataLength, ENC_ASCII|ENC_NA); + proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_publicKeyData, tvb, offset, cbDataLength, ENC_ASCII); } } static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index 054f56575d..fd6339688f 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -306,7 +306,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc else if (key1 == 4) { - proto_tree_add_item(ppcap_tree1, hf_ppcap_source_nodeid, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ppcap_tree1, hf_ppcap_source_nodeid, tvb, offset, msg_len, ENC_ASCII); set_address_tvb(&pinfo->net_src, AT_STRINGZ, msg_len, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); } @@ -425,7 +425,7 @@ dissect_ppcap_info_string(tvbuff_t *tvb, proto_tree * ppcap_tree1, int offset) msg_len = tvb_get_ntohs(tvb, offset); proto_tree_add_item( ppcap_tree1, hf_ppcap_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; - proto_tree_add_item(ppcap_tree1, hf_ppcap_info, tvb, offset, msg_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ppcap_tree1, hf_ppcap_info, tvb, offset, msg_len, ENC_ASCII); if (msg_len%4) msg_len = msg_len +( 4- (msg_len%4)); diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c index 2f68ddc2c8..f65b82825b 100644 --- a/epan/dissectors/packet-ppi-antenna.c +++ b/epan/dissectors/packet-ppi-antenna.c @@ -260,7 +260,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case PPI_ANTENNA_SERIALNUM: if (length_remaining < 32) break; - proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_serialnum, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_serialnum, tvb, offset, 32, ENC_ASCII); offset+=32; length_remaining-=32; break; @@ -269,7 +269,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d if (length_remaining < 32) break; if (tree) { - /* proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, ENC_ASCII|ENC_NA); */ + /* proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, ENC_ASCII); */ curr_str = tvb_format_stringzpad(pinfo->pool, tvb, offset, 32); proto_tree_add_string(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, curr_str); proto_item_append_text(antenna_line, " (%s)", curr_str); @@ -281,7 +281,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d if (length_remaining < 32) break; if (tree) { - /*proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA);*/ + /*proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, ENC_ASCII);*/ curr_str = tvb_format_stringzpad(pinfo->pool, tvb, offset, 32); proto_tree_add_string(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, curr_str); proto_item_append_text(antenna_line, " (%s)", curr_str); diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 24e3f30bba..17cd36fe47 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -347,7 +347,7 @@ dissect_ppi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data break; if (tree) { - /* proto_tree_add_item(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA); */ + /* proto_tree_add_item(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, ENC_ASCII); */ curr_str = tvb_format_stringzpad(pinfo->pool, tvb, offset, 32); /* need to append_text this */ proto_tree_add_string(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, curr_str); proto_item_append_text(gps_line, " (%s)", curr_str); diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index c8f89f05a5..e17d6dc0cf 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -578,7 +578,7 @@ dissect_ppi_vector_v1(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length case PPI_VECTOR_DESCSTR: if (length_remaining < 32) break; - proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII); offset+=32; length_remaining-=32; break; @@ -856,7 +856,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length break; if (ppi_vector_tree) { - /* proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA); */ + /* proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII); */ curr_str = tvb_format_stringzpad(pinfo->pool, tvb, offset, 32); /* need to append_text this */ proto_tree_add_string(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, curr_str); proto_item_append_text(vector_line, " (%s)", curr_str); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index aa5174b743..53ec5c2a13 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -2763,7 +2763,7 @@ dissect_lcp_internationalization_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tr proto_tree_add_item(field_tree, hf_lcp_opt_MIBenum, tvb, offset + 2, 4, ENC_BIG_ENDIAN); proto_tree_add_item(field_tree, hf_lcp_opt_language_tag, tvb, offset + 6, - length - 6, ENC_ASCII|ENC_NA); + length - 6, ENC_ASCII); return tvb_captured_length(tvb); } @@ -4726,7 +4726,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, ENC_BIG_ENDIAN); if (length > 4) { proto_tree_add_item(fh_tree, hf_lcp_message, tvb, offset + 4, - length - 4, ENC_ASCII|ENC_NA); + length - 4, ENC_ASCII); } break; @@ -4739,7 +4739,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, (secs_remaining == 0xffffffff) ? "(forever)" : "seconds"); if (length > 8) { proto_tree_add_item(fh_tree, hf_lcp_message, tvb, offset + 8, - length - 8, ENC_ASCII|ENC_NA); + length - 8, ENC_ASCII); } break; @@ -6188,7 +6188,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset++; proto_tree_add_item(data_tree, hf_pap_peer_id, tvb, offset, - peer_id_length, ENC_ASCII|ENC_NA); + peer_id_length, ENC_ASCII); peer_id = tvb_format_text(pinfo->pool, tvb, offset, peer_id_length); offset += peer_id_length; @@ -6198,7 +6198,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset++; proto_tree_add_item(data_tree, hf_pap_password, tvb, offset, - password_length, ENC_ASCII|ENC_NA); + password_length, ENC_ASCII); password = tvb_format_text(pinfo->pool, tvb, offset, password_length); col_append_fstr(pinfo->cinfo, COL_INFO, @@ -6213,7 +6213,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset +=1; proto_tree_add_item(data_tree, hf_pap_message, tvb, offset, - message_length, ENC_ASCII|ENC_NA); + message_length, ENC_ASCII); message = tvb_format_text(pinfo->pool, tvb, offset, message_length); col_append_fstr(pinfo->cinfo, COL_INFO, " (Message='%s')", @@ -6310,7 +6310,7 @@ dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Find name in remaining bytes */ if (length > 0) { proto_tree_add_item(field_tree, hf_chap_name, tvb, - offset, length, ENC_ASCII|ENC_NA); + offset, length, ENC_ASCII); name_offset = offset; name_size = length; } @@ -6331,7 +6331,7 @@ dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ case CHAP_FAIL: if (length > 0) { proto_tree_add_item(fh_tree, hf_chap_message, tvb, offset, - length, ENC_ASCII|ENC_NA); + length, ENC_ASCII); } /* Show message in info column */ diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index d342d97de6..fdd06f2643 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -467,7 +467,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr if (poe_tag_length > 0) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name, tvb, - tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); + tagstart+4, poe_tag_length, ENC_ASCII); } break; case PPPOE_TAG_AC_NAME: @@ -633,15 +633,15 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr strings. */ case PPPOE_TAG_SVC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name_error, tvb, - tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); + tagstart+4, poe_tag_length, ENC_ASCII); break; case PPPOE_TAG_AC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_system_error, tvb, - tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); + tagstart+4, poe_tag_length, ENC_ASCII); break; case PPPOE_TAG_GENERIC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_generic_error, tvb, - tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); + tagstart+4, poe_tag_length, ENC_ASCII); break; /* Get out if see end-of-list tag */ diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 5e8f94b0d1..05aaa015c6 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -230,10 +230,10 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII); } static void @@ -265,10 +265,10 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII); } @@ -366,10 +366,10 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII); } static void @@ -429,13 +429,13 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr proto_tree_add_item(tree, hf_pptp_dialing_number_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, ENC_ASCII); offset += 64; - proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII); } static void @@ -522,7 +522,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, ENC_ASCII); } static void diff --git a/epan/dissectors/packet-proxy.c b/epan/dissectors/packet-proxy.c index 51da0244f9..d66ee050ec 100644 --- a/epan/dissectors/packet-proxy.c +++ b/epan/dissectors/packet-proxy.c @@ -160,25 +160,25 @@ dissect_proxy_v2_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *proxy_tree, offset = dissect_proxy_v2_tlv(tvb, pinfo, tlv_tree, offset, header_len); break; case PP2_SUBTYPE_SSL_VERSION: /* SSL Version */ - proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_version, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_version, tvb, offset, length, ENC_ASCII); proto_item_append_text(ti_tlv, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, length, ENC_ASCII)); offset += length; break; case PP2_SUBTYPE_SSL_CN: /* SSL CommonName */ - proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_cn, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_cn, tvb, offset, length, ENC_ASCII); proto_item_append_text(ti_tlv, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, length, ENC_ASCII)); offset += length; break; case PP2_SUBTYPE_SSL_CIPHER: /* SSL Cipher */ - proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_cipher, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_cipher, tvb, offset, length, ENC_ASCII); offset += length; break; case PP2_SUBTYPE_SSL_SIG_ALG: /* SSL Signature Algorithm */ - proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_sig_alg, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_sig_alg, tvb, offset, length, ENC_ASCII); offset += length; break; case PP2_SUBTYPE_SSL_KEY_ALG: /* SSL Key Algorithm */ - proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_key_alg, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_proxy2_tlv_ssl_key_alg, tvb, offset, length, ENC_ASCII); offset += length; break; default: diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index d09c165601..01d00de2dd 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -2099,7 +2099,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_versionnetwork, tvb, PTP_VERSIONNETWORK_OFFSET, 2, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_subdomain, tvb, PTP_SUBDOMAIN_OFFSET, 16, ENC_ASCII|ENC_NA); + hf_ptp_subdomain, tvb, PTP_SUBDOMAIN_OFFSET, 16, ENC_ASCII); proto_tree_add_item(ptp_tree, hf_ptp_messagetype, tvb, PTP_MESSAGETYPE_OFFSET, 1, ENC_BIG_ENDIAN); @@ -2194,7 +2194,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_SDR_GRANDMASTERCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockidentifier, tvb, - PTP_SDR_GRANDMASTERCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII|ENC_NA); + PTP_SDR_GRANDMASTERCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII); proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockvariance, tvb, @@ -2219,7 +2219,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_sdr_localclockstratum, tvb, PTP_SDR_LOCALCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, - hf_ptp_sdr_localclockidentifier, tvb, PTP_SDR_LOCALCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII|ENC_NA); + hf_ptp_sdr_localclockidentifier, tvb, PTP_SDR_LOCALCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII); proto_tree_add_item(ptp_tree, hf_ptp_sdr_parentcommunicationtechnology, tvb, PTP_SDR_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN); @@ -2341,7 +2341,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } case PTP_MM_SET_SUBDOMAIN:{ proto_tree_add_item(ptp_tree, hf_ptp_mm_set_subdomain_subdomainname, tvb, - PTP_MM_SET_SUBDOMAIN_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA); + PTP_MM_SET_SUBDOMAIN_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII); break; } case PTP_MM_DEFAULT_DATA_SET:{ @@ -2383,7 +2383,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_subdomainname, tvb, - PTP_MM_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA); + PTP_MM_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_numberports, tvb, PTP_MM_DEFAULT_DATA_SET_NUMBERPORTS_OFFSET, 2, ENC_BIG_ENDIAN); @@ -2409,7 +2409,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_UPDATE_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_subdomainname, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA); + PTP_MM_UPDATE_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII); break; } case PTP_MM_CURRENT_DATA_SET:{ diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 59120a5ab5..2749db080f 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -1245,7 +1245,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, case Q2931_CAUSE_REC_TIMER_EXP: if (len < 3) return; - proto_tree_add_item(tree, hf_q2931_cause_timer, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_q2931_cause_timer, tvb, offset, 3, ENC_ASCII); break; default: @@ -1359,7 +1359,7 @@ dissect_q2931_number_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, switch (numbering_plan) { case Q2931_ISDN_NUMBERING: - proto_tree_add_item(tree, hf_q2931_number_string, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_q2931_number_string, tvb, offset, len, ENC_ASCII); break; case Q2931_NSAP_ADDRESSING: diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index b4fe045b3f..ee055c0764 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1009,7 +1009,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_CAUSE_REC_TIMER_EXP: if (len < 3) return; - proto_tree_add_item(tree, hf_q933_timer, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_q933_timer, tvb, offset, 3, ENC_ASCII); break; default: diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index e9d1b8d918..66256b4bd2 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -3100,7 +3100,7 @@ dissect_qnet6_kif_msgsend_msg(tvbuff_t * tvb, packet_info * pinfo, proto_tree * */ if (path_len > 0) { - proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_path, tvb, *poffset, path_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_path, tvb, *poffset, path_len, ENC_ASCII); *poffset += path_len; rlen -= path_len; } @@ -3155,18 +3155,18 @@ dissect_qnet6_kif_msgsend_msg(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* * extra data is the symlink new path name */ - proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_symlink_path, tvb, *poffset, extra_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_symlink_path, tvb, *poffset, extra_len, ENC_ASCII); break; case QNX_IO_CONNECT_EXTRA_RENAME: /* * extra data is the mv old new ,extra is old path * name path is the new name */ - proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_rename_path, tvb, *poffset, extra_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_rename_path, tvb, *poffset, extra_len, ENC_ASCII); break; case QNX_IO_CONNECT_EXTRA_MOUNT: case QNX_IO_CONNECT_EXTRA_MOUNT_OCB: - proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_mount, tvb, *poffset, extra_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(stree, hf_qnet6_kif_msg_connect_extra_mount, tvb, *poffset, extra_len, ENC_ASCII); break; case QNX_IO_CONNECT_EXTRA_NONE: /* 0 */ default: diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 107aeb57cf..7c0f777c6e 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -177,7 +177,7 @@ dissect_quake_CCREQ_RULE_INFO (tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_quake_CCREQ_RULE_INFO_lastrule, - tvb, 0, -1, ENC_ASCII|ENC_NA); + tvb, 0, -1, ENC_ASCII); } @@ -202,7 +202,7 @@ dissect_quake_CCREP_REJECT (tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_quake_CCREP_REJECT_reason, - tvb, 0, -1, ENC_ASCII|ENC_NA); + tvb, 0, -1, ENC_ASCII); } @@ -283,7 +283,7 @@ dissect_quake_CCREP_PLAYER_INFO offset += 4; proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_address, - tvb, offset, -1, ENC_ASCII|ENC_NA); + tvb, offset, -1, ENC_ASCII); } @@ -301,7 +301,7 @@ dissect_quake_CCREP_RULE_INFO offset += item_len; proto_tree_add_item(tree, hf_quake_CCREP_RULE_INFO_value, - tvb, offset, -1, ENC_ASCII|ENC_NA); + tvb, offset, -1, ENC_ASCII); } diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index f35473baa4..aa812f537d 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -93,7 +93,7 @@ dissect_quake2_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo _U_, len = tvb_captured_length_remaining(tvb, offset); proto_tree_add_item(cl_tree, hf_quake2_connectionless_text, - tvb, offset, len, ENC_ASCII|ENC_NA); + tvb, offset, len, ENC_ASCII); /*offset += len;*/ /* we should analyse the result 'text' a bit further */ diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index 844191eaac..dae210ca88 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -2059,7 +2059,7 @@ dissect_quic_frame_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tree proto_tree_add_item_ret_varint(ft_tree, hf_quic_cc_reason_phrase_length, tvb, offset, -1, ENC_VARINT_QUIC, &len_reason, &len_reasonphrase); offset += len_reasonphrase; - proto_tree_add_item(ft_tree, hf_quic_cc_reason_phrase, tvb, offset, (guint32)len_reason, ENC_ASCII|ENC_NA); + proto_tree_add_item(ft_tree, hf_quic_cc_reason_phrase, tvb, offset, (guint32)len_reason, ENC_ASCII); offset += (guint32)len_reason; // Transport Error codes higher than 0x3fff are for Private Use. diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 2b9c33884c..a702615916 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -260,9 +260,9 @@ static void decode_packetcable_bcid (tvbuff_t *tvb, proto_tree *tree, int offset { proto_tree_add_item(tree, hf_packetcable_bcid_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_bcid_element_id, tvb, offset + 4, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_bcid_element_id, tvb, offset + 4, 8, ENC_ASCII); proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_dst, tvb, offset + 12, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_offset, tvb, offset + 13, 7, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_bcid_time_zone_offset, tvb, offset + 13, 7, ENC_ASCII); proto_tree_add_item(tree, hf_packetcable_bcid_event_counter, tvb, offset + 20, 4, ENC_BIG_ENDIAN); } @@ -276,11 +276,11 @@ static const gchar* dissect_packetcable_em_hdr(proto_tree* tree, tvbuff_t* tvb, proto_tree_add_item(tree, hf_packetcable_em_header_event_message_type, tvb, 26, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_packetcable_em_header_element_type, tvb, 28, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_em_header_element_id, tvb, 30, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_em_header_element_id, tvb, 30, 8, ENC_ASCII); proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_dst, tvb, 38, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_offset, tvb, 39, 7, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_em_header_time_zone_offset, tvb, 39, 7, ENC_ASCII); proto_tree_add_item(tree, hf_packetcable_em_header_sequence_number, tvb, 46, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_em_header_event_time, tvb, 50, 18, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_em_header_event_time, tvb, 50, 18, ENC_ASCII); ti = proto_tree_add_item(tree, hf_packetcable_em_header_status, tvb, 68, 4, ENC_BIG_ENDIAN); obj_tree = proto_item_add_subtree(ti, ett_radius_vendor_packetcable_status); @@ -344,7 +344,7 @@ static const gchar* dissect_packetcable_qos_descriptor(proto_tree* tree, tvbuff_ proto_tree_add_bitmask(tree, tvb, 0, hf_packetcable_qos_status, ett_radius_vendor_packetcable_qos_status, qos_flags, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_packetcable_qos_service_class_name, tvb, 4, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_qos_service_class_name, tvb, 4, 16, ENC_ASCII); for (intval = 0; intval < PACKETCABLE_QOS_DESC_BITFIELDS; intval++) { if (packetcable_qos_flags & packetcable_qos_desc_mask[intval]) { @@ -365,9 +365,9 @@ static const gchar* dissect_packetcable_time_adjustment(proto_tree* tree, tvbuff static const gchar* dissect_packetcable_redirected_from_info(proto_tree* tree, tvbuff_t* tvb, packet_info *pinfo _U_) { - proto_tree_add_item(tree, hf_packetcable_redirected_from_last_redirecting_party, tvb, 0, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_redirected_from_last_redirecting_party, tvb, 0, 20, ENC_ASCII); - proto_tree_add_item(tree, hf_packetcable_redirected_from_original_called_party, tvb, 20, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_packetcable_redirected_from_original_called_party, tvb, 20, 20, ENC_ASCII); proto_tree_add_item(tree, hf_packetcable_redirected_from_info_number_of_redirections, tvb, 40, 2, ENC_BIG_ENDIAN); @@ -421,25 +421,25 @@ static const gchar* dissect_packetcable_term_dsply_info(proto_tree* tree, tvbuff if (bitmask & PACKETCABLE_GENERAL_DISPLAY) { proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_general_display, - tvb, intval, 80, ENC_ASCII|ENC_NA); + tvb, intval, 80, ENC_ASCII); intval += 80; } if (bitmask & PACKETCABLE_CALLING_NUMBER) { proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_calling_number, - tvb, intval, 40, ENC_ASCII|ENC_NA); + tvb, intval, 40, ENC_ASCII); intval += 40; } if (bitmask & PACKETCABLE_CALLING_NAME) { proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_calling_name, - tvb, intval, 40, ENC_ASCII|ENC_NA); + tvb, intval, 40, ENC_ASCII); intval += 40; } if (bitmask & PACKETCABLE_MESSAGE_WAITING) { proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_message_waiting, - tvb, intval, 40, ENC_ASCII|ENC_NA); + tvb, intval, 40, ENC_ASCII); } return ""; diff --git a/epan/dissectors/packet-rdp_drdynvc.c b/epan/dissectors/packet-rdp_drdynvc.c index d88accb8a4..f802166790 100644 --- a/epan/dissectors/packet-rdp_drdynvc.c +++ b/epan/dissectors/packet-rdp_drdynvc.c @@ -306,7 +306,7 @@ dissect_rdp_drdynvc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, guint nameLen = tvb_strsize(tvb, offset); col_set_str(pinfo->cinfo, COL_INFO, "CreateChannel Request"); - proto_tree_add_item(tree, hf_rdp_drdynvc_channelName, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_rdp_drdynvc_channelName, tvb, offset, -1, ENC_ASCII); if (info->maxChannels < DRDYNVC_MAX_CHANNELS) { drdynvc_channel_def_t *channel = &info->channels[info->maxChannels]; diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index 01d61723a9..a3ec293af9 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -93,7 +93,7 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, break; case(RB_AVP_LABEL): proto_tree_add_item(st, hf_redbackli_label, tvb, - offset+2, avplen, ENC_ASCII|ENC_NA); + offset+2, avplen, ENC_ASCII); break; case(RB_AVP_EOH): proto_tree_add_item(st, hf_redbackli_eohpad, tvb, diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index d8ec0ab1ba..1579ca26f8 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -3016,7 +3016,7 @@ static int dissect_diagnosticinfo(tvbuff_t *tvb, proto_tree *tree, guint16 offse break; case DIAGNOSTICKINDID_SOFTWARE_VERSION: - proto_tree_add_item(local_tree, hf_reload_diagnosticinfo_software_version, tvb, offset+local_offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(local_tree, hf_reload_diagnosticinfo_software_version, tvb, offset+local_offset, length, ENC_ASCII); break; case DIAGNOSTICKINDID_MACHINE_UPTIME: @@ -3765,7 +3765,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr case ERRORCODE_UNDERLAY_DESTINATION_UNREACHABLE: { - proto_tree_add_item(error_tree, hf_reload_opaque_string, tvb, offset+2, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(error_tree, hf_reload_opaque_string, tvb, offset+2, 32, ENC_ASCII); } break; diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 8b970e6940..e0e6fe0296 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -247,7 +247,7 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree) case AUTH_PASSWORD: /* Plain text password */ proto_tree_add_item(rip_authentication_tree, hf_rip_auth_passwd, - tvb, offset+4, 16, ENC_ASCII|ENC_NA); + tvb, offset+4, 16, ENC_ASCII); break; case AUTH_KEYED_MSG_DIGEST: /* Keyed MD5 rfc 2082 */ @@ -257,7 +257,7 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree) auth_data_len = tvb_get_guint8( tvb, offset+7 ); proto_tree_add_item( rip_authentication_tree, hf_rip_auth_data_len, tvb, offset+7, 1, ENC_NA); proto_tree_add_item( rip_authentication_tree, hf_rip_auth_seq_num, tvb, offset+8, 4, ENC_BIG_ENDIAN); - proto_tree_add_item( rip_authentication_tree, hf_rip_zero_padding, tvb, offset+12, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item( rip_authentication_tree, hf_rip_zero_padding, tvb, offset+12, 8, ENC_ASCII); rip_authentication_tree = proto_tree_add_subtree( rip_authentication_tree, tvb, offset-4+digest_off, MD5_AUTH_DATA_LEN+4, ett_auth_vec, NULL, "Authentication Data Trailer" ); proto_tree_add_item( rip_authentication_tree, hf_rip_authentication_data, tvb, offset-4+digest_off+4, diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index e49530f705..c0aa92baf2 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -556,7 +556,7 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info, /* Create root of source info */ source_ti = proto_tree_add_item(tree, hf_rlc_lte_reassembly_source, - tvb, 0, 0, ENC_ASCII|ENC_NA); + tvb, 0, 0, ENC_ASCII); source_tree = proto_item_add_subtree(source_ti, ett_rlc_lte_reassembly_source); proto_item_set_generated(source_ti); diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 4da21ca516..cfac4f149d 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -206,7 +206,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Check for text data in front */ if (urgent_offset > offset) { - proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, ENC_ASCII); } /* Show control byte */ @@ -263,13 +263,13 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Client user name. */ str_len = tvb_strsize(tvb, offset); proto_tree_add_item(user_info_tree, hf_user_info_client_user_name, - tvb, offset, str_len, ENC_ASCII|ENC_NA); + tvb, offset, str_len, ENC_ASCII); offset += str_len; /* Server user name. */ str_len = tvb_strsize(tvb, offset); proto_tree_add_item(user_info_tree, hf_user_info_server_user_name, - tvb, offset, str_len, ENC_ASCII|ENC_NA); + tvb, offset, str_len, ENC_ASCII); offset += str_len; /* Terminal type/speed. */ @@ -283,7 +283,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Terminal type */ proto_tree_add_item(user_info_tree, hf_user_info_terminal_type, - tvb, offset, slash_offset-offset, ENC_ASCII|ENC_NA); + tvb, offset, slash_offset-offset, ENC_ASCII); offset = slash_offset + 1; /* Terminal speed */ @@ -323,7 +323,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, { /* There's data before the terminal info. */ proto_tree_add_item(rlogin_tree, hf_data, tvb, - offset, ti_offset - offset, ENC_ASCII|ENC_NA); + offset, ti_offset - offset, ENC_ASCII); } /* Create window info tree */ @@ -336,7 +336,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, offset += 2; /* These bytes should be "ss" */ - proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, ENC_ASCII); offset += 2; /* Character rows */ @@ -369,7 +369,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, if (tvb_offset_exists(tvb, offset)) { /* There's more data in the frame. */ - proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, ENC_ASCII); } } diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index e28fe8f467..62ba856e60 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -178,7 +178,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) tvb, offset + 1, 2, len); if (len > 0) { proto_tree_add_item(endpoint_tree, hf_rmi_epid_hostname, - tvb, offset + 3, len, ENC_ASCII|ENC_NA); + tvb, offset + 3, len, ENC_ASCII); } else { proto_tree_add_string(endpoint_tree, hf_rmi_epid_hostname, tvb, offset + 3, len, "[Empty]"); diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index de167427e4..b0010f53e0 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -116,7 +116,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(rmp_tree, hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_machtype, tvb, 10, 20, ENC_ASCII|ENC_NA); + hf_rmp_machtype, tvb, 10, 20, ENC_ASCII); /* The remaining fields are optional */ if(!tvb_offset_exists(tvb, 30)) return 30; diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 2e63a36be0..e265a2661d 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -371,7 +371,7 @@ dissect_rpcap_error (tvbuff_t *tvb, packet_info *pinfo, col_append_fstr (pinfo->cinfo, COL_INFO, ": %s", tvb_format_text_wsp (pinfo->pool, tvb, offset, len)); - ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, ENC_ASCII|ENC_NA); + ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, ENC_ASCII); expert_add_info_format(pinfo, ti, &ei_error, "Error: %s", tvb_format_text_wsp (pinfo->pool, tvb, offset, len)); } @@ -618,7 +618,7 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_, } if (desclen) { - proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, ENC_ASCII); offset += desclen; } @@ -825,7 +825,7 @@ dissect_rpcap_open_request (tvbuff_t *tvb, packet_info *pinfo _U_, gint len; len = tvb_reported_length_remaining (tvb, offset); - proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, ENC_ASCII); } diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index 2657f00227..676c561cbb 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -287,7 +287,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length_text, tvb, offset, 4, ENC_BIG_ENDIAN); len_text = tvb_get_ntohl(tvb, offset); offset += 4; - proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_error_text, tvb, offset, len_text, ENC_ASCII|ENC_NA); + proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_error_text, tvb, offset, len_text, ENC_ASCII); offset += len_text; } break; diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 1909e3e716..ae282810ac 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -316,7 +316,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) if (paramlen - 1 > 0) { proto_tree_add_item(v_tree, hf_rsip_parameter_address_fqdn, tvb, - off + 4, paramlen - 1, ENC_ASCII|ENC_NA); + off + 4, paramlen - 1, ENC_ASCII); proto_item_append_text(pti, ": %s", tvb_format_text(wmem_packet_scope(), tvb, off + 4, paramlen - 1)); } else diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index b2aa4cacff..8d946b2c30 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -89,10 +89,10 @@ dissect_rsync_version_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rsyn guint8 *version; guint len; - proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, RSYNCD_MAGIC_HEADER_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, RSYNCD_MAGIC_HEADER_LEN, ENC_ASCII); offset += RSYNCD_MAGIC_HEADER_LEN; offset += 1; /* skip the space */ - proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, -1, ENC_ASCII); len = tvb_reported_length_remaining(tvb, offset); version = tvb_get_string_enc(pinfo->pool, tvb, offset, len, ENC_ASCII|ENC_NA); @@ -158,7 +158,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case RSYNC_SERV_MOTD: - proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "Server MOTD"); @@ -170,14 +170,14 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* there are two cases - file list, or authentication */ if (0 == tvb_strneql(tvb, offset, RSYNCD_AUTHREQD, RSYNCD_AUTHREQD_LEN)) { /* matches, so we assume it's an authentication message */ - proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "Authentication"); conversation_data->server_state = RSYNC_DATA; } else { /* it didn't match, so it is probably a module list */ - proto_tree_add_item(rsync_tree, hf_rsync_module_list_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_module_list_string, tvb, offset, -1, ENC_ASCII); /* we need to check the end of the buffer for magic string */ buff_length = tvb_captured_length_remaining(tvb, offset); @@ -217,7 +217,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case RSYNC_CLIENT_QUERY: - proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "Client Query"); @@ -234,7 +234,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSYNC_COMMAND: /* then we are still sending commands */ - proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, ENC_ASCII); col_set_str(pinfo->cinfo, COL_INFO, "Client Command"); diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c index b2d290b478..b7b1824214 100644 --- a/epan/dissectors/packet-rtcdc.c +++ b/epan/dissectors/packet-rtcdc.c @@ -114,7 +114,7 @@ dissect_open_request_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item(flags_tree, hf_unordered_allowed, tvb, FLAGS_OFFSET, FLAGS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(rtcdc_tree, hf_reliability, tvb, RELIABILITY_OFFSET, RELIABILITY_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(rtcdc_tree, hf_priority, tvb, PRIORITY_OFFSET, PRIORITY_LENGTH, ENC_BIG_ENDIAN); - proto_tree_add_item(rtcdc_tree, hf_label, tvb, LABEL_OFFSET, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(rtcdc_tree, hf_label, tvb, LABEL_OFFSET, -1, ENC_ASCII); } return; } @@ -216,8 +216,8 @@ dissect_new_open_request_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item(rtcdc_tree, hf_new_reliability, tvb, NEW_RELIABILITY_OFFSET, NEW_RELIABILITY_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(rtcdc_tree, hf_new_label_length, tvb, NEW_LABEL_LENGTH_OFFSET, NEW_LABEL_LENGTH_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(rtcdc_tree, hf_new_protocol_length, tvb, NEW_PROTOCOL_LENGTH_OFFSET, NEW_PROTOCOL_LENGTH_LENGTH, ENC_BIG_ENDIAN); - proto_tree_add_item(rtcdc_tree, hf_new_label, tvb, NEW_LABEL_OFFSET, label_length, ENC_ASCII|ENC_NA); - proto_tree_add_item(rtcdc_tree, hf_new_protocol, tvb, NEW_LABEL_OFFSET + label_length, protocol_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(rtcdc_tree, hf_new_label, tvb, NEW_LABEL_OFFSET, label_length, ENC_ASCII); + proto_tree_add_item(rtcdc_tree, hf_new_protocol, tvb, NEW_LABEL_OFFSET + label_length, protocol_length, ENC_ASCII); } return; } diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 767305b874..40f3dc12b6 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1263,7 +1263,7 @@ dissect_rtcp_psfb_remb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_ fci_tree = proto_tree_add_subtree_format( rtcp_tree, tvb, offset, 8, ett_ssrc, NULL, "REMB %d", num_fci ); /* Unique identifier 'REMB' */ - proto_tree_add_item( fci_tree, hf_rtcp_psfb_remb_fci_identifier, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( fci_tree, hf_rtcp_psfb_remb_fci_identifier, tvb, offset, 4, ENC_ASCII ); offset += 4; /* Number of ssrcs - they will each be parsed below */ @@ -3048,7 +3048,7 @@ dissect_rtcp_bye( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tre offset++; reason_offset = offset; - proto_tree_add_item( tree, hf_rtcp_sdes_text, tvb, offset, reason_length, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_rtcp_sdes_text, tvb, offset, reason_length, ENC_ASCII); offset += reason_length; } @@ -3149,13 +3149,13 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, int count ) proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_len, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; - proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_string, tvb, offset, prefix_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_string, tvb, offset, prefix_len, ENC_ASCII ); offset += prefix_len; item_len -= prefix_len +1; if ( item_len == 0 ) continue; } - proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_text, tvb, offset, item_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_text, tvb, offset, item_len, ENC_ASCII ); offset += item_len; } } @@ -3675,7 +3675,7 @@ dissect_rtcp_avb( tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree offset += 4; /* Name (ASCII) */ - proto_tree_add_item( tree, hf_rtcp_name_ascii, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtcp_name_ascii, tvb, offset, 4, ENC_ASCII ); offset += 4; /* TimeBase Indicator */ diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 4966b22b05..c8408c309a 100644 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -262,7 +262,7 @@ static void rtitcp_util_add_error_attribute(proto_tree *attribute, tvbuff_t* tvb gint offset, guint size) { proto_tree_add_item(attribute, hf_rtitcp_control_attribute_error_code_value, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(attribute, hf_rtitcp_control_attribute_error_code_description, tvb, offset + 4, - size - 4, ENC_ASCII|ENC_NA); + size - 4, ENC_ASCII); } static void rtitcp_util_add_locator_t(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t * tvb, diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c index f7769c0555..5ca97e49f6 100644 --- a/epan/dissectors/packet-rtls.c +++ b/epan/dissectors/packet-rtls.c @@ -295,7 +295,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO offset += 6; proto_tree_add_item(rtls_tree, hf_rtls_ser_bssid, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(rtls_tree, hf_rtls_ser_essid, tvb, offset, 33, ENC_ASCII|ENC_NA); + proto_tree_add_item(rtls_tree, hf_rtls_ser_essid, tvb, offset, 33, ENC_ASCII); offset += 33; proto_tree_add_item(rtls_tree, hf_rtls_ser_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -319,7 +319,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO case AR_AP_EX_REPORT: proto_tree_add_item(rtls_tree, hf_rtls_aer_bssid, tvb, offset, 6, ENC_NA ); offset += 6; - proto_tree_add_item(rtls_tree, hf_rtls_aer_essid, tvb, offset, 33, ENC_ASCII|ENC_NA); + proto_tree_add_item(rtls_tree, hf_rtls_aer_essid, tvb, offset, 33, ENC_ASCII); offset += 33; proto_tree_add_item(rtls_tree, hf_rtls_aer_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index 75b04b30ae..c5aeb1a5ea 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -3468,7 +3468,7 @@ decode_sysex_common_nrt_fd( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t data_len--; /* file type */ - proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_type, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_type, tvb, offset, 4, ENC_ASCII ); offset += 4; data_len -= 4; @@ -3480,7 +3480,7 @@ decode_sysex_common_nrt_fd( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t if ( data_len ) { /* file-name */ - proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_name, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_name, tvb, offset, data_len, ENC_ASCII ); offset += data_len; } @@ -3515,14 +3515,14 @@ decode_sysex_common_nrt_fd( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t data_len--; /* file type */ - proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_type, tvb, offset, 4, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_type, tvb, offset, 4, ENC_ASCII ); offset += 4; data_len -= 4; if ( data_len ) { /* file-name */ - proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_name, tvb, offset, data_len, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtp_midi_sysex_common_nrt_fd_name, tvb, offset, data_len, ENC_ASCII ); offset += data_len; } } @@ -3564,7 +3564,7 @@ decode_sysex_common_tuning( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset++; /* file length */ - proto_tree_add_item( tree, hf_rtp_midi_sysex_common_tune_name, tvb, offset, 16, ENC_ASCII|ENC_NA ); + proto_tree_add_item( tree, hf_rtp_midi_sysex_common_tune_name, tvb, offset, 16, ENC_ASCII ); offset += 16; for ( i=0; i < 128; i++ ) { diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index d85a3ef91a..9d8a630a4a 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -4373,7 +4373,7 @@ static void rtps_util_add_product_version(proto_tree *tree, tvbuff_t *tvb, gint /* If major revision is smaller than 5, release interpreted as char */ if (vendor_id == RTPS_VENDOR_RTI_DDS && major < 5) { proto_tree_add_item(subtree, hf_rtps_param_product_version_release_as_char, - tvb, offset + release_offset, 1, ENC_ASCII|ENC_NA); + tvb, offset + release_offset, 1, ENC_ASCII); } else { proto_tree_add_item(subtree, hf_rtps_param_product_version_release, tvb, offset + release_offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 41e85a348b..a3fc47a858 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -3135,7 +3135,7 @@ s7comm_decode_plc_controls_param_hex29(tvbuff_t *tvb, proto_tree_add_uint(tree, hf_s7comm_data_plccontrol_part2_len, tvb, offset, 1, len); offset += 1; /* Function as string */ - proto_tree_add_item(tree, hf_s7comm_piservice_servicename, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_piservice_servicename, tvb, offset, len, ENC_ASCII); offset += len; return offset; @@ -3261,10 +3261,10 @@ s7comm_decode_pi_service(tvbuff_t *tvb, paramoffset += 1; col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s(", servicename); for (i = 0; i < count; i++) { - item = proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_filename, tvb, paramoffset, 8, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_filename, tvb, paramoffset, 8, ENC_ASCII); file_tree = proto_item_add_subtree(item, ett_s7comm_plcfilename); blocktype = tvb_get_ntohs(tvb, paramoffset); - itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_block_type, tvb, paramoffset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_block_type, tvb, paramoffset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(blocktype, blocktype_names, "Unknown Block type: 0x%04x")); paramoffset += 2; proto_tree_add_item_ret_string(file_tree, hf_s7comm_data_blockcontrol_block_num, tvb, paramoffset, 5, ENC_ASCII|ENC_NA, pinfo->pool, &str); @@ -3285,7 +3285,7 @@ s7comm_decode_pi_service(tvbuff_t *tvb, if (i+1 < count) { col_append_str(pinfo->cinfo, COL_INFO, ", "); } - itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, paramoffset, 1, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, paramoffset, 1, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, paramoffset), blocktype_attribute2_names, "Unknown filesys: %c")); paramoffset += 1; } @@ -3610,7 +3610,7 @@ s7comm_decode_plc_controls_filename(tvbuff_t *tvb, len = tvb_get_guint8(tvb, offset); proto_tree_add_uint(param_tree, hf_s7comm_data_blockcontrol_filename_len, tvb, offset, 1, len); offset += 1; - item = proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_filename, tvb, offset, len, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_filename, tvb, offset, len, ENC_ASCII); /* The filename when uploading from PLC has a well known structure, which can be further dissected. * An upload from a NC is a simple filename string with no deeper structure. * Check for PLC filename, by checking some fixed fields. @@ -3623,10 +3623,10 @@ s7comm_decode_plc_controls_filename(tvbuff_t *tvb, gboolean num_valid; is_plcfilename = TRUE; file_tree = proto_item_add_subtree(item, ett_s7comm_plcfilename); - itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_file_ident, tvb, offset, 1, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_file_ident, tvb, offset, 1, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, offset), blocktype_attribute1_names, "Unknown identifier: %c")); offset += 1; - itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_block_type, tvb, offset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_block_type, tvb, offset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(blocktype, blocktype_names, "Unknown Block type: 0x%04x")); offset += 2; proto_tree_add_item_ret_string(file_tree, hf_s7comm_data_blockcontrol_block_num, tvb, offset, 5, ENC_ASCII|ENC_NA, pinfo->pool, &str); @@ -3644,7 +3644,7 @@ s7comm_decode_plc_controls_filename(tvbuff_t *tvb, proto_item_append_text(file_tree, "NaN]"); col_append_str(pinfo->cinfo, COL_INFO, "NaN]"); } - itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, offset, 1, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(file_tree, hf_s7comm_data_blockcontrol_dest_filesys, tvb, offset, 1, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, offset), blocktype_attribute2_names, "Unknown filesys: %c")); offset += 1; } @@ -3701,11 +3701,11 @@ s7comm_decode_plc_controls_updownload(tvbuff_t *tvb, proto_tree_add_uint(param_tree, hf_s7comm_data_blockcontrol_part2_len, tvb, offset, 1, len); offset += 1; /* first byte unknown '1' */ - proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_part2_unknown, tvb, offset, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_part2_unknown, tvb, offset, 1, ENC_ASCII); offset += 1; - proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_loadmem_len, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_loadmem_len, tvb, offset, 6, ENC_ASCII); offset += 6; - proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_mc7code_len, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_mc7code_len, tvb, offset, 6, ENC_ASCII); offset += 6; } } else if (rosctr == S7COMM_ROSCTR_ACK_DATA) { @@ -3736,7 +3736,7 @@ s7comm_decode_plc_controls_updownload(tvbuff_t *tvb, len = tvb_get_guint8(tvb, offset); proto_tree_add_uint(param_tree, hf_s7comm_data_blockcontrol_upl_lenstring_len, tvb, offset, 1, len); offset += 1; - proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_upl_lenstring, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(param_tree, hf_s7comm_data_blockcontrol_upl_lenstring, tvb, offset, len, ENC_ASCII); offset += len; } } @@ -5332,9 +5332,9 @@ s7comm_decode_ud_ncprg_subfunc(tvbuff_t *tvb, subfunc == S7COMM_NCPRG_FUNCSTARTUPLOAD)) { start_offset = offset; /* file length may be contain only spaces when downloading a directory */ - proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filelength, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filelength, tvb, offset, 8, ENC_ASCII); offset += 8; - proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filetime, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filetime, tvb, offset, 16, ENC_ASCII); offset += 16; /* File path and file data aren't always there */ if (dlength > 24) { @@ -5342,7 +5342,7 @@ s7comm_decode_ud_ncprg_subfunc(tvbuff_t *tvb, string_end_offset = tvb_find_guint8(tvb, offset, dlength-8-16, 0x0a); if (string_end_offset > 0) { string_len = string_end_offset - offset + 1; /* include 0x0a */ - proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filepath, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filepath, tvb, offset, string_len, ENC_ASCII); offset += string_len; filelength = dlength - (offset - start_offset); proto_tree_add_item(data_tree, hf_s7comm_data_ncprg_filedata, tvb, offset, filelength, ENC_NA); @@ -5402,7 +5402,7 @@ s7comm_decode_message_service(tvbuff_t *tvb, events_string[strlen(events_string) - 1 ] = '\0'; col_append_fstr(pinfo->cinfo, COL_INFO, " SubscribedEvents=(%s)", events_string); - proto_tree_add_item(data_tree, hf_s7comm_cpu_msgservice_username, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_cpu_msgservice_username, tvb, offset, 8, ENC_ASCII); offset += 8; if ((events & 0x80) && (dlength > 10)) { almtype = tvb_get_guint8(tvb, offset); @@ -5907,7 +5907,7 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, item_tree = proto_item_add_subtree(item, ett_s7comm_data_item); blocktype16 = tvb_get_ntohs(tvb, offset); proto_item_append_text(item, " [%d]: (Block type %s)", i+1, val_to_str(blocktype16, blocktype_names, "Unknown Block type: 0x%04x")); - itemadd = proto_tree_add_item(item_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(item_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(blocktype16, blocktype_names, "Unknown Block type: 0x%04x")); offset += 2; proto_tree_add_item(item_tree, hf_s7comm_ud_blockinfo_block_cnt, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -5923,7 +5923,7 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, if (type == S7COMM_UD_TYPE_REQ) { if (tsize != S7COMM_DATA_TRANSPORT_SIZE_NULL) { blocktype16 = tvb_get_ntohs(tvb, offset); - itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(blocktype16, blocktype_names, "Unknown Block type: 0x%04x")); col_append_fstr(pinfo->cinfo, COL_INFO, " Type:[%s]", val_to_str(blocktype16, blocktype_names, "Unknown Block type: 0x%04x")); @@ -5965,7 +5965,7 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, gboolean num_valid; /* 8 Bytes of Data follow, 1./ 2. type, 3-7 blocknumber as ascii number */ blocktype16 = tvb_get_ntohs(tvb, offset); - itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(blocktype16, blocktype_names, "Unknown Block type: 0x%04x")); offset += 2; proto_tree_add_item_ret_string(data_tree, hf_s7comm_ud_blockinfo_block_num_ascii, tvb, offset, 5, ENC_ASCII|ENC_NA, pinfo->pool, &pBlocknumber); @@ -5983,7 +5983,7 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, col_append_str(pinfo->cinfo, COL_INFO, "NaN]"); } offset += 5; - itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_filesys, tvb, offset, 1, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_filesys, tvb, offset, 1, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_guint8(tvb, offset), blocktype_attribute2_names, "Unknown filesys: %c")); offset += 1; } @@ -5992,14 +5992,14 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, } else if (type == S7COMM_UD_TYPE_RES) { /* 78 Bytes */ if (ret_val == S7COMM_ITEM_RETVAL_DATA_OK) { - itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII|ENC_NA); + itemadd = proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_block_type, tvb, offset, 2, ENC_ASCII); proto_item_append_text(itemadd, " (%s)", val_to_str(tvb_get_ntohs(tvb, offset), blocktype_names, "Unknown Block type: 0x%04x")); offset += 2; proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_res_infolength, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_res_unknown2, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_res_const3, tvb, offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_res_const3, tvb, offset, 2, ENC_ASCII); offset += 2; proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_res_unknown, tvb, offset, 1, ENC_NA); offset += 1; @@ -6040,11 +6040,11 @@ s7comm_decode_ud_block_subfunc(tvbuff_t *tvb, offset += 2; proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_mc7_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_author, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_author, tvb, offset, 8, ENC_ASCII); offset += 8; - proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_family, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_family, tvb, offset, 8, ENC_ASCII); offset += 8; - proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_headername, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_s7comm_ud_blockinfo_headername, tvb, offset, 8, ENC_ASCII); offset += 8; snprintf(str_version, sizeof(str_version), "%d.%d", ((tvb_get_guint8(tvb, offset) & 0xf0) >> 4), tvb_get_guint8(tvb, offset) & 0x0f); proto_tree_add_string(data_tree, hf_s7comm_ud_blockinfo_headerversion, tvb, offset, 1, str_version); diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 8f5a8e29a1..f8fadb03de 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -2201,7 +2201,7 @@ s7comm_decode_szl_id_0111_idx_0001(tvbuff_t *tvb, { proto_tree_add_item(tree, hf_s7comm_szl_xy11_0001_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_s7comm_szl_xy11_0001_mlfb, tvb, offset, 20, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_xy11_0001_mlfb, tvb, offset, 20, ENC_ASCII); offset += 20; proto_tree_add_item(tree, hf_s7comm_szl_xy11_0001_bgtyp, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -5072,39 +5072,39 @@ s7comm_decode_szl_id_xy1c_idx_000x(tvbuff_t *tvb, /* For redundant H-CPUs there may be some upper bits set to identify the CPU */ switch (idx & 0x000f) { case 0x0001: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0001_name, tvb, offset, 24, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0001_name, tvb, offset, 24, ENC_ASCII); offset += 24; proto_tree_add_item(tree, hf_s7comm_szl_001c_000x_res, tvb, offset, 8, ENC_NA); offset += 8; break; case 0x0002: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0002_name, tvb, offset, 24, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0002_name, tvb, offset, 24, ENC_ASCII); offset += 24; proto_tree_add_item(tree, hf_s7comm_szl_001c_000x_res, tvb, offset, 8, ENC_NA); offset += 8; break; case 0x0003: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0003_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0003_tag, tvb, offset, 32, ENC_ASCII); offset += 32; break; case 0x0004: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0004_copyright, tvb, offset, 26, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0004_copyright, tvb, offset, 26, ENC_ASCII); offset += 26; proto_tree_add_item(tree, hf_s7comm_szl_001c_000x_res, tvb, offset, 6, ENC_NA); offset += 6; break; case 0x0005: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0005_serialn, tvb, offset, 24, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0005_serialn, tvb, offset, 24, ENC_ASCII); offset += 24; proto_tree_add_item(tree, hf_s7comm_szl_001c_000x_res, tvb, offset, 8, ENC_NA); offset += 8; break; case 0x0007: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0007_cputypname, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0007_cputypname, tvb, offset, 32, ENC_ASCII); offset += 32; break; case 0x0008: - proto_tree_add_item(tree, hf_s7comm_szl_001c_0008_snmcmmc, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_0008_snmcmmc, tvb, offset, 32, ENC_ASCII); offset += 32; break; case 0x0009: @@ -5118,7 +5118,7 @@ s7comm_decode_szl_id_xy1c_idx_000x(tvbuff_t *tvb, offset += 26; break; case 0x000a: - proto_tree_add_item(tree, hf_s7comm_szl_001c_000a_oem_copyright_string, tvb, offset, 26, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_000a_oem_copyright_string, tvb, offset, 26, ENC_ASCII); offset += 26; proto_tree_add_item(tree, hf_s7comm_szl_001c_000a_oem_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -5126,7 +5126,7 @@ s7comm_decode_szl_id_xy1c_idx_000x(tvbuff_t *tvb, offset += 4; break; case 0x000b: - proto_tree_add_item(tree, hf_s7comm_szl_001c_000b_loc_id, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_s7comm_szl_001c_000b_loc_id, tvb, offset, 32, ENC_ASCII); offset += 32; break; default: diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 9ec028134e..365e95dd8e 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -676,7 +676,7 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset += 1; /*Label*/ - proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label, tvb, offset, lab_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label, tvb, offset, lab_len, ENC_ASCII); offset += lab_len; if (mdct_p != NULL) @@ -710,7 +710,7 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset += 1; proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid, - tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA); + tvb, offset, LB_uid_len, ENC_ASCII); offset += (guint8)LB_uid_len; grp_name_len = tvb_get_guint8(tvb, offset); @@ -722,7 +722,7 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 /*Group Name*/ proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name, - tvb, offset, grp_name_len, ENC_ASCII|ENC_NA); + tvb, offset, grp_name_len, ENC_ASCII); offset += grp_name_len; return offset; @@ -842,7 +842,7 @@ static void dissect_setlbstate_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 /*LB UID*/ proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid, - tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA); + tvb, offset, LB_uid_len, ENC_ASCII); offset += (guint8)LB_uid_len; /*LB Health*/ diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 0027181f63..a16cc97b6c 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -1850,10 +1850,10 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* Response: Firmware version */ case SBUS_RD_PROGRAM_VERSION: /*PCD type*/ - proto_tree_add_item(sbus_tree, hf_sbus_cpu_type, tvb, offset, 5, ENC_ASCII|ENC_NA); + proto_tree_add_item(sbus_tree, hf_sbus_cpu_type, tvb, offset, 5, ENC_ASCII); offset += 5; /*FW version*/ - proto_tree_add_item(sbus_tree, hf_sbus_fw_version, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(sbus_tree, hf_sbus_fw_version, tvb, offset, 3, ENC_ASCII); offset += 4; break; diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index d4bb181dae..05e9267f3e 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -148,7 +148,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree case SS_READY_TYPE: info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_RDY_INFO_OFFSET; if (info_length > 0) { - proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_RDY_INFO_OFFSET, info_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_RDY_INFO_OFFSET, info_length, ENC_ASCII); total_length += info_length; } break; @@ -156,7 +156,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_NOTRDY_INFO_OFFSET; if (info_length > 0) { proto_tree_add_item(ssprotocol_tree, hf_message_reason, message_tvb, MESSAGE_NOTRDY_REASON_OFFSET, MESSAGE_NOTRDY_REASON_LENGTH, ENC_BIG_ENDIAN); - proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_NOTRDY_INFO_OFFSET, info_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_NOTRDY_INFO_OFFSET, info_length, ENC_ASCII); total_length += info_length; } break; diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 68e075fa3c..63a12ff8a5 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -506,7 +506,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb_a, packet_info *pinfo, proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, try_tvb, try_offset, 1, ENC_BIG_ENDIAN); break; case 0x0108: /* logical unit serial number */ - proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, try_tvb, try_offset, additional_length, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, try_tvb, try_offset, additional_length, ENC_ASCII); break; default: proto_tree_add_expert(tree, pinfo, &ei_scsi_mmc_unknown_feature_data, try_tvb, try_offset, additional_length); @@ -802,10 +802,10 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item (tree, hf_scsi_mmc_adip_eib0, tvb, offset+18, 1, ENC_BIG_ENDIAN); /* disk manufacturer id */ - proto_tree_add_item (tree, hf_scsi_mmc_adip_device_manuf_id, tvb, offset+19, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_scsi_mmc_adip_device_manuf_id, tvb, offset+19, 8, ENC_ASCII); /* media type id */ - proto_tree_add_item (tree, hf_scsi_mmc_adip_media_type_id, tvb, offset+27, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item (tree, hf_scsi_mmc_adip_media_type_id, tvb, offset+27, 3, ENC_ASCII); /* product revision number */ proto_tree_add_item (tree, hf_scsi_mmc_adip_product_revision_number, tvb, offset+30, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 095f915b23..6b4175857b 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2910,7 +2910,7 @@ dissect_scsi_evpd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } if (codeset == CODESET_ASCII) { if (identifier_type == DEVID_TYPE_VEND_ID_VEND_SPEC_ID) { - proto_tree_add_item(des_tree, hf_scsi_inq_vendor_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(des_tree, hf_scsi_inq_vendor_id, tvb, offset, 8, ENC_ASCII); proto_tree_add_item(des_tree, hf_scsi_inq_evpd_devid_identifier_str, tvb, offset + 8, idlen - 8, ENC_NA|ENC_ASCII); } else { proto_tree_add_item(des_tree, hf_scsi_inq_evpd_devid_identifier_str, tvb, offset, idlen, ENC_NA|ENC_ASCII); @@ -3362,15 +3362,15 @@ dissect_spc_inquiry(tvbuff_t *tvb_a, packet_info *pinfo, try_offset = dissect_spc_inq_reladrflags(try_tvb, try_offset, tree, version); /* vendor id */ - proto_tree_add_item(tree, hf_scsi_inq_vendor_id, try_tvb, try_offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_vendor_id, try_tvb, try_offset, 8, ENC_ASCII); try_offset+=8; /* product id */ - proto_tree_add_item(tree, hf_scsi_inq_product_id, try_tvb, try_offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_product_id, try_tvb, try_offset, 16, ENC_ASCII); try_offset+=16; /* product revision level */ - proto_tree_add_item(tree, hf_scsi_inq_product_rev, try_tvb, try_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_scsi_inq_product_rev, try_tvb, try_offset, 4, ENC_ASCII); try_offset+=4; /* vendor specific, 20 bytes */ diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 13a7b58055..5f08e7d006 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -1422,7 +1422,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, guint16 hostname_length; hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII); proto_item_append_text(parameter_item, " (Hostname: %.*s)", hostname_length, tvb_format_text(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length)); } diff --git a/epan/dissectors/packet-scylla.c b/epan/dissectors/packet-scylla.c index 298605813e..aefafbbd6a 100644 --- a/epan/dissectors/packet-scylla.c +++ b/epan/dissectors/packet-scylla.c @@ -229,7 +229,7 @@ dissect_scylla_negotiation_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sc proto_tree *scylla_negotiation_tree = proto_tree_add_subtree(scylla_tree, tvb, offset, len, ett_scylla_negotiation, NULL, "Protocol negotiation"); - proto_tree_add_item(scylla_negotiation_tree, hf_scylla_negotiation_magic, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(scylla_negotiation_tree, hf_scylla_negotiation_magic, tvb, offset, 8, ENC_ASCII); gint negotiation_offset = 8; proto_tree_add_item(scylla_negotiation_tree, hf_scylla_negotiation_size, tvb, offset + negotiation_offset, 4, ENC_LITTLE_ENDIAN); negotiation_offset += 4; diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 0715aa0fca..fb0716e42c 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1480,7 +1480,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_foundation, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* component-id: integer between 1 and 256. @@ -1489,7 +1489,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_componentid, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* transport: "UDP", etc. */ @@ -1497,7 +1497,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_transport, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* priority: integer between 1 and 2^31-1 */ @@ -1505,7 +1505,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_priority, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* connection-address: IPv4, IPv6 address or FQDN. */ @@ -1513,7 +1513,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_address, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* port */ @@ -1521,7 +1521,7 @@ dissect_sdp_media_attribute_candidate(proto_tree *tree, packet_info *pinfo, tvbu if (tokenlen == 0) return; proto_tree_add_item(tree, hf_ice_candidate_port, - tvb, offset, tokenlen, ENC_ASCII|ENC_NA); + tvb, offset, tokenlen, ENC_ASCII); offset = next_offset + 1; /* cand-type: type of candidate (where it learned the candidate) diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 09ea4b94f6..d906341968 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -173,13 +173,13 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII); offset += 12; proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII); break; @@ -214,7 +214,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII); offset += 12; proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -235,7 +235,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } else { - proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII); } break; diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 3e0a7a2d4a..e914d0c0e8 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -1164,7 +1164,7 @@ dissect_fmconfig_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int ett_selfm_fmconfig_ai, NULL, "Analog Channel: %s", ai_name); /* Add Channel Name, Channel Data Type, Scale Factor Type and Scale Factor Offset to tree */ - proto_tree_add_item(fmconfig_ai_tree, hf_selfm_fmconfig_ai_channel, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(fmconfig_ai_tree, hf_selfm_fmconfig_ai_channel, tvb, offset, 6, ENC_ASCII); proto_tree_add_item(fmconfig_ai_tree, hf_selfm_fmconfig_ai_type, tvb, offset+6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fmconfig_ai_tree, hf_selfm_fmconfig_ai_sf_type, tvb, offset+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(fmconfig_ai_tree, hf_selfm_fmconfig_ai_sf_ofs, tvb, offset+8, 2, ENC_BIG_ENDIAN); @@ -1839,7 +1839,7 @@ dissect_fastmsg_readresp_frame(tvbuff_t *tvb, proto_tree *fastmsg_tree, packet_i case FAST_MSG_TAGTYPE_CHAR8: case FAST_MSG_TAGTYPE_CHAR16: - proto_tree_add_item(fastmsg_tag_tree, hf_selfm_fmdata_ai_value_string, payload_tvb, payload_offset, data_size, ENC_ASCII|ENC_NA); + proto_tree_add_item(fastmsg_tag_tree, hf_selfm_fmdata_ai_value_string, payload_tvb, payload_offset, data_size, ENC_ASCII); payload_offset += data_size; break; @@ -2260,8 +2260,8 @@ dissect_fastmsg_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o case FAST_MSG_DEVDESC_RESP: /* 0xB0 (resp to 0x30) - Device Description Response */ /* Add FID / RID ASCII data to tree */ - proto_tree_add_item(fastmsg_tree, hf_selfm_fid, tvb, offset, 50, ENC_ASCII|ENC_NA); - proto_tree_add_item(fastmsg_tree, hf_selfm_rid, tvb, offset+50, 40, ENC_ASCII|ENC_NA); + proto_tree_add_item(fastmsg_tree, hf_selfm_fid, tvb, offset, 50, ENC_ASCII); + proto_tree_add_item(fastmsg_tree, hf_selfm_rid, tvb, offset+50, 40, ENC_ASCII); offset += 90; /* 16-bit field with number of data areas */ @@ -2290,7 +2290,7 @@ dissect_fastmsg_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o ett_selfm_fastmsg_datareg, NULL, "Fast Message Data Region #%d", cnt+1); /* 10-Byte Region description */ - proto_tree_add_item(fastmsg_datareg_tree, hf_selfm_fastmsg_data_region_name, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(fastmsg_datareg_tree, hf_selfm_fastmsg_data_region_name, tvb, offset, 10, ENC_ASCII); offset += 10; /* 32-bit field with base address of data region */ diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index d9adcb0609..88ecd3b9fe 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -549,7 +549,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_item(param_tree, hf_initial_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; case EnclosureItem: @@ -629,7 +629,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_item(param_tree, hf_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; case Reason_Code: @@ -688,7 +688,7 @@ PICS. */ proto_tree_add_item(param_tree, hf_second_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; case Second_Initial_Serial_Number: @@ -697,7 +697,7 @@ PICS. */ proto_tree_add_item(param_tree, hf_second_initial_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; case Large_Initial_Serial_Number: @@ -706,7 +706,7 @@ PICS. */ proto_tree_add_item(param_tree, hf_large_initial_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; case Large_Second_Initial_Serial_Number: @@ -715,7 +715,7 @@ PICS. */ proto_tree_add_item(param_tree, hf_large_second_initial_serial_number, - tvb, offset, param_len, ENC_ASCII|ENC_NA); + tvb, offset, param_len, ENC_ASCII); break; default: diff --git a/epan/dissectors/packet-simple.c b/epan/dissectors/packet-simple.c index e4a19ccbff..fb1917e3c6 100644 --- a/epan/dissectors/packet-simple.c +++ b/epan/dissectors/packet-simple.c @@ -317,7 +317,7 @@ static void dissect_simple_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree name = tvb_get_stringzpad(pinfo->pool, tvb, offset, SIMPLE_STATUS_NAME_LEN, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, ", Name: %s", name); - proto_tree_add_item(tree, hf_simple_status_name, tvb, offset, SIMPLE_STATUS_NAME_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_simple_status_name, tvb, offset, SIMPLE_STATUS_NAME_LEN, ENC_ASCII); offset += SIMPLE_STATUS_NAME_LEN; proto_tree_add_item(tree, hf_simple_status_time_hours, tvb, offset, 1, ENC_NA); @@ -344,7 +344,7 @@ static void dissect_simple_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_bitmask_text(tree, tvb, offset, 2, "Data Extraction Flags", NULL, ett_simple_status_dx_flag, simple_status_dx_flag_fields, ENC_LITTLE_ENDIAN, 0); offset += 2; - proto_tree_add_item(tree, hf_simple_status_dx_file_id, tvb, offset, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_simple_status_dx_file_id, tvb, offset, 8, ENC_ASCII); offset += 8; proto_tree_add_item(tree, hf_simple_status_spare_1, tvb, offset, 2, ENC_NA); diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index b2d88bffb2..5e35504a65 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1069,7 +1069,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EIS_ERROR_DESCRIPTION: - proto_tree_add_item(tree, hf_simulcrypt_error_description, tvb, offset, plen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_simulcrypt_error_description, tvb, offset, plen, ENC_ASCII); break; default: /* Unknown parameter type */ diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 1a838c12c0..cf95caabf2 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2253,7 +2253,7 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32 ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII|ENC_NA); - item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII); subtree = proto_item_add_subtree(item, 0); next_tvb = tvb_new_subset_length_caplen(tvb, offset, length, -1); if (xml_handle != NULL) { @@ -2446,7 +2446,7 @@ handle_RegisterReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "sid"); - ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_reserved_for_future_use, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_instance, 4, ENC_LITTLE_ENDIAN); ptvcursor_pop_subtree(cursor); @@ -2487,10 +2487,10 @@ handle_RegisterReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c ptvcursor_add(cursor, hf_skinny_maxNumberOfLines, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_stationIpV6Addr, 16, ENC_NA); ptvcursor_add(cursor, hf_skinny_ipV6AddressScope, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_firmwareLoadName, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_firmwareLoadName, 32, ENC_ASCII); } if (hdr_data_length > 191) { - ptvcursor_add(cursor, hf_skinny_configVersionStamp, 48, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_configVersionStamp, 48, ENC_ASCII); } skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0001); } @@ -2553,7 +2553,7 @@ handle_EnblocCallMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co guint32 VariableDirnumSize = (hdr_version >= V18_MSG_TYPE) ? 25 : 24; si->calledParty = g_strdup(tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), VariableDirnumSize)); - ptvcursor_add(cursor, hf_skinny_calledParty, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_calledParty, VariableDirnumSize, ENC_ASCII); if (hdr_data_length > 28) { si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN); @@ -2786,7 +2786,7 @@ static void handle_AlarmMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { ptvcursor_add(cursor, hf_skinny_alarmSeverity, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_text, 80, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_text, 80, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_parm1, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_parm2, 4, ENC_LITTLE_ENDIAN); } @@ -2867,14 +2867,14 @@ handle_ConnectionStatisticsResMessage(ptvcursor_t *cursor, packet_info * pinfo _ guint32 dataSize = 0; if (hdr_version <= V17_MSG_TYPE) { - ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII); callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_statsProcessingMode, 4, ENC_LITTLE_ENDIAN); } if (hdr_version >= V18_MSG_TYPE) { - ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII); callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN); @@ -2890,7 +2890,7 @@ handle_ConnectionStatisticsResMessage(ptvcursor_t *cursor, packet_info * pinfo _ if (hdr_data_length > 64) { dataSize = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_dataSize, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_data, dataSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_data, dataSize, ENC_ASCII); } skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0107 ^ callReference); } @@ -2908,8 +2908,8 @@ handle_OffHookWithCallingPartyNumberMessage(ptvcursor_t *cursor, packet_info * p { guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4); guint32 VariableDirnumSize = (hdr_version >= V18_MSG_TYPE) ? 25 : 24; - ptvcursor_add(cursor, hf_skinny_callingPartyNumber, VariableDirnumSize, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_callingPartyNumber, VariableDirnumSize, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, VariableDirnumSize, ENC_ASCII); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN); } @@ -2964,7 +2964,7 @@ handle_RegisterTokenReq(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con { { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "sid"); - ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_reserved_for_future_use, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_instance, 4, ENC_LITTLE_ENDIAN); ptvcursor_pop_subtree(cursor); @@ -3505,7 +3505,7 @@ handle_CreateConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add(cursor, hf_skinny_result, 4, ENC_LITTLE_ENDIAN); dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceId); } @@ -3545,7 +3545,7 @@ handle_ModifyConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add(cursor, hf_skinny_modify_conf_result, 4, ENC_LITTLE_ENDIAN); dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceId); } @@ -3566,7 +3566,7 @@ handle_AddParticipantResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_add_participant_result, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_bridgeParticipantId, 257, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_bridgeParticipantId, 257, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x013a ^ conferenceId); } @@ -3597,8 +3597,8 @@ handle_AuditConferenceResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_numberOfActiveParticipants, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII); } else { ptvcursor_advance(cursor, 76); } @@ -4430,7 +4430,7 @@ handle_SubscriptionStatReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_subscriptionFeatureID, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_timer, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_subscriptionID, 64, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_subscriptionID, 64, ENC_ASCII); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0048 ^ transactionId); } @@ -4475,8 +4475,8 @@ handle_MediaPathCapabilityMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, static void handle_MwiNotificationMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_mwiTargetNumber, 25, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_mwiControlNumber, 25, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_mwiTargetNumber, 25, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_mwiControlNumber, 25, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_areMessagesWaiting, 4, ENC_LITTLE_ENDIAN); { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "totalVmCounts"); @@ -4517,7 +4517,7 @@ static void handle_RegisterAckMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { ptvcursor_add(cursor, hf_skinny_keepAliveInterval, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_dateTemplate, 6, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_dateTemplate, 6, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_alignmentPadding, 2, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_secondaryKeepAliveInterval, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_maxProtocolVer, 1, ENC_LITTLE_ENDIAN); @@ -4839,27 +4839,27 @@ handle_StopMediaTransmissionMessage(ptvcursor_t *cursor, packet_info * pinfo _U_ static void handle_CallInfoMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_callingPartyName, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_callingPartyName, 40, ENC_ASCII); si->callingParty = g_strdup(tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), 24)); - ptvcursor_add(cursor, hf_skinny_callingParty, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_calledPartyName, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_callingParty, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_calledPartyName, 40, ENC_ASCII); si->calledParty = g_strdup(tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), 24)); - ptvcursor_add(cursor, hf_skinny_calledParty, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_calledParty, 24, ENC_ASCII); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_callReference, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_callType, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_originalCalledPartyName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_originalCalledParty, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_lastRedirectingPartyName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_lastRedirectingParty, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_originalCalledPartyName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_originalCalledParty, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_lastRedirectingPartyName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_lastRedirectingParty, 24, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_originalCdpnRedirectReason, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_lastRedirectingReason, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_cdpnVoiceMailbox, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_originalCdpnVoiceMailbox, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_lastRedirectingVoiceMailbox, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_cdpnVoiceMailbox, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_originalCdpnVoiceMailbox, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_lastRedirectingVoiceMailbox, 24, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_callInstance, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_callSecurityStatus, 4, ENC_LITTLE_ENDIAN); ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "partyPIRestrictionBits"); @@ -4901,11 +4901,11 @@ handle_ForwardStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn lineNumber = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineNumber, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_forwardAllActive, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_forwardAllDirnum, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_forwardAllDirnum, VariableDirnumSize, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_forwardBusyActive, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_forwardBusyDirnum, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_forwardBusyDirnum, VariableDirnumSize, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_forwardNoAnswerActive, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_forwardNoAnswerlDirnum, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_forwardNoAnswerlDirnum, VariableDirnumSize, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0009 ^ lineNumber); } @@ -4923,8 +4923,8 @@ handle_SpeedDialStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ski guint32 speedDialNumber = 0; speedDialNumber = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_speedDialNumber, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_speedDialDirNumber, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_speedDialDisplayName, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_speedDialDirNumber, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_speedDialDisplayName, 40, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x000a ^ speedDialNumber); } @@ -4942,9 +4942,9 @@ handle_LineStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c guint32 lineNumber = 0; lineNumber = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineNumber, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_lineDirNumber, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_lineFullyQualifiedDisplayName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_lineTextLabel, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lineDirNumber, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_lineFullyQualifiedDisplayName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_lineTextLabel, 40, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_lineDisplayOptions, 4, ENC_LITTLE_ENDIAN); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x000b ^ lineNumber); } @@ -4962,13 +4962,13 @@ handle_ConfigStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny { { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "sid"); - ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_reserved_for_future_use, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_instance, 4, ENC_LITTLE_ENDIAN); ptvcursor_pop_subtree(cursor); } - ptvcursor_add(cursor, hf_skinny_userName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_serverName, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_userName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_serverName, 40, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_numberOfLines, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_numberOfSpeedDials, 4, ENC_LITTLE_ENDIAN); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x000c); @@ -5084,7 +5084,7 @@ handle_ButtonTemplateResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk static void handle_VersionResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_versionStr, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_versionStr, 16, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x000f); } @@ -5099,7 +5099,7 @@ handle_VersionResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co static void handle_DisplayTextMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_text, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_text, 32, ENC_ASCII); } /* @@ -5113,7 +5113,7 @@ handle_DisplayTextMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_c static void handle_RegisterRejectMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_text, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_text, 32, ENC_ASCII); } /* @@ -5134,7 +5134,7 @@ handle_ServerResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "server [max:5]"); for (counter_1 = 0; counter_1 < 5; counter_1++) { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "server [%d / %d]", counter_1 + 1, 5); - ptvcursor_add(cursor, hf_skinny_ServerName, 48, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_ServerName, 48, ENC_ASCII); ptvcursor_pop_subtree(cursor); } ptvcursor_pop_subtree(cursor); @@ -5550,10 +5550,10 @@ handle_ConnectionStatisticsReqMessage(ptvcursor_t *cursor, packet_info * pinfo _ guint32 callReference = 0; if (hdr_version <= V17_MSG_TYPE) { - ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_directoryNum, 24, ENC_ASCII); } if (hdr_version >= V18_MSG_TYPE) { - ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_directoryNum, 28, ENC_ASCII); } callReference = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5911,7 +5911,7 @@ handle_DialedNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ if (dialedNumber_len > 1) { si->additionalInfo = ws_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); } - ptvcursor_add(cursor, hf_skinny_dialedNumber, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_dialedNumber, 24, ENC_ASCII); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5923,7 +5923,7 @@ handle_DialedNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ if (dialedNumber_len > 1) { si->additionalInfo = ws_strdup_printf("\"%s\"", tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), dialedNumber_len)); } - ptvcursor_add(cursor, hf_skinny_dialedNumber, VariableDirnumSize, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_dialedNumber, VariableDirnumSize, ENC_ASCII); si->lineId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_lineInstance, 4, ENC_LITTLE_ENDIAN); si->callId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); @@ -5973,7 +5973,7 @@ handle_FeatureStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinn featureIndex = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_featureIndex, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_featureID, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_featureTextLabel, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_featureTextLabel, 40, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_featureStatus, 4, ENC_LITTLE_ENDIAN); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0034 ^ featureIndex); } @@ -6234,8 +6234,8 @@ handle_ServiceURLStatResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk guint32 serviceURLIndex = 0; serviceURLIndex = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_serviceURLIndex, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_serviceURL, 256, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_serviceURLDisplayName, 40, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_serviceURL, 256, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_serviceURLDisplayName, 40, ENC_ASCII); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x0033 ^ serviceURLIndex); } @@ -6932,11 +6932,11 @@ handle_CreateConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_resourceType, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII); dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0137 ^ conferenceId); } @@ -6974,11 +6974,11 @@ handle_ModifyConferenceReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add(cursor, hf_skinny_conferenceId, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_numberOfReservedParticipants, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_applicationId, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_appConfID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appData, 24, ENC_ASCII); dataLength = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_dataLength, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_passThruData, dataLength, ENC_ASCII); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0139 ^ conferenceId); } @@ -7014,9 +7014,9 @@ handle_AddParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, sk ptvcursor_add_no_advance(cursor, hf_skinny_RestrictInformationType_BitsReserved, 4, ENC_LITTLE_ENDIAN); ptvcursor_advance(cursor, 4); ptvcursor_pop_subtree(cursor); /* end bitfield: partyPIRestrictionBits */ - ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013a ^ conferenceId); } @@ -7088,9 +7088,9 @@ handle_ChangeParticipantReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ptvcursor_add_no_advance(cursor, hf_skinny_RestrictInformationType_BitsReserved, 4, ENC_LITTLE_ENDIAN); ptvcursor_advance(cursor, 4); ptvcursor_pop_subtree(cursor); /* end bitfield: partyPIRestrictionBits */ - ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_participantName, 40, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_participantNumber, 24, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_conferenceName, 32, ENC_ASCII); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x013e ^ conferenceId); } @@ -7179,7 +7179,7 @@ handle_ConfigStatV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skin ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "sid"); DeviceName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (DeviceName_len > 1) { - ptvcursor_add(cursor, hf_skinny_DeviceName, DeviceName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_DeviceName, DeviceName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7191,13 +7191,13 @@ handle_ConfigStatV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skin ptvcursor_add(cursor, hf_skinny_numberOfSpeedDials, 4, ENC_LITTLE_ENDIAN); userName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (userName_len > 1) { - ptvcursor_add(cursor, hf_skinny_userName, userName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_userName, userName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } serverName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (serverName_len > 1) { - ptvcursor_add(cursor, hf_skinny_serverName, serverName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_serverName, serverName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7271,7 +7271,7 @@ handle_FeatureStatV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, ski ptvcursor_add(cursor, hf_skinny_featureStatus, 4, ENC_LITTLE_ENDIAN); featureTextLabel_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (featureTextLabel_len > 1) { - ptvcursor_add(cursor, hf_skinny_featureTextLabel, featureTextLabel_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_featureTextLabel, featureTextLabel_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7304,19 +7304,19 @@ handle_LineStatV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny ptvcursor_pop_subtree(cursor); /* end bitfield: lineType */ lineDirNumber_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lineDirNumber_len > 1) { - ptvcursor_add(cursor, hf_skinny_lineDirNumber, lineDirNumber_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lineDirNumber, lineDirNumber_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } lineFullyQualifiedDisplayName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lineFullyQualifiedDisplayName_len > 1) { - ptvcursor_add(cursor, hf_skinny_lineFullyQualifiedDisplayName, lineFullyQualifiedDisplayName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lineFullyQualifiedDisplayName, lineFullyQualifiedDisplayName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } lineTextLabel_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lineTextLabel_len > 1) { - ptvcursor_add(cursor, hf_skinny_lineTextLabel, lineTextLabel_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lineTextLabel, lineTextLabel_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7358,13 +7358,13 @@ handle_SpeedDialStatV2ResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, s ptvcursor_add(cursor, hf_skinny_speedDialNumber, 4, ENC_LITTLE_ENDIAN); speedDialDirNumber_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (speedDialDirNumber_len > 1) { - ptvcursor_add(cursor, hf_skinny_speedDialDirNumber, speedDialDirNumber_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_speedDialDirNumber, speedDialDirNumber_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } speedDialDisplayName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (speedDialDisplayName_len > 1) { - ptvcursor_add(cursor, hf_skinny_speedDialDisplayName, speedDialDisplayName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_speedDialDisplayName, speedDialDisplayName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7427,93 +7427,93 @@ handle_CallInfoV2Message(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_co callingParty_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (callingParty_len > 1) { si->callingParty = g_strdup(tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), callingParty_len)); - ptvcursor_add(cursor, hf_skinny_callingParty, callingParty_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_callingParty, callingParty_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } AlternateCallingParty_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (AlternateCallingParty_len > 1) { - ptvcursor_add(cursor, hf_skinny_AlternateCallingParty, AlternateCallingParty_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_AlternateCallingParty, AlternateCallingParty_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } calledParty_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (calledParty_len > 1) { si->calledParty = g_strdup(tvb_format_stringzpad(pinfo->pool, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), calledParty_len)); - ptvcursor_add(cursor, hf_skinny_calledParty, calledParty_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_calledParty, calledParty_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } originalCalledParty_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (originalCalledParty_len > 1) { - ptvcursor_add(cursor, hf_skinny_originalCalledParty, originalCalledParty_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_originalCalledParty, originalCalledParty_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } lastRedirectingParty_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lastRedirectingParty_len > 1) { - ptvcursor_add(cursor, hf_skinny_lastRedirectingParty, lastRedirectingParty_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lastRedirectingParty, lastRedirectingParty_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } cgpnVoiceMailbox_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (cgpnVoiceMailbox_len > 1) { - ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, cgpnVoiceMailbox_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_cgpnVoiceMailbox, cgpnVoiceMailbox_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } cdpnVoiceMailbox_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (cdpnVoiceMailbox_len > 1) { - ptvcursor_add(cursor, hf_skinny_cdpnVoiceMailbox, cdpnVoiceMailbox_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_cdpnVoiceMailbox, cdpnVoiceMailbox_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } originalCdpnVoiceMailbox_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (originalCdpnVoiceMailbox_len > 1) { - ptvcursor_add(cursor, hf_skinny_originalCdpnVoiceMailbox, originalCdpnVoiceMailbox_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_originalCdpnVoiceMailbox, originalCdpnVoiceMailbox_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } lastRedirectingVoiceMailbox_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lastRedirectingVoiceMailbox_len > 1) { - ptvcursor_add(cursor, hf_skinny_lastRedirectingVoiceMailbox, lastRedirectingVoiceMailbox_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lastRedirectingVoiceMailbox, lastRedirectingVoiceMailbox_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } callingPartyName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (callingPartyName_len > 1) { - ptvcursor_add(cursor, hf_skinny_callingPartyName, callingPartyName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_callingPartyName, callingPartyName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } calledPartyName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (calledPartyName_len > 1) { - ptvcursor_add(cursor, hf_skinny_calledPartyName, calledPartyName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_calledPartyName, calledPartyName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } originalCalledPartyName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (originalCalledPartyName_len > 1) { - ptvcursor_add(cursor, hf_skinny_originalCalledPartyName, originalCalledPartyName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_originalCalledPartyName, originalCalledPartyName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } lastRedirectingPartyName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (lastRedirectingPartyName_len > 1) { - ptvcursor_add(cursor, hf_skinny_lastRedirectingPartyName, lastRedirectingPartyName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_lastRedirectingPartyName, lastRedirectingPartyName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } if (hdr_version >= V17_MSG_TYPE) { HuntPilotNumber_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (HuntPilotNumber_len > 1) { - ptvcursor_add(cursor, hf_skinny_HuntPilotNumber, HuntPilotNumber_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_HuntPilotNumber, HuntPilotNumber_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } HuntPilotName_len = tvb_strnlen(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), -1)+1; if (HuntPilotName_len > 1) { - ptvcursor_add(cursor, hf_skinny_HuntPilotName, HuntPilotName_len, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_HuntPilotName, HuntPilotName_len, ENC_ASCII); } else { ptvcursor_advance(cursor, 1); } @@ -7603,10 +7603,10 @@ handle_QoSListenMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN); { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID"); - ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII); ptvcursor_pop_subtree(cursor); } } @@ -7649,10 +7649,10 @@ handle_QoSPathMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_ ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN); { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID"); - ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII); ptvcursor_pop_subtree(cursor); } } @@ -7751,10 +7751,10 @@ handle_QoSModifyMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_con ptvcursor_add(cursor, hf_skinny_peakRate, 4, ENC_LITTLE_ENDIAN); { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "applicationID"); - ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII|ENC_NA); - ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_vendorID, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_version, 16, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_appName, 32, ENC_ASCII); + ptvcursor_add(cursor, hf_skinny_subAppID, 32, ENC_ASCII); ptvcursor_pop_subtree(cursor); } } @@ -7793,7 +7793,7 @@ handle_NotificationMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_subscriptionFeatureID, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_notificationStatus, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_text, 97, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_text, 97, ENC_ASCII); } /* @@ -7894,7 +7894,7 @@ handle_CallHistoryInfoMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skin static void handle_LocationInfoMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_locationInfo, 2401, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_locationInfo, 2401, ENC_ASCII); } /* @@ -7908,7 +7908,7 @@ handle_LocationInfoMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_ static void handle_MwiResMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { - ptvcursor_add(cursor, hf_skinny_mwiTargetNumber, 25, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_mwiTargetNumber, 25, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_mwi_notification_result, 4, ENC_LITTLE_ENDIAN); skinny_reqrep_add_response(cursor, pinfo, skinny_conv, 0x004c); } @@ -7927,7 +7927,7 @@ handle_AddOnDeviceCapabilitiesMessage(ptvcursor_t *cursor, packet_info * pinfo _ ptvcursor_add(cursor, hf_skinny_unknown1_0159, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_unknown2_0159, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_unknown3_0159, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_unknownString_0159, 152, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_unknownString_0159, 152, ENC_ASCII); } /* @@ -8011,7 +8011,7 @@ handle_SPCPRegisterTokenReq(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny { { ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH, ett_skinny_tree, "sid"); - ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII|ENC_NA); + ptvcursor_add(cursor, hf_skinny_DeviceName, 16, ENC_ASCII); ptvcursor_add(cursor, hf_skinny_reserved_for_future_use, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_instance, 4, ENC_LITTLE_ENDIAN); ptvcursor_pop_subtree(cursor); diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in index cad14b5223..163b06bb01 100644 --- a/epan/dissectors/packet-skinny.c.in +++ b/epan/dissectors/packet-skinny.c.in @@ -212,7 +212,7 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32 ptvcursor_add_no_advance(cursor, hfindex, length, ENC_ASCII|ENC_NA); - item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII|ENC_NA); + item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII); subtree = proto_item_add_subtree(item, 0); next_tvb = tvb_new_subset_length_caplen(tvb, offset, length, -1); if (xml_handle != NULL) { diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 88732f8a64..1c6b543ffa 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -659,7 +659,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* server name */ namelen = tvb_strsize(tvb, offset); proto_tree_add_item(tree, hf_server_name, - tvb, offset, namelen, ENC_ASCII|ENC_NA); + tvb, offset, namelen, ENC_ASCII); break; case BROWSE_BACKUP_LIST_REQUEST: @@ -686,7 +686,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr for (i = 0; i < server_count; i++) { namelen = tvb_strsize(tvb, offset); proto_tree_add_item(tree, hf_backup_server, - tvb, offset, namelen, ENC_ASCII|ENC_NA); + tvb, offset, namelen, ENC_ASCII); offset += namelen; } break; @@ -695,7 +695,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* master browser server name */ namelen = tvb_strsize(tvb, offset); proto_tree_add_item(tree, hf_mb_server_name, - tvb, offset, namelen, ENC_ASCII|ENC_NA); + tvb, offset, namelen, ENC_ASCII); break; case BROWSE_RESETBROWSERSTATE_ANNOUNCEMENT: { @@ -714,7 +714,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* name of browser to promote */ namelen = tvb_strsize(tvb, offset); proto_tree_add_item(tree, hf_browser_to_promote, - tvb, offset, namelen, ENC_ASCII|ENC_NA); + tvb, offset, namelen, ENC_ASCII); break; } return tvb_captured_length(tvb); @@ -805,7 +805,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr col_append_fstr(pinfo->cinfo, COL_INFO, " %s", host_name); proto_tree_add_item(tree, hf_server_name, - tvb, offset, namelen, ENC_ASCII|ENC_NA); + tvb, offset, namelen, ENC_ASCII); offset += namelen; /* master browser server name or server comment */ diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 4462054985..c4d8d712fb 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -163,7 +163,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, /* mailslot name */ len = tvb_strsize(mshdr_tvb, offset); - proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, ENC_ASCII); offset += len; proto_item_set_len(item, offset); } diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index d5573fdb0c..aadfa1f5b1 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -695,21 +695,21 @@ add_logon_args(tvbuff_t *tvb, int offset, int count, packet_info *pinfo _U_, } /* user name */ - proto_tree_add_item(tree, hf_user_name, tvb, offset, 21, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_user_name, tvb, offset, 21, ENC_ASCII); offset += 21; /* pad1 */ offset += 1; /* password */ - proto_tree_add_item(tree, hf_password, tvb, offset, 15, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_password, tvb, offset, 15, ENC_ASCII); offset += 15; /* pad2 */ offset += 1; /* workstation name */ - proto_tree_add_item(tree, hf_workstation_name, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_workstation_name, tvb, offset, 16, ENC_ASCII); offset += 16; return offset; } @@ -2658,7 +2658,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, /* parameter descriptor */ param_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_param_desc, p_tvb, offset, - descriptor_len, ENC_ASCII|ENC_NA); + descriptor_len, ENC_ASCII); if (!pinfo->fd->visited) { /* * Save the parameter descriptor for future use. @@ -2671,7 +2671,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, /* return descriptor */ data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_return_desc, p_tvb, offset, - descriptor_len, ENC_ASCII|ENC_NA); + descriptor_len, ENC_ASCII); if (!pinfo->fd->visited) { /* * Save the return descriptor for future use. @@ -2696,7 +2696,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, */ aux_data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len); proto_tree_add_item(tree, hf_aux_data_desc, p_tvb, offset, - descriptor_len, ENC_ASCII|ENC_NA); + descriptor_len, ENC_ASCII); if (!pinfo->fd->visited) { /* * Save the auxiliary data descriptor for @@ -3742,7 +3742,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, /* XXX - can this be Unicode? */ proto_tree_add_item(pipe_tree, hf_smb_pipe_getinfo_pipe_name, - d_tvb, offset, pipe_namelen, ENC_ASCII|ENC_NA); + d_tvb, offset, pipe_namelen, ENC_ASCII); break; } } diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 6f8e971692..5069c3f4f8 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -10389,7 +10389,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); /* buffer format */ @@ -10402,7 +10402,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); /* buffer format */ @@ -10420,7 +10420,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, /* message */ CHECK_BYTE_COUNT(message_len); proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); COUNT_BYTES(message_len); END_OF_SMB @@ -10449,7 +10449,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); /* buffer format */ @@ -10462,7 +10462,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); END_OF_SMB @@ -10515,7 +10515,7 @@ dissect_send_multi_block_message_text_request(tvbuff_t *tvb, packet_info *pinfo /* message */ CHECK_BYTE_COUNT(message_len); proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); COUNT_BYTES(message_len); END_OF_SMB @@ -10544,7 +10544,7 @@ dissect_forwarded_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_forwarded_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); END_OF_SMB @@ -10573,7 +10573,7 @@ dissect_get_machine_name_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_machine_name, tvb, offset, - name_len, ENC_ASCII|ENC_NA); + name_len, ENC_ASCII); COUNT_BYTES(name_len); END_OF_SMB diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 8d01e6156d..44bcc53b8e 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -292,7 +292,7 @@ dissect_smtp_data(tvbuff_t *tvb, int offset, proto_tree *smtp_tree) * Put this line. */ proto_tree_add_item(smtp_tree, hf_smtp_message, tvb, - offset, next_offset - offset, ENC_ASCII|ENC_NA); + offset, next_offset - offset, ENC_ASCII); /* * Step to the next line. @@ -365,7 +365,7 @@ decode_plain_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { ti = proto_tree_add_item(tree, hf_smtp_username_password, tvb, - a_offset, a_linelen, ENC_ASCII|ENC_NA); + a_offset, a_linelen, ENC_ASCII); expert_add_info(pinfo, ti, &ei_smtp_base64_decode); col_append_str(pinfo->cinfo, COL_INFO, format_text(pinfo->pool, decrypt, a_linelen)); } @@ -915,7 +915,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ decrypt_len = linelen; col_append_str(pinfo->cinfo, COL_INFO, format_text(pinfo->pool, decrypt, linelen)); proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb, - loffset, linelen, ENC_ASCII|ENC_NA); + loffset, linelen, ENC_ASCII); } else { base64_string = tvb_get_string_enc(pinfo->pool, tvb, loffset, linelen, ENC_ASCII); @@ -925,7 +925,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ else { col_append_str(pinfo->cinfo, COL_INFO, format_text(pinfo->pool, decrypt, linelen)); proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb, - loffset, linelen, ENC_ASCII|ENC_NA); + loffset, linelen, ENC_ASCII); } } else if (session_state->user_pass_frame == pinfo->num) { decode_plain_auth(tvb, pinfo, smtp_tree, loffset, linelen); @@ -940,15 +940,15 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ * Put the command line into the protocol tree. */ ti = proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb, - loffset, next_offset - loffset, ENC_ASCII|ENC_NA); + loffset, next_offset - loffset, ENC_ASCII); cmdresp_tree = proto_item_add_subtree(ti, ett_smtp_cmdresp); proto_tree_add_item(cmdresp_tree, hf_smtp_req_command, tvb, - loffset, cmdlen, ENC_ASCII|ENC_NA); + loffset, cmdlen, ENC_ASCII); if ((linelen > 5) && (session_state->username_cmd_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, - loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); + loffset + 5, linelen - 5, ENC_ASCII); if (linelen >= 11) { if (decrypt == NULL) { @@ -977,7 +977,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } else if ((linelen > 5) && (session_state->ntlm_req_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, - loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); + loffset + 5, linelen - 5, ENC_ASCII); if (linelen >= 10) { decrypt = tvb_get_string_enc(pinfo->pool, tvb, loffset + 10, linelen - 10, ENC_ASCII); decrypt_len = linelen - 10; @@ -1012,14 +1012,14 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } else if ((linelen > 5) && (session_state->user_pass_cmd_frame == pinfo->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, - loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); + loffset + 5, linelen - 5, ENC_ASCII); col_append_str(pinfo->cinfo, COL_INFO, tvb_format_text(pinfo->pool, tvb, loffset, 11)); decode_plain_auth(tvb, pinfo, cmdresp_tree, loffset + 11, linelen - 11); } else if (linelen > 5) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, - loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); + loffset + 5, linelen - 5, ENC_ASCII); col_append_str(pinfo->cinfo, COL_INFO, tvb_format_text(pinfo->pool, tvb, loffset, linelen)); } @@ -1206,7 +1206,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (decrypt == NULL) { proto_tree_add_item(cmdresp_tree, hf_smtp_rsp_parameter, tvb, - offset + 4, linelen - 4, ENC_ASCII|ENC_NA); + offset + 4, linelen - 4, ENC_ASCII); if ((multiline_state != SMTP_MULTILINE_CONTINUE) && (multiline_state != SMTP_MULTILINE_END)) { diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 2f0bc657c9..3d16df93f6 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -578,7 +578,7 @@ static int dissect_snmp_variable_string(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_tree_add_item(tree, hf_snmp_var_bind_str, tvb, 0, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_snmp_var_bind_str, tvb, 0, -1, ENC_ASCII); return tvb_captured_length(tvb); } @@ -1418,7 +1418,7 @@ dissect_snmp_engineid(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, int o case SNMP_ENGINEID_FORMAT_TEXT: /* max. 27-byte string, administratively assigned */ if (len_remain<=27) { - proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_snmp_engineid_text, tvb, offset, len_remain, ENC_ASCII); offset+=len_remain; len_remain=0; } diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 663e494f15..8282ec67c9 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -447,14 +447,14 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo, /* display user name */ str_len = tvb_strsize(tvb, offset); - proto_tree_add_item( tree, hf_socks_username, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_socks_username, tvb, offset, str_len, ENC_ASCII); offset += str_len; if ( ipaddr[0] == 0 && ipaddr[1] == 0 && ipaddr[2] == 0 && ipaddr[3] != 0) { /* 0.0.0.x , where x!=0 means v4a support */ str_len = tvb_strsize(tvb, offset); - proto_tree_add_item( tree, hf_v4a_dns_name, tvb, offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item( tree, hf_v4a_dns_name, tvb, offset, str_len, ENC_ASCII); } break; default: diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index c3dca9b3dc..218e88c086 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -269,13 +269,13 @@ dissect_soupbintcp_common( case '+': /* Debug Message */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_text, - tvb, offset, expected_len - 1, ENC_ASCII|ENC_NA); + tvb, offset, expected_len - 1, ENC_ASCII); break; case 'A': /* Login Accept */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_session, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; seq_num_valid = ws_strtoi32(tvb_get_string_enc(pinfo->pool, @@ -314,17 +314,17 @@ dissect_soupbintcp_common( case 'L': /* Login Request */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_username, - tvb, offset, 6, ENC_ASCII|ENC_NA); + tvb, offset, 6, ENC_ASCII); offset += 6; proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_password, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_session, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; seq_num_valid = ws_strtoi32(tvb_get_string_enc(pinfo->pool, diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index d3cfe8a7f8..3eb903ecac 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1017,7 +1017,7 @@ dissect_ImageQuic(tvbuff_t *tvb, proto_tree *tree, guint32 offset) proto_tree_add_uint(ImageQuic_tree, hf_spice_quic_image_size, tvb, offset, 4, QuicSize); offset += 4; - proto_tree_add_item(ImageQuic_tree, hf_spice_quic_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(ImageQuic_tree, hf_spice_quic_magic, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(ImageQuic_tree, hf_quic_major_version, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -1039,7 +1039,7 @@ static guint32 dissect_ImageLZ_common_header(tvbuff_t *tvb, proto_tree *tree, const guint32 offset) { - proto_tree_add_item(tree, hf_spice_lz_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_spice_lz_magic, tvb, offset, 4, ENC_ASCII); proto_tree_add_item(tree, hf_LZ_major_version, tvb, offset + 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_LZ_minor_version, tvb, offset + 6, 2, ENC_BIG_ENDIAN); @@ -1748,7 +1748,7 @@ dissect_spice_common_server_messages(tvbuff_t *tvb, packet_info *pinfo, proto_tr message_len = tvb_get_letohl(tvb, offset); proto_tree_add_item(tree, hf_notify_message_len, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_notify_message, tvb, offset, message_len + 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_notify_message, tvb, offset, message_len + 1, ENC_ASCII); offset += (message_len + 1); break; default: @@ -2434,7 +2434,7 @@ dissect_spice_main_server(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, c name_len = tvb_get_letohl(tvb, offset); proto_tree_add_item(tree, hf_main_name_len, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_main_name, tvb, offset, name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_main_name, tvb, offset, name_len, ENC_ASCII); offset += name_len; break; case SPICE_MSG_MAIN_UUID: @@ -2694,7 +2694,7 @@ dissect_spice_port_server(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, c guint32 size = tvb_get_letohl(tvb, offset); proto_tree_add_item(tree, hf_spice_name_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_main_name, tvb, offset, size, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_main_name, tvb, offset, size, ENC_ASCII); offset += size; proto_tree_add_item(tree, hf_port_opened, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; @@ -2872,7 +2872,7 @@ dissect_spice_link_common_header(tvbuff_t *tvb, proto_tree *tree) { if (tree) { /* dissect common header */ - proto_tree_add_item(tree, hf_spice_magic, tvb, 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_spice_magic, tvb, 0, 4, ENC_ASCII); proto_tree_add_item(tree, hf_major_version, tvb, 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_minor_version, tvb, 8, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_message_size, tvb, 12, 4, ENC_LITTLE_ENDIAN); @@ -3286,7 +3286,7 @@ dissect_spice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U pdu_len += 4; GET_PDU_FROM_OFFSET(offset) offset += 4; - proto_tree_add_item(spice_tree, hf_spice_sasl_authentication_data, tvb, offset, pdu_len - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(spice_tree, hf_spice_sasl_authentication_data, tvb, offset, pdu_len - 4, ENC_ASCII); offset += (pdu_len - 4); } } diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 427905dc90..0f4823b39d 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -376,7 +376,7 @@ dissect_authblk_v2(tvbuff_t *tvb, int offset, proto_tree *tree) length = tvb_get_ntohs(tvb, offset + 8); proto_tree_add_uint(tree, hf_srvloc_authblkv2_slpspilen, tvb, offset + 8, 2, length); offset += 10; - proto_tree_add_item(tree, hf_srvloc_authblkv2_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_srvloc_authblkv2_slpspi, tvb, offset, length, ENC_ASCII); offset += length; /* add code in here to handle Structured Authentication Block */ return offset; @@ -763,7 +763,7 @@ dissect_url_entry_v2(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_uint(tree, hf_srvloc_url_urllen, tvb, offset, 2, url_len); offset += 2; - proto_tree_add_item(tree, hf_srvloc_url_url, tvb, offset, url_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_srvloc_url_url, tvb, offset, url_len, ENC_ASCII); offset += url_len; num_auths = tvb_get_guint8(tvb, offset); proto_tree_add_uint(tree, hf_srvloc_url_numauths, tvb, offset, 1, @@ -1041,7 +1041,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_append_fstr(pinfo->cinfo, COL_INFO, ", V2 XID - %u", tvb_get_ntohs(tvb, offset + 10)); lang_tag_len = tvb_get_ntohs(tvb, offset + 12); proto_tree_add_uint(srvloc_tree, hf_srvloc_langtaglen, tvb, offset + 12, 2, lang_tag_len); - proto_tree_add_item(srvloc_tree, hf_srvloc_langtag, tvb, offset + 14, lang_tag_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_langtag, tvb, offset + 14, lang_tag_len, ENC_ASCII); offset += 14+lang_tag_len; switch (function) { @@ -1051,35 +1051,35 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_prlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_prlist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_srvtypelen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_srvtypelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_srvtypelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_predicatelen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_predicate, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_predicate, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_slpspilen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_slpspi, tvb, offset, length, ENC_ASCII); offset += length; } break; @@ -1106,14 +1106,14 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreg_srvtypelen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_srvtype, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_srvtype, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreg_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); @@ -1137,7 +1137,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvdereg_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } offset = dissect_url_entry_v2(tvb, offset, srvloc_tree); @@ -1145,7 +1145,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvdereg_taglistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_taglist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_taglist, tvb, offset, length, ENC_ASCII); offset += length; } break; @@ -1164,35 +1164,35 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_prlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_prlist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_urllen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_url, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_url, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_taglistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_taglist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_taglist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_slpspilen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_slpspi, tvb, offset, length, ENC_ASCII); offset += length; } break; @@ -1234,28 +1234,28 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_urllen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_url, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_url, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_attrlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_attrlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_attrlist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_slpspilen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_slpspi, tvb, offset, length, ENC_ASCII); offset += length; } count = tvb_get_guint8(tvb, offset); @@ -1272,7 +1272,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_prlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_prlist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); @@ -1283,7 +1283,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_nameauthlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_nameauthlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_nameauthlist, tvb, offset, length, ENC_ASCII); offset += length; } } @@ -1291,7 +1291,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } break; @@ -1307,7 +1307,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtyperply_srvtypelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_srvtyperply_srvtypelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_srvtyperply_srvtypelist, tvb, offset, length, ENC_ASCII); offset += length; } break; @@ -1317,21 +1317,21 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_urllen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_url, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_url, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_scopelistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_scopelist, tvb, offset, length, ENC_ASCII); offset += length; } length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_attrlistlen, tvb, offset, 2, length); offset += 2; if (length) { - proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_attrlist, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_attrlist, tvb, offset, length, ENC_ASCII); offset += length; } count = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index c490822c53..71ef013dac 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -1647,7 +1647,7 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo, #endif proto_tree_add_item(tree, hf_ssh_protocol, - tvb, offset, protolen, ENC_ASCII|ENC_NA); + tvb, offset, protolen, ENC_ASCII); offset += linelen; return offset; } diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index aaf36f5ee7..83916086f6 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -486,13 +486,13 @@ prt_none16(gchar *buff, guint32 val) static gint dissect_mission(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) { - proto_tree_add_item(seg_tree, hf_4607_mission_plan, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_plan, tvb, offset, 12, ENC_ASCII); offset += 12; - proto_tree_add_item(seg_tree, hf_4607_mission_flight_plan, tvb, offset, 12, ENC_ASCII|ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_flight_plan, tvb, offset, 12, ENC_ASCII); offset += 12; proto_tree_add_item(seg_tree, hf_4607_mission_platform, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_mission_platform_config, tvb, offset, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_mission_platform_config, tvb, offset, 10, ENC_ASCII); offset += 10; proto_tree_add_item(seg_tree, hf_4607_mission_time_year, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -714,7 +714,7 @@ dissect_jobdef(tvbuff_t *tvb, proto_tree *seg_tree, gint offset) offset += 4; proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_model, tvb, offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_model, tvb, offset, 6, ENC_ASCII); offset += 6; proto_tree_add_item(seg_tree, hf_4607_jobdef_filter, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -847,14 +847,14 @@ dissect_stanag4607(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { ti = proto_tree_add_item(tree, proto_stanag4607, tvb, 0, -1, ENC_NA); hdr_tree = proto_item_add_subtree(ti, ett_4607_hdr); - proto_tree_add_item(hdr_tree, hf_4607_version, tvb, 0, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_version, tvb, 0, 2, ENC_ASCII); ti = proto_tree_add_item(hdr_tree, hf_4607_packet_size, tvb, 2, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(hdr_tree, hf_4607_nationality, tvb, 6, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_nationality, tvb, 6, 2, ENC_ASCII); proto_tree_add_item(hdr_tree, hf_4607_sec_class, tvb, 8, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(hdr_tree, hf_4607_sec_system, tvb, 9, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_sec_system, tvb, 9, 2, ENC_ASCII); proto_tree_add_item(hdr_tree, hf_4607_sec_code, tvb, 11, 2, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_exercise_indicator, tvb, 13, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(hdr_tree, hf_4607_platform_id, tvb, 14, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(hdr_tree, hf_4607_platform_id, tvb, 14, 10, ENC_ASCII); proto_tree_add_item(hdr_tree, hf_4607_mission_id, tvb, 24, 4, ENC_BIG_ENDIAN); proto_tree_add_item(hdr_tree, hf_4607_job_id, tvb, 28, 4, ENC_BIG_ENDIAN); } diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 4a2d572a53..61c5d5ac9a 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -529,7 +529,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if(tvb_reported_length_remaining(tvb, offset) >= 16){ starteam_tree = proto_tree_add_subtree(starteamroot_tree, tvb, offset, 16, ett_starteam_ph, NULL, STARTEAM_TEXT_PH); - proto_tree_add_item(starteam_tree, hf_starteam_ph_signature, tvb, offset + 0, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(starteam_tree, hf_starteam_ph_signature, tvb, offset + 0, 4, ENC_ASCII); proto_tree_add_item(starteam_tree, hf_starteam_ph_packet_size, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(starteam_tree, hf_starteam_ph_data_size, tvb, offset + 8, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(starteam_tree, hf_starteam_ph_data_flags, tvb, offset + 12, 4, ENC_LITTLE_ENDIAN); @@ -540,7 +540,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data starteam_tree = proto_tree_add_subtree(starteamroot_tree, tvb, offset, 38, ett_starteam_id, NULL, STARTEAM_TEXT_ID); proto_tree_add_item(starteam_tree, hf_starteam_id_revision_level, tvb, offset + 0, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(starteam_tree, hf_starteam_id_client, tvb, offset + 2, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(starteam_tree, hf_starteam_id_client, tvb, offset + 2, 16, ENC_ASCII); proto_tree_add_item(starteam_tree, hf_starteam_id_connect, tvb, offset + 18, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(starteam_tree, hf_starteam_id_component, tvb, offset + 22, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(starteam_tree, hf_starteam_id_command, tvb, offset + 26, 4, ENC_LITTLE_ENDIAN); @@ -551,7 +551,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data } if(tvb_reported_length_remaining(tvb, offset) > 0){ starteam_tree = proto_tree_add_subtree(starteamroot_tree, tvb, offset, -1, ett_starteam_data, NULL, STARTEAM_TEXT_DATA); - proto_tree_add_item(starteam_tree, hf_starteam_data_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(starteam_tree, hf_starteam_data_data, tvb, offset, -1, ENC_ASCII); } } } diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 6a9303a1da..2ddcbef9d9 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -1602,7 +1602,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole proto_tree_add_item(att_tree, hf_stun_att_reserved, tvb, offset+3, 1, ENC_NA); break; case MS_CANDIDATE_IDENTIFIER: - proto_tree_add_item(att_tree, hf_stun_att_ms_foundation, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(att_tree, hf_stun_att_ms_foundation, tvb, offset, 4, ENC_ASCII); break; case MS_MULTIPLEXED_TURN_SESSION_ID: proto_tree_add_item(att_tree, hf_stun_att_ms_multiplexed_turn_session_id, tvb, offset, 8, ENC_NA); diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index ea2bcdaa8f..771b05e0dc 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -154,7 +154,7 @@ dissect_synergy_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d dissect_synergy_handshake(tvb,pinfo,synergy_tree,offset+11); } else { /* No - dissect as unknown. */ - proto_tree_add_item(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,ENC_ASCII|ENC_NA); + proto_tree_add_item(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,ENC_ASCII); proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+8,-1,ENC_NA); } return tvb_captured_length(tvb); @@ -255,7 +255,7 @@ static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, pr if (tvb_reported_length_remaining(tvb, offset + 4) != 0) { proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 4, 4, ENC_NA); - proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 8, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 8, -1, ENC_ASCII); } } @@ -357,7 +357,7 @@ static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 1, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 5, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 5, -1, ENC_ASCII); } static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 42e474d93b..b8645ffc8d 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -192,7 +192,7 @@ dissect_syslog_message(proto_tree* tree, tvbuff_t* tvb, guint offset) offset += 3; proto_tree_add_item(tree, hf_syslog_msgid_utf8, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_UTF_8); } else { - proto_tree_add_item(tree, hf_syslog_msgid, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_syslog_msgid, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); } } @@ -208,7 +208,7 @@ dissect_rfc3164_syslog_message(proto_tree* tree, tvbuff_t* tvb, guint offset) if (tvb_get_guint8(tvb, offset + 3) == ' ' && tvb_get_guint8(tvb, offset + 6) == ' ' && tvb_get_guint8(tvb, offset + 9) == ':' && tvb_get_guint8(tvb, offset + 12) == ':' && tvb_get_guint8(tvb, offset + 15) == ' ') { - proto_tree_add_item(tree, hf_syslog_timestamp_old, tvb, offset, 15, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_syslog_timestamp_old, tvb, offset, 15, ENC_ASCII); offset += 16; } else { return; @@ -220,12 +220,12 @@ dissect_rfc3164_syslog_message(proto_tree* tree, tvbuff_t* tvb, guint offset) guint8 octet; octet = tvb_get_guint8(tvb, tvb_offset); if (!g_ascii_isalnum(octet)){ - proto_tree_add_item(tree, hf_syslog_procid, tvb, offset, tvb_offset - offset, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_syslog_procid, tvb, offset, tvb_offset - offset, ENC_ASCII); offset = tvb_offset; break; } } - proto_tree_add_item(tree, hf_syslog_msgid, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_syslog_msgid, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); } /* The message format is defined in RFC 3164 */ diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index b3b7e15d52..e4696146ab 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -158,8 +158,8 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ { proto_tree_add_item_ret_uint(tacacs_tree, hf_tacacs_userlen, tvb, 4, 1, ENC_NA, &userlen); proto_tree_add_item_ret_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1, ENC_NA, &passlen); - proto_tree_add_item(tacacs_tree, hf_tacacs_username, tvb, 6, userlen, ENC_ASCII|ENC_NA); - proto_tree_add_item(tacacs_tree, hf_tacacs_password, tvb, 6+userlen, passlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tacacs_tree, hf_tacacs_username, tvb, 6, userlen, ENC_ASCII); + proto_tree_add_item(tacacs_tree, hf_tacacs_password, tvb, 6+userlen, passlen, ENC_ASCII); } else { @@ -181,8 +181,8 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree_add_item(tacacs_tree, hf_tacacs_result3, tvb, 24, 2, ENC_BIG_ENDIAN); if (type!=TACACS_RESPONSE) { - proto_tree_add_item(tacacs_tree, hf_tacacs_username, tvb, 26, userlen, ENC_ASCII|ENC_NA); - proto_tree_add_item(tacacs_tree, hf_tacacs_password, tvb, 26+userlen, passlen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tacacs_tree, hf_tacacs_username, tvb, 26, userlen, ENC_ASCII); + proto_tree_add_item(tacacs_tree, hf_tacacs_password, tvb, 26+userlen, passlen, ENC_ASCII); } } } @@ -420,7 +420,7 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs proto_tree_add_uint(tree, hf_tacplus_user_len, tvb, offset, 1, val); if( val ){ - proto_tree_add_item(tree, hf_tacplus_user, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_user, tvb, var_off, val, ENC_ASCII); var_off+=val; } offset++; @@ -430,7 +430,7 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs val=tvb_get_guint8(tvb,offset); proto_tree_add_uint(tree, hf_tacplus_port_len, tvb, offset, 1, val); if( val ){ - proto_tree_add_item(tree, hf_tacplus_port, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_port, tvb, var_off, val, ENC_ASCII); var_off+=val; } offset++; @@ -439,7 +439,7 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs val=tvb_get_guint8(tvb,offset); proto_tree_add_uint(tree, hf_tacplus_remote_address_len, tvb, offset, 1, val); if( val ){ - proto_tree_add_item(tree, hf_tacplus_remote_address, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_remote_address, tvb, var_off, val, ENC_ASCII); var_off+=val; } return var_off; @@ -462,7 +462,7 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ case TAC_PLUS_AUTHEN_TYPE_PAP: proto_tree_add_item(tree, hf_tacplus_password_length, tvb, AUTHEN_S_DATA_LEN_OFF, 1, ENC_BIG_ENDIAN); if( val ) { - proto_tree_add_item(tree, hf_tacplus_auth_password, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_auth_password, tvb, var_off, val, ENC_ASCII); } break; @@ -474,9 +474,9 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "CHAP Data" ); proto_tree_add_item(pt, hf_tacplus_chap_id, tvb, var_off, 1, ENC_BIG_ENDIAN); var_off++; - proto_tree_add_item(pt, hf_tacplus_chap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_challenge, tvb, var_off, chal_len, ENC_ASCII); var_off+=chal_len; - proto_tree_add_item(pt, hf_tacplus_chap_response, tvb, var_off, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_response, tvb, var_off, 16, ENC_ASCII); } break; case TAC_PLUS_AUTHEN_TYPE_MSCHAP: @@ -487,9 +487,9 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "MSCHAP Data" ); proto_tree_add_item(pt, hf_tacplus_mschap_id, tvb, var_off, 1, ENC_BIG_ENDIAN); var_off++; - proto_tree_add_item(pt, hf_tacplus_mschap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_challenge, tvb, var_off, chal_len, ENC_ASCII); var_off+=chal_len; - proto_tree_add_item(pt, hf_tacplus_mschap_response, tvb, var_off, 49, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_response, tvb, var_off, 49, ENC_ASCII); } break; case TAC_PLUS_AUTHEN_TYPE_ARAP: @@ -497,11 +497,11 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ if( val ) { proto_tree *pt; pt = proto_tree_add_subtree(tree, tvb, var_off, val, ett_tacplus_body_chap, NULL, "ARAP Data" ); - proto_tree_add_item(pt, hf_tacplus_arap_nas_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_nas_challenge, tvb, var_off, 8, ENC_ASCII); var_off+=8; - proto_tree_add_item(pt, hf_tacplus_arap_remote_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_remote_challenge, tvb, var_off, 8, ENC_ASCII); var_off+=8; - proto_tree_add_item(pt, hf_tacplus_arap_remote_response, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_remote_response, tvb, var_off, 8, ENC_ASCII); } break; @@ -548,7 +548,7 @@ dissect_tacplus_body_authen_req_cont( tvbuff_t *tvb, proto_tree *tree ) val=tvb_get_ntohs( tvb, AUTHEN_C_USER_LEN_OFF ); proto_tree_add_uint(tree, hf_tacplus_body_authen_req_cont_user_length, tvb, AUTHEN_C_USER_LEN_OFF, 2, val); if( val ){ - proto_tree_add_item(tree, hf_tacplus_body_authen_req_cont_user, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_authen_req_cont_user, tvb, var_off, val, ENC_ASCII); var_off+=val; } @@ -579,7 +579,7 @@ dissect_tacplus_body_authen_rep( tvbuff_t *tvb, proto_tree *tree ) proto_tree_add_uint(tree, hf_tacplus_body_authen_rep_server_msg_len, tvb, AUTHEN_R_SRV_MSG_LEN_OFF, 2, val); if( val ) { - proto_tree_add_item(tree, hf_tacplus_body_authen_rep_server_msg, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_authen_rep_server_msg, tvb, var_off, val, ENC_ASCII); var_off+=val; } @@ -677,7 +677,7 @@ dissect_tacplus_body_acct_rep( tvbuff_t* tvb, proto_tree *tree ) val=tvb_get_ntohs( tvb, ACCT_R_SRV_MSG_LEN_OFF ); proto_tree_add_item(tree, hf_tacplus_body_acct_server_msg_len, tvb, ACCT_R_SRV_MSG_LEN_OFF, 2, ENC_BIG_ENDIAN); if( val ) { - proto_tree_add_item(tree, hf_tacplus_body_acct_server_msg, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_acct_server_msg, tvb, var_off, val, ENC_ASCII); var_off+=val; } @@ -685,7 +685,7 @@ dissect_tacplus_body_acct_rep( tvbuff_t* tvb, proto_tree *tree ) val=tvb_get_ntohs( tvb, ACCT_R_DATA_LEN_OFF ); proto_tree_add_item(tree, hf_tacplus_body_acct_data_len, tvb, ACCT_R_DATA_LEN_OFF, 2, ENC_BIG_ENDIAN); if( val ) { - proto_tree_add_item(tree, hf_tacplus_body_acct_data, tvb, var_off, val, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tacplus_body_acct_data, tvb, var_off, val, ENC_ASCII); } } diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 4b142f3a8d..86337b2ede 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -260,7 +260,7 @@ dissect_tapa_discover_unknown_new_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_t if (is_ascii) proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuetext, - tvb, offset, item_length, ENC_ASCII|ENC_NA); + tvb, offset, item_length, ENC_ASCII); else proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuehex, tvb, offset, item_length, ENC_NA); diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index b3a12d6724..92274529a5 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2799,7 +2799,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, ENC_UTF_16|ENC_LITTLE_ENDIAN); break; case TDS_DATA_TYPE_TEXT: - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, ENC_ASCII); break; default: /*TODO*/ proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA); @@ -2878,7 +2878,7 @@ dissect_tds5_lang_token(tvbuff_t *tvb, guint offset, proto_tree *tree, tds_conv_ cur += 1; len -= 1; - proto_tree_add_item(tree, hf_tds_lang_language_text, tvb, cur, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tds_lang_language_text, tvb, cur, len, ENC_ASCII); cur += len; return cur - offset; @@ -4248,7 +4248,7 @@ dissect_tds45_remotepassword(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } if (server_len > 0) { proto_tree_add_item(rempw_tree, hf_tdslogin_rempw_servername, tvb, - offset + cur + 1, server_len, ENC_ASCII|ENC_NA); + offset + cur + 1, server_len, ENC_ASCII); } length_item = proto_tree_add_item_ret_uint(rempw_tree, hf_tdslogin_rempw_password_length, tvb, offset + cur + 1 + server_len, 1, ENC_NA, &password_len); @@ -4259,7 +4259,7 @@ dissect_tds45_remotepassword(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } if (password_len > 0) { proto_tree_add_item(rempw_tree, hf_tdslogin_rempw_password, tvb, - offset + cur + 1 + server_len + 1, password_len, ENC_ASCII|ENC_NA); + offset + cur + 1 + server_len + 1, password_len, ENC_ASCII); } cur += (1 + server_len + 1 + password_len); } @@ -6401,7 +6401,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tds_conv_in case TDS_PROTOCOL_5: len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_tds_rpc_name_length8, tvb, offset, 1, ENC_NA); - proto_tree_add_item(tree, hf_tds_rpc_name, tvb, offset + 1, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tds_rpc_name, tvb, offset + 1, len, ENC_ASCII); offset += 1 + len; break; diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 4868ccbab0..0b934d6dea 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -623,13 +623,13 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree, wmem_allo proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; tvb_get_stringz_enc(pool, tvb, offset, &string_len, ENC_ASCII); - proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset, string_len, ENC_ASCII); offset+=string_len; tvb_get_stringz_enc(pool, tvb, offset, &string_len, ENC_ASCII); - proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset, string_len, ENC_ASCII); offset+=string_len; tvb_get_stringz_enc(pool, tvb, offset, &string_len, ENC_ASCII); - proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset, string_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset, string_len, ENC_ASCII); offset+=string_len; } } diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 2c5aeeef1e..7c4ac2264e 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1149,7 +1149,7 @@ dissect_authentication_subopt(packet_info *pinfo, const char *optname _U_, tvbuf } break; case TN_AC_NAME: - proto_tree_add_item(tree, hf_telnet_auth_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_telnet_auth_name, tvb, offset, len, ENC_ASCII); break; } } @@ -1831,7 +1831,7 @@ telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len) */ linelen = next_offset - offset; - proto_tree_add_item(tree, hf_telnet_data, tvb, offset, linelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_telnet_data, tvb, offset, linelen, ENC_ASCII); offset = next_offset; } } diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 0a5f5a2cfd..232dda0dbd 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -275,9 +275,9 @@ tftp_dissect_options(tvbuff_t *tvb, packet_info *pinfo, int offset, ett_tftp_option, NULL, "Option: %s = %s", optionname, optionvalue); proto_tree_add_item(opt_tree, hf_tftp_option_name, tvb, offset, - option_len, ENC_ASCII|ENC_NA); + option_len, ENC_ASCII); proto_tree_add_item(opt_tree, hf_tftp_option_value, tvb, value_offset, - value_len, ENC_ASCII|ENC_NA); + value_len, ENC_ASCII); offset += option_len + value_len; @@ -452,7 +452,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_transfer_type, - tvb, offset, i1, ENC_ASCII|ENC_NA); + tvb, offset, i1, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", tvb_format_stringzpad(pinfo->pool, tvb, offset, i1)); @@ -478,7 +478,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_transfer_type, - tvb, offset, i1, ENC_ASCII|ENC_NA); + tvb, offset, i1, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", tvb_format_stringzpad(pinfo->pool, tvb, offset, i1)); @@ -692,7 +692,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, i1 = tvb_strsize(tvb, offset); proto_tree_add_item(tftp_tree, hf_tftp_error_string, tvb, offset, - i1, ENC_ASCII|ENC_NA); + i1, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", Message: %s", tvb_format_stringzpad(pinfo->pool, tvb, offset, i1)); diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c index cbfcc8d365..491230faab 100644 --- a/epan/dissectors/packet-thread.c +++ b/epan/dissectors/packet-thread.c @@ -1625,7 +1625,7 @@ dissect_thread_mc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_unknown, tvb, offset, tlv_len, ENC_NA); } else { /* Display it simply */ - proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_vendor_data, tvb, offset, tlv_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_vendor_data, tvb, offset, tlv_len, ENC_ASCII); } offset += tlv_len; } diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c index e0e6b1c0fc..6fea7df0b5 100644 --- a/epan/dissectors/packet-thrift.c +++ b/epan/dissectors/packet-thrift.c @@ -734,7 +734,7 @@ dissect_thrift_string_as_preferred(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_8); break; case DECODE_BINARY_AS_ASCII: - proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_ASCII); break; case DECODE_BINARY_AS_AUTO_UTF8: /* When there is no data at all, consider it a string diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index d3ee0a7a52..02662f99d8 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1091,7 +1091,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i if ((message_type == TIPCv2_RESET_MSG) || ((message_type == TIPCv2_STATE_MSG) && ((msg_size-(orig_hdr_size*4)) != 0))){ /* is allowed */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_instance, tipc_tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_instance, tipc_tvb, offset, -1, ENC_ASCII); /* the bearer instance string is padded with \0 to the next word boundry */ b_inst_strlen = tvb_strsize(tipc_tvb, offset); offset += b_inst_strlen; @@ -2002,7 +2002,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr switch (user) { case TIPC_LINK_PROTOCOL: - proto_tree_add_item(tipc_tree, hf_tipc_bearer_name, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(tipc_tree, hf_tipc_bearer_name, tvb, offset, -1, ENC_ASCII); break; case TIPC_CHANGEOVER_PROTOCOL: switch (msg_type) { diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index 16e0226e79..a0200d5f35 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -101,39 +101,39 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea if ( g_ascii_strcasecmp(field, "tivoconnect") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_flavor, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); } else if ( g_ascii_strcasecmp(field, "method") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_method, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); } else if ( g_ascii_strcasecmp(field, "platform") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_platform, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); } else if ( g_ascii_strcasecmp(field, "machine") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_machine, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); packet_machine = value; } else if ( g_ascii_strcasecmp(field, "identity") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_identity, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); packet_identity = value; } else if ( g_ascii_strcasecmp(field, "services") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_services, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); } else if ( g_ascii_strcasecmp(field, "swversion") == 0 ) { proto_tree_add_item(tivoconnect_tree, hf_tivoconnect_version, tvb, offset+fieldlen, - length-fieldlen-1, ENC_ASCII|ENC_NA); + length-fieldlen-1, ENC_ASCII); } else { /* unknown field! */ diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 4d267d6645..3ccdb4a784 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -2873,7 +2873,7 @@ dissect_ssl3_hnd_encrypted_exts(tvbuff_t *tvb, proto_tree *tree, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(tree, hf_tls_handshake_npn_selected_protocol, - tvb, offset, selected_protocol_len, ENC_ASCII|ENC_NA); + tvb, offset, selected_protocol_len, ENC_ASCII); offset += selected_protocol_len; padding_len = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 3be315070b..4464c4e53e 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -272,14 +272,14 @@ static gint dissect_counted_address(tvbuff_t *tvb, gint offset, packet_info *pin proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_tnef_attribute_display_name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tnef_attribute_display_name, tvb, offset, length, ENC_ASCII); offset += length; length = tvb_get_letohs(tvb, offset); proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_tnef_attribute_email_address, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_tnef_attribute_email_address, tvb, offset, length, ENC_ASCII); offset += length; return offset; @@ -564,10 +564,10 @@ static int dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi proto_tree_add_item(attr_tree, hf_tnef_version, tvb, offset, length, ENC_LITTLE_ENDIAN); break; case ATT_MESSAGE_CLASS: - proto_tree_add_item(attr_tree, hf_tnef_message_class, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_tnef_message_class, tvb, offset, length, ENC_ASCII); break; case ATT_ORIGINAL_MESSAGE_CLASS: - proto_tree_add_item(attr_tree, hf_tnef_original_message_class, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_tnef_original_message_class, tvb, offset, length, ENC_ASCII); break; case ATT_MAPI_PROPS: item = proto_tree_add_item(attr_tree, hf_tnef_mapi_props, tvb, offset, length, ENC_NA); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 1d3b40f3a1..9a48ef19d2 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -560,7 +560,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, prot } offset += 1; /* skip the 0 terminator */ proto_item_set_end(ti, tvb, offset); - proto_tree_add_item(data_tree, hf_tns_data_setp_cli_plat, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_tns_data_setp_cli_plat, tvb, offset, -1, ENC_ASCII); return; /* skip call_data_dissector */ } @@ -691,7 +691,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, prot proto_tree_add_item(data_tree, hf_tns_data_opi_version2_banner_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(data_tree, hf_tns_data_opi_version2_banner, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(data_tree, hf_tns_data_opi_version2_banner, tvb, offset, len, ENC_ASCII); offset += len + (skip == 1 ? 1 : 0); proto_tree_add_item(data_tree, hf_tns_data_opi_version2_vsnum, tvb, offset, 4, skip == 1 ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN); @@ -741,7 +741,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, prot /* Name */ if ( !(len == 0 || len == 2) ) /* Not empty (2 - SQLDeveloper specific sign). */ { - proto_tree_add_item(par_tree, hf_tns_data_opi_param_name, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(par_tree, hf_tns_data_opi_param_name, tvb, offset, len, ENC_ASCII); offset += len; } @@ -772,7 +772,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, prot proto_tree_add_item(par_tree, hf_tns_data_opi_param_length, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(par_tree, hf_tns_data_opi_param_value, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(par_tree, hf_tns_data_opi_param_value, tvb, offset, len, ENC_ASCII); offset += len; offset_prev = offset; /* Save offset to calculate rest of unused data */ @@ -941,7 +941,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo _U if ( cd_len > 0) { proto_tree_add_item(connect_tree, hf_tns_connect_data, tvb, - tns_offset+cd_offset, -1, ENC_ASCII|ENC_NA); + tns_offset+cd_offset, -1, ENC_ASCII); } } @@ -990,7 +990,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ if ( accept_len > 0) { proto_tree_add_item(accept_tree, hf_tns_accept_data, tvb, - tns_offset+accept_offset, -1, ENC_ASCII|ENC_NA); + tns_offset+accept_offset, -1, ENC_ASCII); } return; } @@ -1021,7 +1021,7 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ offset += 2; proto_tree_add_item(refuse_tree, hf_tns_refuse_data, tvb, - offset, -1, ENC_ASCII|ENC_NA); + offset, -1, ENC_ASCII); } @@ -1041,7 +1041,7 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 1; proto_tree_add_item(abort_tree, hf_tns_abort_data, tvb, - offset, -1, ENC_ASCII|ENC_NA); + offset, -1, ENC_ASCII); } @@ -1085,7 +1085,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo _ offset += 2; proto_tree_add_item(redirect_tree, hf_tns_redirect_data, tvb, - offset, -1, ENC_ASCII|ENC_NA); + offset, -1, ENC_ASCII); } static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tns_tree) diff --git a/epan/dissectors/packet-tsdns.c b/epan/dissectors/packet-tsdns.c index b14f063c16..0095b7b560 100644 --- a/epan/dissectors/packet-tsdns.c +++ b/epan/dissectors/packet-tsdns.c @@ -63,15 +63,15 @@ static int dissect_tsdns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo ti = proto_tree_add_item(tree, proto_tsdns, tvb, offset, -1, ENC_NA); tsdns_tree = proto_item_add_subtree(ti, ett_tsdns); - hidden_item = proto_tree_add_item(tsdns_tree, hf_tsdns_data, tvb, offset, -1, ENC_ASCII|ENC_NA); + hidden_item = proto_tree_add_item(tsdns_tree, hf_tsdns_data, tvb, offset, -1, ENC_ASCII); proto_item_set_hidden(hidden_item); if (request) { // request is DOMAIN\n\r\r\r\n hidden_item = proto_tree_add_boolean(tsdns_tree, hf_tsdns_request, tvb, 0, 0, 1); // using pLen - 5 as the last chars are \n\r\r\r\n which are just indicating the end of the request - proto_tree_add_item(tsdns_tree, hf_tsdns_request_domain, tvb, offset, pLen - 5, ENC_ASCII|ENC_NA); + proto_tree_add_item(tsdns_tree, hf_tsdns_request_domain, tvb, offset, pLen - 5, ENC_ASCII); } else { // response is IP:PORT hidden_item = proto_tree_add_boolean(tsdns_tree, hf_tsdns_response, tvb, 0, 0, 1); - address_item = proto_tree_add_item(tsdns_tree, hf_tsdns_response_address, tvb, offset, pLen, ENC_ASCII|ENC_NA); + address_item = proto_tree_add_item(tsdns_tree, hf_tsdns_response_address, tvb, offset, pLen, ENC_ASCII); gchar** splitAddress; splitAddress = wmem_strsplit(pinfo->pool, tvb_format_text(pinfo->pool, tvb, 0, pLen), ":", 1); // unsure if TSDNS also does IPv6... if (splitAddress == NULL || splitAddress[0] == NULL || splitAddress[1] == NULL) { diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 19b5f7901d..65d41d8c12 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -144,7 +144,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (tsp_tree) { proto_tree_add_item(tsp_tree, hf_tsp_name, tvb, 12, - -1, ENC_ASCII|ENC_NA); + -1, ENC_ASCII); } return tvb_captured_length(tvb); } diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index ab7d5a5e39..6c09b56f3f 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -150,7 +150,7 @@ dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat /* Since the frame size is limited this should work ok */ if (tvb_get_guint8(tvb, 0x14)>=0x20){ - name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, ENC_ASCII|ENC_NA); + name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, ENC_ASCII); network_tree = proto_item_add_subtree(name_item, ett_network); str_name=tvb_get_stringz_enc(pinfo->pool, tvb, 0x14, &str_len, ENC_ASCII); diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 27272b822d..37cb4b53fe 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -242,15 +242,15 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) break; case TZSP_DEVICE_NAME: - proto_tree_add_item(tag_tree, hf_device_name, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tag_tree, hf_device_name, tvb, pos, length, ENC_ASCII); break; case TZSP_CAPTURE_LOCATION: - proto_tree_add_item(tag_tree, hf_capture_location, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tag_tree, hf_capture_location, tvb, pos, length, ENC_ASCII); break; case TZSP_INFO: - proto_tree_add_item(tag_tree, hf_capture_info, tvb, pos, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tag_tree, hf_capture_info, tvb, pos, length, ENC_ASCII); break; case TZSP_CAPTURE_ID: diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c index 9c52dd1a0f..96fd82bfcd 100644 --- a/epan/dissectors/packet-u3v.c +++ b/epan/dissectors/packet-u3v.c @@ -1159,37 +1159,37 @@ dissect_u3v_register(guint64 addr, proto_tree *branch, tvbuff_t *tvb, gint offse break; case U3V_ABRM_MANUFACTURER_NAME: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Manufacturer_Name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Manufacturer_Name, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_MODEL_NAME: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Model_Name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Model_Name, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_FAMILY_NAME: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Family_Name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Family_Name, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_DEVICE_VERSION: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Device_Version, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Device_Version, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_MANUFACTURER_INFO: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Manufacturer_Info, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Manufacturer_Info, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_SERIAL_NUMBER: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_Serial_Number, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_Serial_Number, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_USER_DEFINED_NAME: if ( length <= 64 ) { - proto_tree_add_item(branch, hf_u3v_bootstrap_User_Defined_Name, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(branch, hf_u3v_bootstrap_User_Defined_Name, tvb, offset, length, ENC_ASCII); } break; case U3V_ABRM_DEVICE_CAPABILITY: diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index 04f94de7d6..0e5a962986 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.c @@ -252,7 +252,7 @@ static void _dissect_uaudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { proto_tree_add_item(uaudp_tree, hf_uaudp_startsig_reserved, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(uaudp_tree, hf_uaudp_startsig_filename, tvb, offset, tvb_strsize(tvb, offset)-1, ENC_ASCII|ENC_NA); + proto_tree_add_item(uaudp_tree, hf_uaudp_startsig_filename, tvb, offset, tvb_strsize(tvb, offset)-1, ENC_ASCII); break; } diff --git a/epan/dissectors/packet-ubdp.c b/epan/dissectors/packet-ubdp.c index e9a97e8afa..fe414bd7fc 100644 --- a/epan/dissectors/packet-ubdp.c +++ b/epan/dissectors/packet-ubdp.c @@ -185,10 +185,10 @@ dissect_ubdp(tvbuff_t *ubdp_tvb, packet_info *pinfo, proto_tree *tree, void *dat } break; case UB_FIRMWARE_FULL: - proto_tree_add_item(tlv_tree, hf_ubdp_firmware_full, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_firmware_full, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; case UB_USERNAME: - proto_tree_add_item(tlv_tree, hf_ubdp_username, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_username, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; case UB_UPTIME: if(ubdp_length == 4){ @@ -199,7 +199,7 @@ dissect_ubdp(tvbuff_t *ubdp_tvb, packet_info *pinfo, proto_tree *tree, void *dat } break; case UB_HOSTNAME: - proto_tree_add_item(tlv_tree, hf_ubdp_hostname, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_hostname, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; case UB_PRODUCT: uValue = tvb_get_string_enc(pinfo->pool, ubdp_tvb, offset, ubdp_length, ENC_ASCII); @@ -207,7 +207,7 @@ dissect_ubdp(tvbuff_t *ubdp_tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_string(tlv_tree, hf_ubdp_product, ubdp_tvb, offset, ubdp_length, uModel ? uModel : uValue); break; case UB_ESSID: - proto_tree_add_item(tlv_tree, hf_ubdp_ssid, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_ssid, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; case UB_WLAN_MODE: if(ubdp_length == 1){ @@ -244,10 +244,10 @@ dissect_ubdp(tvbuff_t *ubdp_tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_string(tlv_tree, hf_ubdp_model, ubdp_tvb, offset, ubdp_length, uModel ? uModel : uValue); break; case UB_FIRMWARE: - proto_tree_add_item(tlv_tree, hf_ubdp_firmware, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_firmware, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; case UB_PLATFORM_VERS: - proto_tree_add_item(tlv_tree, hf_ubdp_platform_vers, ubdp_tvb, offset, ubdp_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_ubdp_platform_vers, ubdp_tvb, offset, ubdp_length, ENC_ASCII); break; default: proto_tree_add_item(tlv_tree, hf_ubdp_generic, ubdp_tvb, offset, ubdp_length, ENC_NA); diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 53020f8cdc..6cda3641eb 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -1042,7 +1042,7 @@ ucp_handle_XSer(proto_tree *tree, tvbuff_t *tvb) len = len * 16 + AHex2Bin(intval); proto_tree_add_uint(tree, hf_xser_service, tvb, offset, 2, service); proto_tree_add_uint(tree, hf_xser_length, tvb, offset+2, 2, len); - proto_tree_add_item(tree, hf_xser_data, tvb, offset+4, len*2, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_xser_data, tvb, offset+4, len*2, ENC_ASCII); offset += 4 + (2 * len); } } diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 238ed1817f..f528553b27 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -152,7 +152,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_uint(tlv_tree, hf_udld_tlvlength, tvb, offset + TLV_LENGTH, 2, length); proto_tree_add_item(tlv_tree, hf_udld_device_id, tvb, offset + 4, - length - 4, ENC_ASCII|ENC_NA); + length - 4, ENC_ASCII); } offset += length; break; @@ -182,7 +182,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_uint(tlv_tree, hf_udld_tlvlength, tvb, offset + TLV_LENGTH, 2, length); proto_tree_add_item(tlv_tree, hf_udld_sent_through_interface, tvb, offset + 4, - real_length - 4, ENC_ASCII|ENC_NA); + real_length - 4, ENC_ASCII); } offset += real_length; break; diff --git a/epan/dissectors/packet-uftp.c b/epan/dissectors/packet-uftp.c index a1a89b82be..86d1199965 100644 --- a/epan/dissectors/packet-uftp.c +++ b/epan/dissectors/packet-uftp.c @@ -711,7 +711,7 @@ static void dissect_uftp_fileinfo_30(tvbuff_t *tvb, packet_info *pinfo, proto_tr offset += 2; proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_fsize, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, MAXPATHNAME, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, MAXPATHNAME, ENC_ASCII); offset += MAXPATHNAME; if (destcount > 0) { destlist = proto_tree_add_item(fileinfo_tree, hf_uftp_destlist, tvb, offset, destcount * 4, ENC_NA); @@ -767,7 +767,7 @@ static void dissect_uftp_fileinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 8; proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_ftstamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, MAXPATHNAME, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, MAXPATHNAME, ENC_ASCII); offset += MAXPATHNAME; if (destcount > 0) { destlist = proto_tree_add_item(fileinfo_tree, hf_uftp_destlist, tvb, offset, destcount * 4, ENC_NA); @@ -1370,7 +1370,7 @@ static void dissect_uftp_abort(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 2; proto_tree_add_item(abort_tree, hf_uftp_abort_host, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII); } static int dissect_uftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) diff --git a/epan/dissectors/packet-uftp4.c b/epan/dissectors/packet-uftp4.c index 5ce7838443..42337c3eb8 100644 --- a/epan/dissectors/packet-uftp4.c +++ b/epan/dissectors/packet-uftp4.c @@ -1290,10 +1290,10 @@ static void dissect_uftp_fileinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 4; proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_tstamp, tvb, offset, 8, ENC_TIME_SECS_USECS); offset += 8; - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, namelen, ENC_ASCII); offset += namelen; if (linklen > 0) { - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_link, tvb, offset, linklen, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_link, tvb, offset, linklen, ENC_ASCII); } destcount = (tvb_reported_length(tvb) - hlen) / 4; @@ -2148,7 +2148,7 @@ static void dissect_uftp_abort(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 1; proto_tree_add_item(abort_tree, hf_uftp_abort_clientid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII); } static int dissect_uftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) diff --git a/epan/dissectors/packet-uftp5.c b/epan/dissectors/packet-uftp5.c index a524994fde..aa0ad071f3 100644 --- a/epan/dissectors/packet-uftp5.c +++ b/epan/dissectors/packet-uftp5.c @@ -1288,10 +1288,10 @@ static void dissect_uftp_fileinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree tstamp = usec_to_nstime(tvb_get_ntoh64(tvb, offset)); proto_tree_add_time(fileinfo_tree, hf_uftp_fileinfo_tstamp, tvb, offset, 8, &tstamp); offset += 8; - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_name, tvb, offset, namelen, ENC_ASCII); offset += namelen; if (linklen > 0) { - proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_link, tvb, offset, linklen, ENC_ASCII|ENC_NA); + proto_tree_add_item(fileinfo_tree, hf_uftp_fileinfo_link, tvb, offset, linklen, ENC_ASCII); } destcount = (tvb_reported_length(tvb) - hlen) / 4; @@ -2118,7 +2118,7 @@ static void dissect_uftp_abort(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 1; proto_tree_add_item(abort_tree, hf_uftp_abort_clientid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(abort_tree, hf_uftp_abort_message, tvb, offset, -1, ENC_ASCII); } static int dissect_uftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 8cc2e8c175..bc09bd5f30 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -963,7 +963,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 10: /* UNC SGW Fully Qualified Domain/Host Name */ if ( ie_len > 0){ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_FQDN, tvb, ie_offset, ie_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_FQDN, tvb, ie_offset, ie_len, ENC_ASCII); }else{ proto_tree_add_expert(urr_ie_tree, pinfo, &ei_uma_fqdn_not_present, tvb, offset, 1); } @@ -1258,7 +1258,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * 3629 [50]. This means that the 1st octet of the UTF-8 string is coded in octet 4 and the * last octet of the UTF-8 string is coded in the last octet of this IE (octet n). */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_Service_name_value, tvb, ie_offset, ie_len -1, ENC_ASCII|ENC_NA); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_Service_name_value, tvb, ie_offset, ie_len -1, ENC_ASCII); break; case 62: /* 11.2.62 GAN Service Zone Information @@ -1271,7 +1271,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) str_len = tvb_get_guint8(tvb,ie_offset); ie_offset++; /* UMA Service Zone string, 1st character */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str, tvb, ie_offset, str_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_uma_service_zone_str, tvb, ie_offset, str_len, ENC_ASCII); break; /* 11.2.63 RTP Redundancy Configuration */ case 63: diff --git a/epan/dissectors/packet-usb-printer.c b/epan/dissectors/packet-usb-printer.c index bf08ec45f0..65d0803533 100644 --- a/epan/dissectors/packet-usb-printer.c +++ b/epan/dissectors/packet-usb-printer.c @@ -112,7 +112,7 @@ static gint dissect_usb_printer_ctl( offset += 2; if (dev_id_len > 2) { proto_tree_add_item(tree, hf_usb_printer_dev_id, - tvb, offset, dev_id_len-2, ENC_ASCII|ENC_NA); + tvb, offset, dev_id_len-2, ENC_ASCII); offset += dev_id_len-2; } /* XXX - expert info for invalid dev_id_len */ diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 09d5727d7d..5ec46fc7cb 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -1041,7 +1041,7 @@ dissect_resource_unavailable(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN); proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN); proto_item_append_text(ti_info, " %s (0x%x)", val_to_str_ext_const(info_element, &info_element_values_ext, "unknown info element"), info_element); - proto_tree_add_item(info_tree, hf_v52_res_unavailable, info_tvb, info_offset+2, info_element_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(info_tree, hf_v52_res_unavailable, info_tvb, info_offset+2, info_element_length, ENC_ASCII); } } diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 6514e647d0..a6df74fd3c 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -296,7 +296,7 @@ dissect_draft_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete proto_tree_add_item(parameter_tree, hf_draft_error_code, parameter_tvb, offset, MGMT_ERROR_CODE_LENGTH, ENC_BIG_ENDIAN); offset += MGMT_ERROR_CODE_LENGTH ; if( tvb_reported_length_remaining(parameter_tvb,offset) > 0 ) - proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,ENC_ASCII|ENC_NA); + proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,ENC_ASCII); } /*----------------------Error Indication (Draft)-------------------------------*/ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 9af2cfd6af..55360107d4 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -1143,7 +1143,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, return TRUE; /* we still hope to get a SERVER_VERSION message some day. Do not proceed yet */ proto_tree_add_item(tree, hf_vnc_server_proto_ver, tvb, 4, - 7, ENC_ASCII|ENC_NA); + 7, ENC_ASCII); per_conversation_info->server_proto_ver = g_ascii_strtod((char *)tvb_get_string_enc(wmem_packet_scope(), tvb, 4, 7, ENC_ASCII), NULL); per_conversation_info->server_port = pinfo->srcport; @@ -1160,7 +1160,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, return TRUE; /* we still hope to get a CLIENT_VERSION message some day. Do not proceed yet */ proto_tree_add_item(tree, hf_vnc_client_proto_ver, tvb, - 4, 7, ENC_ASCII|ENC_NA); + 4, 7, ENC_ASCII); per_conversation_info->client_proto_ver = g_ascii_strtod((char *)tvb_get_string_enc(wmem_packet_scope(), tvb, 4, 7, ENC_ASCII), NULL); @@ -1289,8 +1289,8 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, */ proto_tree_add_item(tree, hf_vnc_tight_tunnel_type_code, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_vnc_tight_tunnel_type_vendor, tvb, offset + 4, 4, ENC_ASCII|ENC_NA); - proto_tree_add_item(tree, hf_vnc_tight_tunnel_type_signature, tvb, offset + 8, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_vnc_tight_tunnel_type_vendor, tvb, offset + 4, 4, ENC_ASCII); + proto_tree_add_item(tree, hf_vnc_tight_tunnel_type_signature, tvb, offset + 8, 8, ENC_ASCII); offset += 16; } @@ -1491,7 +1491,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 4; proto_tree_add_item(tree, hf_vnc_auth_error, tvb, - offset, text_len, ENC_ASCII|ENC_NA); + offset, text_len, ENC_ASCII); } return TRUE; /* All versions: Do not continue @@ -1642,7 +1642,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_item(tree, hf_vnc_desktop_name, tvb, offset, desktop_name_len, - ENC_ASCII|ENC_NA); + ENC_ASCII); } if(per_conversation_info->tight_enabled == TRUE) @@ -2055,7 +2055,7 @@ vnc_client_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 4; proto_tree_add_item(tree, hf_vnc_client_cut_text, tvb, *offset, - text_len, ENC_ASCII|ENC_NA); + text_len, ENC_ASCII); *offset += text_len; } @@ -2575,7 +2575,7 @@ vnc_server_identity(tvbuff_t *tvb, gint *offset, proto_tree *tree, { VNC_BYTES_NEEDED(width); proto_tree_add_item(tree, hf_vnc_server_identity, - tvb, *offset, width, ENC_ASCII|ENC_NA); + tvb, *offset, width, ENC_ASCII); *offset += width; return 0; /* bytes_needed */ @@ -2672,16 +2672,16 @@ vnc_mirrorlink(tvbuff_t *tvb, packet_info *pinfo, gint *offset, case VNC_ML_EXT_CLIENT_EVENT_CONFIGURATION : VNC_BYTES_NEEDED(28); proto_tree_add_item(tree, hf_vnc_mirrorlink_keyboard_language, - tvb, *offset, 2, ENC_ASCII|ENC_NA); + tvb, *offset, 2, ENC_ASCII); *offset += 2; proto_tree_add_item(tree, hf_vnc_mirrorlink_keyboard_country, - tvb, *offset, 2, ENC_ASCII|ENC_NA); + tvb, *offset, 2, ENC_ASCII); *offset += 2; proto_tree_add_item(tree, hf_vnc_mirrorlink_ui_language, - tvb, *offset, 2, ENC_ASCII|ENC_NA); + tvb, *offset, 2, ENC_ASCII); *offset += 2; proto_tree_add_item(tree, hf_vnc_mirrorlink_ui_country, - tvb, *offset, 2, ENC_ASCII|ENC_NA); + tvb, *offset, 2, ENC_ASCII); *offset += 2; proto_tree_add_item(tree, hf_vnc_mirrorlink_knob_keys, tvb, *offset, 4, ENC_BIG_ENDIAN); @@ -2864,7 +2864,7 @@ vnc_mirrorlink(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 2; VNC_BYTES_NEEDED(num); proto_tree_add_item(tree, hf_vnc_mirrorlink_text, - tvb, *offset, num, ENC_ASCII|ENC_NA); + tvb, *offset, num, ENC_ASCII); *offset += num; break; @@ -3497,7 +3497,7 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, VNC_BYTES_NEEDED(text_len); proto_tree_add_item(tree, hf_vnc_server_cut_text, tvb, *offset, - text_len, ENC_ASCII|ENC_NA); + text_len, ENC_ASCII); *offset += text_len; return *offset; diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 5263408d63..c158d6c085 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -204,7 +204,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } if (auth_type == VRRP_AUTH_TYPE_SIMPLE_TEXT) { - proto_tree_add_item(vrrp_tree, hf_vrrp_auth_string, tvb, offset, VRRP_AUTH_DATA_LEN, ENC_ASCII|ENC_NA); + proto_tree_add_item(vrrp_tree, hf_vrrp_auth_string, tvb, offset, VRRP_AUTH_DATA_LEN, ENC_ASCII); offset += VRRP_AUTH_DATA_LEN; } else if (auth_type == VRRP_AUTH_TYPE_IP_MD5) { if (vrrp_len - offset >= 16) { diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c index 0d37efcf18..eea0d7a7da 100644 --- a/epan/dissectors/packet-vsip.c +++ b/epan/dissectors/packet-vsip.c @@ -938,7 +938,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t if (len > 0) { - proto_tree_add_item(tree, hf_vsip_PingResp_Subtype, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_vsip_PingResp_Subtype, tvb, offset, len, ENC_ASCII); offset += len; } diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 356593d4c2..f70853d4b7 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -159,7 +159,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(vtp_tree, hf_vtp_md_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -186,7 +186,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(vtp_tree, hf_vtp_md_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -208,7 +208,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(vtp_tree, hf_vtp_md_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_start_value, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -221,7 +221,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_item(vtp_tree, hf_vtp_md_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII|ENC_NA); + proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, 32, ENC_ASCII); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_pruning_first_vid, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -352,7 +352,7 @@ dissect_vlan_info(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tre /* VLAN name length appears to be rounded up to a multiple of 4. */ vlan_name_len = 4*((vlan_name_len + 3)/4); - proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name, tvb, offset, vlan_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name, tvb, offset, vlan_name_len, ENC_ASCII); offset += vlan_name_len; vlan_info_left -= vlan_name_len; diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 3cc42c2fbd..8e92f985e8 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -5052,7 +5052,7 @@ int dissect_wassp_tlv(proto_tree *wassp_tree, tvbuff_t *tvb, packet_info *pinfo, case EID_DHCP_HOST_NAME: // 382 case EID_MU_ECP_PW: // 385 case EID_MU_ECP_TOKEN: // 386 - proto_tree_add_item(tlv_tree, hf_wassp_tlv_value_string, tvb, offset + TLV_VALUE, length - 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(tlv_tree, hf_wassp_tlv_value_string, tvb, offset + TLV_VALUE, length - 4, ENC_ASCII); offset += length; break; diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index 9d229b51aa..b2422db5fb 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.c @@ -218,7 +218,7 @@ static void dissect_wlan_if_stats(guint32 starting_offset, proto_item *parent_tr /* two bytes of pad go here */ proto_tree_add_item(parent_tree, - hf_waveagent_ifwlanssid, tvb, starting_offset + 8, 32, ENC_ASCII|ENC_NA); + hf_waveagent_ifwlanssid, tvb, starting_offset + 8, 32, ENC_ASCII); /* 4 byte SSID length field not reported */ @@ -334,7 +334,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, hf_waveagent_iflinkspeed, tvb, starting_offset + 20, 4, ENC_BIG_ENDIAN); proto_tree_add_item(parent_tree, - hf_waveagent_ifdescription, tvb, starting_offset + 24, 128, ENC_ASCII|ENC_NA); + hf_waveagent_ifdescription, tvb, starting_offset + 24, 128, ENC_ASCII); /* 4 byte length field goes here - skip it */ @@ -458,7 +458,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, hf_waveagent_oidcode, tvb, starting_offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(parent_tree, - hf_waveagent_oidvalue, tvb, starting_offset + 12, 1024, ENC_ASCII|ENC_NA); + hf_waveagent_oidvalue, tvb, starting_offset + 12, 1024, ENC_ASCII); break; @@ -505,7 +505,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, current_offset = offset + iLoop * delta; bssIndex = proto_tree_add_item(parent_tree, - hf_waveagent_scanssid, tvb, current_offset, 32, ENC_ASCII|ENC_NA); + hf_waveagent_scanssid, tvb, current_offset, 32, ENC_ASCII); bss_tree = proto_item_add_subtree(bssIndex, ett_bss[iLoop]); @@ -747,7 +747,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, hf_waveagent_connecttype, tvb, starting_offset + 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(parent_tree, - hf_waveagent_scanssid, tvb, starting_offset + 12, 32, ENC_ASCII|ENC_NA); + hf_waveagent_scanssid, tvb, starting_offset + 12, 32, ENC_ASCII); num_bss_entries = tvb_get_ntohl(tvb, starting_offset + 142); @@ -802,13 +802,13 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, hf_waveagent_capimpl, tvb, starting_offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(parent_tree, - hf_waveagent_id, tvb, starting_offset + 4, 128, ENC_ASCII|ENC_NA); + hf_waveagent_id, tvb, starting_offset + 4, 128, ENC_ASCII); proto_tree_add_item(parent_tree, - hf_waveagent_bindtag, tvb, starting_offset + 136, 128, ENC_ASCII|ENC_NA); + hf_waveagent_bindtag, tvb, starting_offset + 136, 128, ENC_ASCII); proto_tree_add_item(parent_tree, - hf_waveagent_version, tvb, starting_offset + 268, 128, ENC_ASCII|ENC_NA); + hf_waveagent_version, tvb, starting_offset + 268, 128, ENC_ASCII); proto_tree_add_item(parent_tree, hf_waveagent_brokerip, tvb, starting_offset + 400, 4, ENC_BIG_ENDIAN); @@ -837,7 +837,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, case 0x82: /* Reserve request */ proto_tree_add_item(parent_tree, - hf_waveagent_bindtag, tvb, starting_offset, 128, ENC_ASCII|ENC_NA); + hf_waveagent_bindtag, tvb, starting_offset, 128, ENC_ASCII); proto_tree_add_item(parent_tree, hf_waveagent_brokerip, tvb, starting_offset + 132, 4, ENC_BIG_ENDIAN); @@ -932,7 +932,7 @@ static void dissect_wa_payload(guint32 starting_offset, proto_item *parent_tree, hf_waveagent_syserrno, tvb, starting_offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(parent_tree, - hf_waveagent_statusstring, tvb, starting_offset + 8, 128, ENC_ASCII|ENC_NA); + hf_waveagent_statusstring, tvb, starting_offset + 8, 128, ENC_ASCII); break; } diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 378e0eb048..f21aa5975e 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -7816,7 +7816,7 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, 1, publicid_len, publicid); } else { /* Public identifier in string table */ proto_tree_add_item (wbxml_tree, hf_wbxml_public_id_literal, - tvb, 1, publicid_len, ENC_ASCII|ENC_NA); + tvb, 1, publicid_len, ENC_ASCII); } offset = 1 + publicid_len; diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index e6975ae246..6ba43bc33d 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -126,7 +126,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * using other character encodings. */ if (is_query) { - expert_ti = proto_tree_add_item(whois_tree, hf_whois_query, tvb, 0, -1, ENC_ASCII|ENC_NA); + expert_ti = proto_tree_add_item(whois_tree, hf_whois_query, tvb, 0, -1, ENC_ASCII); if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { /* * From RFC3912, section 2: @@ -172,7 +172,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Put this line. */ proto_tree_add_item(whois_tree, hf_whois_answer, tvb, offset, - next_offset - offset, ENC_ASCII|ENC_NA); + next_offset - offset, ENC_ASCII); offset = next_offset; } } diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c index 6244e77847..1d8c9f9ddc 100644 --- a/epan/dissectors/packet-wifi-nan.c +++ b/epan/dissectors/packet-wifi-nan.c @@ -1223,7 +1223,7 @@ static void dissect_attr_country_code(proto_tree* attr_tree, tvbuff_t* tvb, gint offset) { guint sub_offset = offset + 3; - proto_tree_add_item(attr_tree, hf_nan_attr_country_code, tvb, sub_offset, 2, ENC_ASCII|ENC_NA); + proto_tree_add_item(attr_tree, hf_nan_attr_country_code, tvb, sub_offset, 2, ENC_ASCII); } static void diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 617701efbe..df02f2f0d6 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -507,7 +507,7 @@ static void dissect_listen_channel(proto_item *tlv_root, proto_item *tlv_item, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_country, tvb, - offset + 3, 3, ENC_ASCII|ENC_NA); + offset + 3, 3, ENC_ASCII); proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_oper_class, tvb, offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_number, tvb, @@ -523,7 +523,7 @@ static void dissect_operating_channel(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_country, tvb, - offset + 3, 3, ENC_ASCII|ENC_NA); + offset + 3, 3, ENC_ASCII); proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_oper_class, tvb, offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_number, tvb, @@ -541,7 +541,7 @@ static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb, guint8 num_chan; proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_country, tvb, - s_offset, 3, ENC_ASCII|ENC_NA); + s_offset, 3, ENC_ASCII); s_offset += 3; while (offset + 3 + slen > s_offset) { @@ -649,7 +649,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name, tvb, s_offset, nlen > attr_len ? attr_len : nlen, - ENC_ASCII|ENC_NA); + ENC_ASCII); if (nlen != attr_len) { expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute"); } @@ -704,7 +704,7 @@ static void dissect_wifi_p2p_group_id(proto_item *tlv_root, proto_item_append_text(tlv_item, ": %s", tvb_ether_to_str(wmem_packet_scope(), tvb, offset + 3)); s_offset += 6; proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_ssid, tvb, - s_offset, offset + 3 + slen - s_offset, ENC_ASCII|ENC_NA); + s_offset, offset + 3 + slen - s_offset, ENC_ASCII); } static void dissect_wifi_p2p_group_bssid(packet_info *pinfo, @@ -872,7 +872,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, item = proto_tree_add_item(tree, hf_p2p_attr_gi_dev_name, tvb, s_offset, nlen > attr_len ? attr_len : nlen, - ENC_ASCII|ENC_NA); + ENC_ASCII); if (nlen != attr_len) { expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute"); } @@ -927,7 +927,7 @@ static void dissect_oob_group_owner_negotiation_channel(proto_item *tlv_root, tvbuff_t *tvb, int offset) { proto_tree_add_item(tlv_root, hf_p2p_attr_oob_group_owner_negotiation_channel_country, tvb, - offset + 3, 3, ENC_ASCII|ENC_NA); + offset + 3, 3, ENC_ASCII); proto_tree_add_item(tlv_root, hf_p2p_attr_oob_group_owner_negotiation_channel_oper_class, tvb, offset + 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_root, hf_p2p_attr_oob_group_owner_negotiation_channel_number, tvb, @@ -959,7 +959,7 @@ static void dissect_session_information(proto_item *tlv_root, tvbuff_t *tvb, int offset, int slen) { proto_tree_add_item(tlv_root, hf_p2p_attr_session_information, tvb, - offset+3, slen, ENC_ASCII|ENC_NA); + offset+3, slen, ENC_ASCII); } @@ -1010,7 +1010,7 @@ static void dissect_advertised_service(proto_item *tlv_root, s_offset += 1; proto_tree_add_item(subtree, hf_p2p_attr_advertised_service_service_name, tvb, - s_offset, len_service_name, ENC_ASCII|ENC_NA); + s_offset, len_service_name, ENC_ASCII); s_offset += len_service_name; } @@ -1047,7 +1047,7 @@ static void dissect_persistent_group(proto_item *tlv_root, offset+3, 6, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_persistent_group_ssid, tvb, - offset+3+6, slen+6, ENC_ASCII|ENC_NA); + offset+3+6, slen+6, ENC_ASCII); } diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c index c1b9eb150b..52c53dfda7 100644 --- a/epan/dissectors/packet-wisun.c +++ b/epan/dissectors/packet-wisun.c @@ -820,7 +820,7 @@ dissect_wisun_netnameie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, subtree = proto_item_add_subtree(item, ett_wisun_netnameie); proto_tree_add_bitmask(subtree, tvb, 0, hf_wisun_wsie, ett_wisun_wsie_bitmap, wisun_format_nested_ie_short, ENC_LITTLE_ENDIAN); - proto_tree_add_item(subtree, hf_wisun_netnameie_name, tvb, 2, tvb_reported_length_remaining(tvb, 2), ENC_ASCII|ENC_NA); + proto_tree_add_item(subtree, hf_wisun_netnameie_name, tvb, 2, tvb_reported_length_remaining(tvb, 2), ENC_ASCII); col_append_sep_fstr(pinfo->cinfo, COL_INFO, ", ", "Netname: %s", tvb_get_string_enc(pinfo->pool, tvb, 2, tvb_reported_length_remaining(tvb, 2), ENC_ASCII)); diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 65d87feeb3..a57ce18732 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -798,7 +798,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U tvb, 38, 4, ENC_BIG_ENDIAN); proto_tree_add_item(wlccp_tree, hf_wlccp_hostname, - tvb, 44, 28, ENC_ASCII|ENC_NA); + tvb, 44, 28, ENC_ASCII); } /* if type = 0x4081 */ } /* if version == 0x00 */ @@ -2823,7 +2823,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _radius_user_name_length = _length - 23 - 4; - proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_ASCII); _offset += _radius_user_name_length; @@ -2940,7 +2940,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _radius_user_name_length = _length - 23 - 4; - proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(_tree, hf_wlccp_radius_user_name, _tvb, _offset, _radius_user_name_length, ENC_ASCII); _offset += _radius_user_name_length; break; diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 3422bf2a77..e2cc9e52e5 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1004,7 +1004,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_CONFIRMATION_URL4: /* max len is 64 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_confirmation_url4, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_confirmation_url4, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_confirmation_url4; if (tlv_len > 64) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1012,7 +1012,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_CONFIRMATION_URL6: /* max len is 76 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_confirmation_url6, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_confirmation_url6, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_confirmation_url6; if (tlv_len > 76) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1041,7 +1041,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_DEVICE_NAME: /* len <= 32, check ! */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_device_name, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_device_name, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_device_name; if ((tlv_len > 32) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1129,7 +1129,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_IDENTITY: /* check that tlv_len <= 80 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_identity, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_identity, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_identity; if ((tlv_len > 80) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1162,7 +1162,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_MANUFACTURER: /* check tlv_len <= 64 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_manufacturer, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_manufacturer, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_manufacturer; if ((tlv_len > 64) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1180,7 +1180,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_MODEL_NAME: /* check tlv_len <= 32 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_model_name, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_model_name, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_model_name; if ((tlv_len > 32) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1189,7 +1189,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_MODEL_NUMBER: /* check tlv_len <= 32 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_model_number, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_model_number, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_model_number; if ((tlv_len > 32) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1372,7 +1372,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_SERIAL_NUMBER: /* check tlv_len <= 32 bytes */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_serial_number, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_serial_number, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_serial_number; if ((tlv_len > 32) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); @@ -1387,7 +1387,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_SSID: /* check tlv_len <= 32 bytes */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ssid, tvb, offset+4, tlv_len, ENC_ASCII|ENC_NA); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_ssid, tvb, offset+4, tlv_len, ENC_ASCII); hfindex = hf_eapwps_tlv_ssid; if ((tlv_len > 32) && pinfo) expert_add_info_format(pinfo, tmp_item, &ei_eapwps_fmt_warn_too_long, fmt_warn_too_long, tlv_len); diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index 3b4565462e..2a063c143c 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -862,7 +862,7 @@ gint WrethIdentPacket(tvbuff_t *tvb, guint8 Offset, packet_info * pInfo, proto_t } /*BiosVersion*/ - proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationBiosVersion, tvb, Offset, 6, ENC_ASCII|ENC_NA); + proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationBiosVersion, tvb, Offset, 6, ENC_ASCII); /*Board Number*/ proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationBoardNumber, tvb, Offset + 6, 2, ENC_LITTLE_ENDIAN); @@ -1227,7 +1227,7 @@ gint WrethCodefMasterInfoDissection(tvbuff_t *tvb, guint8 Offset, packet_info * proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_CyclicFlux, tvb, Offset, 1, ENC_LITTLE_ENDIAN); Offset += 1; /*szProtocolName*/ - proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_szProtocolName, tvb, Offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_szProtocolName, tvb, Offset, 16, ENC_ASCII); Offset += 16; /*bMaxTypeEquipment*/ proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_MaxTypeEquipment, tvb, Offset, 1, ENC_LITTLE_ENDIAN); @@ -1289,10 +1289,10 @@ gint WrethCodefEquipmentInfoDissection(tvbuff_t *tvb, guint8 Offset, packet_info /*Free*/ Offset += 4; /*DllItemName*/ - proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_DllItemName, tvb, Offset, 14, ENC_ASCII|ENC_NA); + proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_DllItemName, tvb, Offset, 14, ENC_ASCII); Offset += 14; /*szEquipmentName*/ - proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_szEquipmentName, tvb, Offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(pWrethMailboxDataTree, hf_Wreth_Mail_Mastinf_szEquipmentName, tvb, Offset, 16, ENC_ASCII); Offset += 16; /*Free*/ Offset += 2; diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 83ceedd042..75d63c7ef6 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -4584,7 +4584,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset += len; /* ProvURL */ proto_tree_add_item (tree, hf_sir_prov_url, - tvb, offset, val_len, ENC_ASCII|ENC_NA); + tvb, offset, val_len, ENC_ASCII); offset += val_len; /* Number of entries in the CPITag list */ @@ -5098,7 +5098,7 @@ add_uri (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, tvb, URILenOffset, count, uriLen); proto_tree_add_item (tree, hf_wsp_header_uri, - tvb, URIOffset, uriLen, ENC_ASCII|ENC_NA); + tvb, URIOffset, uriLen, ENC_ASCII); str = tvb_format_text (pinfo->pool, tvb, URIOffset, uriLen); /* XXX - tvb_format_text(pinfo->pool, ) returns a pointer to a static text string diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index af18a2261c..ba5e23979c 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -553,7 +553,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun size = tvb_get_ntohs (tvb, offset); proto_tree_add_item(wtls_msg_type_item_sub_sub_tree, hf_wtls_hands_cli_hello_key_parameter_set, - tvb,offset,size+2,ENC_ASCII|ENC_NA); + tvb,offset,size+2,ENC_ASCII); offset+=size+2; client_size+=size+2; } @@ -682,7 +682,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun size = tvb_get_ntohs (tvb, offset); proto_tree_add_item(wtls_msg_type_item_sub_sub_tree, hf_wtls_hands_cli_hello_key_parameter_set, - tvb,offset,size+2,ENC_ASCII|ENC_NA); + tvb,offset,size+2,ENC_ASCII); offset+=size+2; client_size+=size+2; } @@ -989,7 +989,7 @@ dissect_wtls_handshake(proto_tree *tree, tvbuff_t *tvb, guint offset, guint coun size = tvb_get_ntohs (tvb, offset); proto_tree_add_item(wtls_msg_type_item_sub_tree, hf_wtls_hands_certificate_wtls_key_parameter_set, - tvb,offset,size+2,ENC_ASCII|ENC_NA); + tvb,offset,size+2,ENC_ASCII); offset+=size+2; client_size+=size+2; } diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 87d38d0068..537b7f6aad 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -174,15 +174,15 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* This is the protocol item */ case 0: - proto_tree_add_item(xcsl_tree, hf_xcsl_protocol_version, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xcsl_tree, hf_xcsl_protocol_version, tvb, offset, len, ENC_ASCII); break; /* This should be the transaction ID, if non-digit, it is treated as info */ case 1: if ( g_ascii_isdigit(str[0]) ) { - proto_tree_add_item(xcsl_tree, hf_xcsl_transaction_id, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xcsl_tree, hf_xcsl_transaction_id, tvb, offset, len, ENC_ASCII); } else { - proto_tree_add_item(xcsl_tree, hf_xcsl_information, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xcsl_tree, hf_xcsl_information, tvb, offset, len, ENC_ASCII); } col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",str); break; @@ -201,7 +201,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree code = val_to_str(result, xcsl_action_vals, "Unknown: %d"); /* Print result code and description */ - xcsl_item = proto_tree_add_item(xcsl_tree, hf_xcsl_result, tvb, offset, len, ENC_ASCII|ENC_NA); + xcsl_item = proto_tree_add_item(xcsl_tree, hf_xcsl_result, tvb, offset, len, ENC_ASCII); proto_item_append_text(xcsl_item, " (%s)", code); if (result != 0) @@ -210,7 +210,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } else { request = TRUE; - proto_tree_add_item(xcsl_tree, hf_xcsl_command, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xcsl_tree, hf_xcsl_command, tvb, offset, len, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", str); @@ -219,7 +219,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* This is a command parameter */ default: - proto_tree_add_item(xcsl_tree, hf_xcsl_parameter, tvb, offset, len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xcsl_tree, hf_xcsl_parameter, tvb, offset, len, ENC_ASCII); if ( request == TRUE ) { col_append_fstr(pinfo->cinfo, COL_INFO, ": %s ",str); diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 39f70cd683..ab3f820fe0 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -416,7 +416,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, switch (attr_type) { case XMCP_USERNAME: proto_tree_add_item(attr_tree, xmcp_attr_username, tvb, offset, - attr_length, ENC_ASCII|ENC_NA); + attr_length, ENC_ASCII); proto_item_append_text(attr_tree, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII)); /* @@ -486,14 +486,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, if (attr_length < 5) break; proto_tree_add_item(attr_tree, xmcp_attr_error_reason, tvb, (offset+4), - (attr_length - 4), ENC_ASCII|ENC_NA); + (attr_length - 4), ENC_ASCII); proto_item_append_text(attr_tree, " (%s)", tvb_get_string_enc(pinfo->pool, tvb, (offset+4), (attr_length-4), ENC_ASCII)); break; case XMCP_REALM: it = proto_tree_add_item(attr_tree, xmcp_attr_realm, tvb, offset, - attr_length, ENC_ASCII|ENC_NA); + attr_length, ENC_ASCII); { guint8 *realm; realm = tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII); @@ -506,13 +506,13 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; case XMCP_NONCE: proto_tree_add_item(attr_tree, xmcp_attr_nonce, tvb, offset, - attr_length, ENC_ASCII|ENC_NA); + attr_length, ENC_ASCII); proto_item_append_text(attr_tree, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII)); break; case XMCP_CLIENT_NAME: proto_tree_add_item(attr_tree, xmcp_attr_client_name, tvb, offset, - attr_length, ENC_ASCII|ENC_NA); + attr_length, ENC_ASCII); proto_item_append_text(attr_tree, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII)); col_append_fstr(pinfo->cinfo, COL_INFO, ", name \"%s\"", @@ -555,7 +555,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; case XMCP_CLIENT_LABEL: proto_tree_add_item(attr_tree, xmcp_attr_client_label, tvb, offset, - attr_length, ENC_ASCII|ENC_NA); + attr_length, ENC_ASCII); proto_item_append_text(attr_tree, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII)); col_append_fstr(pinfo->cinfo, COL_INFO, ", label \"%s\"", diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 72c561d2cc..57c2d28092 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -617,7 +617,7 @@ static void before_dtd_doctype(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t *name_tok = tok->sub->next->next->next->sub->sub; proto_tree *dtd_item = proto_tree_add_item(current_frame->tree, hf_doctype, name_tok->tvb, name_tok->offset, - name_tok->len, ENC_ASCII|ENC_NA); + name_tok->len, ENC_ASCII); proto_item_set_text(dtd_item, "%s", tvb_format_text(wmem_packet_scope(), tok->tvb, tok->offset, tok->len)); diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index e6f78d4c10..092eef5555 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -251,9 +251,9 @@ static int dissect_xot_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pkt_size = tvb_get_guint8(tvb, hdr_offset); proto_tree_add_uint_format_value(xot_tree, hf_xot_pvc_send_out_pkt_size, tvb, hdr_offset, 1, pkt_size, "2^%u", pkt_size); hdr_offset += 1; - proto_tree_add_item(xot_tree, hf_xot_pvc_init_itf_name, tvb, hdr_offset, init_itf_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xot_tree, hf_xot_pvc_init_itf_name, tvb, hdr_offset, init_itf_name_len, ENC_ASCII); hdr_offset += init_itf_name_len; - proto_tree_add_item(xot_tree, hf_xot_pvc_resp_itf_name, tvb, hdr_offset, resp_itf_name_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(xot_tree, hf_xot_pvc_resp_itf_name, tvb, hdr_offset, resp_itf_name_len, ENC_ASCII); } else { next_tvb = tvb_new_subset_length_caplen(tvb, offset, MIN(plen, tvb_captured_length_remaining(tvb, offset)), plen); diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 7672cde215..d454ae0a9f 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -856,7 +856,7 @@ dissect_xtp_diag(tvbuff_t *tvb, proto_tree *tree, guint32 offset) { offset += 4; /* message(n) */ proto_tree_add_item(xtp_subtree, hf_xtp_diag_msg, - tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); + tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII); return; } diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index df47e95cf2..c080cddde0 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -198,7 +198,7 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ yhoo_tree = proto_item_add_subtree(ti, ett_yhoo); proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb, - offset, 8, ENC_ASCII|ENC_NA); + offset, 8, ENC_ASCII); offset += 8; proto_tree_add_item(yhoo_tree, hf_yhoo_len, tvb, @@ -226,15 +226,15 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 4; proto_tree_add_item(yhoo_tree, hf_yhoo_nick1, tvb, - offset, 36, ENC_ASCII|ENC_NA); + offset, 36, ENC_ASCII); offset += 36; proto_tree_add_item(yhoo_tree, hf_yhoo_nick2, tvb, - offset, 36, ENC_ASCII|ENC_NA); + offset, 36, ENC_ASCII); offset += 36; proto_tree_add_item(yhoo_tree, hf_yhoo_content, tvb, -1, - offset, ENC_ASCII|ENC_NA); + offset, ENC_ASCII); } return TRUE; diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index dbccf5926a..2440f6c12c 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -444,9 +444,9 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* And add the key and value separately inside */ proto_tree_add_item(content_line_tree, hf_ymsg_content_line_key, tvb, - offset, keylen, ENC_ASCII|ENC_NA); + offset, keylen, ENC_ASCII); proto_tree_add_item(content_line_tree, hf_ymsg_content_line_value, tvb, - offset+keylen+2, vallen, ENC_ASCII|ENC_NA); + offset+keylen+2, vallen, ENC_ASCII); /* Move beyone key and value lines */ offset += keylen+2+vallen+2; diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c index fa913dd374..719c3feb6a 100644 --- a/epan/dissectors/packet-z3950.c +++ b/epan/dissectors/packet-z3950.c @@ -12998,7 +12998,7 @@ dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (marc_directory[dir_index].tag < 10) { proto_tree_add_item(field_tree, hf_marc_field_control, - tvb, offset, marc_directory[dir_index].length - 1, ENC_ASCII|ENC_NA); + tvb, offset, marc_directory[dir_index].length - 1, ENC_ASCII); offset += marc_directory[dir_index].length - 1; proto_tree_add_item(field_tree, hf_marc_field_terminator, tvb, offset, 1, ENC_ASCII); @@ -13024,12 +13024,12 @@ dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * MARC_SUBFIELD_INDICATOR); if (next_subfield >= 0) { proto_tree_add_item(field_tree, hf_marc_field_subfield, - tvb, offset, next_subfield - offset, ENC_ASCII|ENC_NA); + tvb, offset, next_subfield - offset, ENC_ASCII); offset += (next_subfield - offset); } else { proto_tree_add_item(field_tree, hf_marc_field_subfield, - tvb, offset, next_offset - offset, ENC_ASCII|ENC_NA); + tvb, offset, next_offset - offset, ENC_ASCII); offset = next_offset; } } while (offset < next_offset); diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 0215d3ecf0..feaf50e337 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1657,7 +1657,7 @@ static int dissect_zbip_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset += 1; /* Get and display the network ID. */ - proto_tree_add_item(beacon_tree, hf_zbip_beacon_network_id, tvb, offset, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(beacon_tree, hf_zbip_beacon_network_id, tvb, offset, 16, ENC_ASCII); ssid = tvb_get_string_enc(pinfo->pool, tvb, offset, 16, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID: %s", ssid); diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 58239cddce..1f2dc55ee8 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -1525,7 +1525,7 @@ zebra_interface(proto_tree *tree, tvbuff_t *tvb, int offset, { gint maclen; proto_tree_add_item(tree, hf_zebra_interface, - tvb, offset, INTERFACE_NAMSIZ, ENC_ASCII|ENC_NA); + tvb, offset, INTERFACE_NAMSIZ, ENC_ASCII); offset += INTERFACE_NAMSIZ; proto_tree_add_item(tree, hf_zebra_index, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index 2ce976eff0..68075c108c 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -115,7 +115,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, ENC_NA); ziop_tree = proto_item_add_subtree (ti, ett_ziop); - proto_tree_add_item(ziop_tree, hf_ziop_magic, tvb, offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(ziop_tree, hf_ziop_magic, tvb, offset, 4, ENC_ASCII); offset += 4; proto_tree_add_item(ziop_tree, hf_ziop_giop_version_major, tvb, offset, 1, ENC_BIG_ENDIAN); giop_version_major = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 7c981e59f9..59a89b2454 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -334,7 +334,7 @@ dissect_zrtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_item(zrtp_tree, hf_zrtp_sequence, tvb, prime_offset+2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree, hf_zrtp_cookie, tvb, prime_offset+4, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(zrtp_tree, hf_zrtp_cookie, tvb, prime_offset+4, 4, ENC_ASCII); proto_tree_add_item(zrtp_tree, hf_zrtp_source_id, tvb, prime_offset+8, 4, ENC_BIG_ENDIAN); @@ -350,7 +350,7 @@ dissect_zrtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tvb_memcpy(tvb, (void *)message_type, msg_offset+4, 8); message_type[8] = '\0'; - proto_tree_add_item(zrtp_msg_tree, hf_zrtp_msg_type, tvb, msg_offset+4, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(zrtp_msg_tree, hf_zrtp_msg_type, tvb, msg_offset+4, 8, ENC_ASCII); linelen = tvb_reported_length_remaining(tvb, msg_offset+12); @@ -469,7 +469,7 @@ dissect_Ping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { col_set_str(pinfo->cinfo, COL_INFO, "Ping Packet"); - proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_endpointhash, tvb, data_offset+4, 8, ENC_BIG_ENDIAN); } @@ -479,7 +479,7 @@ dissect_PingACK(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { col_set_str(pinfo->cinfo, COL_INFO, "PingACK Packet"); - proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_pingack_endpointhash, tvb, data_offset+4, 8, ENC_BIG_ENDIAN); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_endpointhash, tvb, data_offset+12, 8, ENC_BIG_ENDIAN); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_ssrc, tvb, data_offset+20, 4, ENC_BIG_ENDIAN); @@ -635,8 +635,8 @@ dissect_Hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { if (check_valid_version(version_str) == NULL) { col_set_str(pinfo->cinfo, COL_INFO, "Unsupported version of ZRTP protocol"); } - proto_tree_add_item(zrtp_tree, hf_zrtp_msg_version, tvb, msg_offset+12, 4, ENC_ASCII|ENC_NA); - proto_tree_add_item(zrtp_tree, hf_zrtp_msg_client_id, tvb, msg_offset+16, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(zrtp_tree, hf_zrtp_msg_version, tvb, msg_offset+12, 4, ENC_ASCII); + proto_tree_add_item(zrtp_tree, hf_zrtp_msg_client_id, tvb, msg_offset+16, 16, ENC_ASCII); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hash_image, tvb, msg_offset+32, 32, ENC_NA); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_zid, tvb, msg_offset+64, 12, ENC_NA); proto_tree_add_item(zrtp_tree, hf_zrtp_msg_sigcap, tvb, data_offset+0, 1, ENC_BIG_ENDIAN); diff --git a/tools/fix-encoding-args.pl b/tools/fix-encoding-args.pl index f124314a30..75a7e79c6b 100755 --- a/tools/fix-encoding-args.pl +++ b/tools/fix-encoding-args.pl @@ -94,7 +94,7 @@ my @types_STRING = "ENC_BIG_ENDIAN" => "ENC_ASCII", "ENC_NA" => "ENC_ASCII", - "ENC_ASCII|NA" => "ENC_ASCII", + "ENC_ASCII|ENC_NA" => "ENC_ASCII", "ENC_ASCII|ENC_LITTLE_ENDIAN" => "ENC_ASCII", "ENC_ASCII|ENC_BIG_ENDIAN" => "ENC_ASCII", |