diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-04-06 10:57:33 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-04-06 15:11:36 +0000 |
| commit | b40cb1adea4f0e5628435c65bb0a0e158241c214 (patch) | |
| tree | 48951903d86b8cd6814c90d53ca8805eb8f3de38 | |
| parent | 4a00ef22e3dedc65669b255f33cbf0348a2464f4 (diff) | |
Apply found fix-encoding-args.pl errors in the dissector directory.
I coincidentally found a few files with errors, so I thought it might be time to run it on the whole directory again.
Change-Id: Ia32e54b3b1b94e5a418ed758ea79807c8bc7e798
Reviewed-on: https://code.wireshark.org/review/978
Reviewed-by: Michael Mann <mmann78@netscape.net>
63 files changed, 313 insertions, 311 deletions
diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c index e439e6a101..9e02aacb2e 100644 --- a/asn1/atn-cm/packet-atn-cm-template.c +++ b/asn1/atn-cm/packet-atn-cm-template.c @@ -89,7 +89,7 @@ dissect_atn_cm( ti, ett_atn_cm); - /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */ + /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , ENC_NA); */ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */ /* determine whether it is uplink or downlink */ diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 455a1513d7..0445b29e05 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -592,7 +592,7 @@ dissect_atn_ulcs( tvb, 0, 0 , - FALSE); + ENC_NA); atn_ulcs_tree = proto_item_add_subtree( ti, diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 37bdd9c1cd..29558db577 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -1870,7 +1870,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb_ip_to_str(tvb, offset + 8)); if (tree) { - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* type */ @@ -1878,11 +1878,11 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 4; /* home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Care-of-Address */ - proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -1897,7 +1897,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb_ip_to_str(tvb, offset + 8)); if (tree) { - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* type */ @@ -1905,15 +1905,15 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 3; /* Reply Code */ - proto_tree_add_item(a11_tree, hf_a11_code, tvb, offset, 1, FALSE); + proto_tree_add_item(a11_tree, hf_a11_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Home Agent */ - proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -1927,7 +1927,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb_ip_to_str(tvb, offset + 8)); if (tree) { - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* type */ @@ -1949,19 +1949,19 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 1; /* lifetime */ - proto_tree_add_item(a11_tree, hf_a11_life, tvb, offset, 2, FALSE); + proto_tree_add_item(a11_tree, hf_a11_life, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; /* home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Home Agent */ - proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Care-of-Address */ - proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -1980,7 +1980,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -1988,19 +1988,19 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 1; /* Reply Code */ - proto_tree_add_item(a11_tree, hf_a11_code, tvb, offset, 1, FALSE); + proto_tree_add_item(a11_tree, hf_a11_code, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Registration Lifetime */ - proto_tree_add_item(a11_tree, hf_a11_life, tvb, offset, 2, FALSE); + proto_tree_add_item(a11_tree, hf_a11_life, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Home Agent */ - proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -2015,7 +2015,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb_ip_to_str(tvb, offset + 8)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -2026,11 +2026,11 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 3; /* Home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Home Agent */ - proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_haaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ @@ -2045,7 +2045,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb_get_guint8(tvb, offset + 3)); if (tree) { /* Add Subtree */ - ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, ENC_NA); a11_tree = proto_item_add_subtree(ti, ett_a11); /* Type */ @@ -2056,15 +2056,15 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset += 2; /* Ack Status */ - proto_tree_add_item(a11_tree, hf_a11_status, tvb, offset, 1, FALSE); + proto_tree_add_item(a11_tree, hf_a11_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Home address */ - proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_homeaddr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Care-of-Address */ - proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, FALSE); + proto_tree_add_item(a11_tree, hf_a11_coa, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Identifier - assumed to be an NTP time here */ diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index c4357e33c0..d6484a889c 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -172,13 +172,13 @@ dissect_UDPStatus(tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_server_version_beta, tvb, 12, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_server_version, tvb, 14, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_xilinx_version, tvb, 16, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 20, 6, ENC_BIG_ENDIAN); - proto_tree_add_item(debug_tree, hf_adwin_config_unused, tvb, 26, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 20, 6, ENC_NA); + proto_tree_add_item(debug_tree, hf_adwin_config_unused, tvb, 26, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_port16, tvb, 28, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_dhcp, tvb, 30, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_netmask_count, tvb, 31, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_gateway, tvb, 32, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(debug_tree, hf_adwin_config_unused, tvb, 36, 11, ENC_LITTLE_ENDIAN); + proto_tree_add_item(debug_tree, hf_adwin_config_unused, tvb, 36, 11, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_reply_broadcast, tvb, 47, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_scan_id, tvb, 48, 4, ENC_LITTLE_ENDIAN); } @@ -191,17 +191,17 @@ dissect_UDPExtStatus(tvbuff_t *tvb, proto_tree *adwin_tree) if (! adwin_tree) return; - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 0, 6, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 6, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 0, 6, ENC_NA); + 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_LITTLE_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_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_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 56, 8, ENC_LITTLE_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); /* add the processor type raw values to the tree, to allow filtering */ proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type, tvb, 64, 2, ENC_ASCII|ENC_NA); @@ -216,7 +216,7 @@ dissect_UDPExtStatus(tvbuff_t *tvb, proto_tree *adwin_tree) system_type = str_to_str(system_type, system_type_mapping, "Unknown (%s)"); proto_tree_add_text(adwin_tree, tvb, 66, 2, "System Type: %s", system_type); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 68, 364, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 68, 364, ENC_NA); } static void @@ -229,22 +229,22 @@ dissect_UDPMessage(tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_command, tvb, 0, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_version, tvb, 4, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 8, 6, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 14, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 8, 6, ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 14, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_server_ip, tvb, 16, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 20, 4, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_netmask, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 28, 4, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_gateway, tvb, 32, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 36, 4, ENC_LITTLE_ENDIAN); + 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_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_bootloader, tvb, 58, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 59, 5, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_description, tvb, 64, 16, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_date, tvb, 80, 8, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_revision, tvb, 88, 8, 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); /* add the processor type raw values to the tree, to allow filtering */ proto_tree_add_item(adwin_tree, hf_adwin_config_processor_type, tvb, 96, 2, ENC_ASCII|ENC_NA); @@ -269,9 +269,9 @@ dissect_UDPInitAck(tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree_add_item(adwin_tree, hf_adwin_config_pattern, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_reboot, tvb, 4, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 8, 6, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 14, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 16, 80, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 8, 6, ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 14, 2, ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 16, 80, ENC_NA); } static void @@ -286,9 +286,9 @@ 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_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 44, 6, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 50, 42, 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_mac, tvb, 44, 6, ENC_NA); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, 50, 42, ENC_NA); } static void @@ -299,7 +299,7 @@ dissect_UDPOut(tvbuff_t *tvb, proto_tree *adwin_tree) return; proto_tree_add_item(adwin_tree, hf_adwin_config_status, tvb, 0, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 4, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_mac, tvb, 4, 6, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_config_netmask, tvb, 10, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_gateway, tvb, 14, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_config_dhcp, tvb, 18, 2, ENC_LITTLE_ENDIAN); @@ -346,10 +346,10 @@ dissect_TCPFlashUpdate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, "Disable EEPROM Support"); return offset+length; } - proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 4, length, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_filename, tvb, 4, length, ENC_ASCII|ENC_NA); offset += length; length = tvb_strnlen(tvb, 4 + length, -1) + 1; - proto_tree_add_item(adwin_tree, hf_adwin_config_path, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_path, tvb, offset, length, ENC_ASCII|ENC_NA); offset += length; proto_tree_add_item(adwin_tree, hf_adwin_config_filesize, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -361,10 +361,10 @@ dissect_TCPFlashUpdate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_text(adwin_tree, tvb, offset, 4, "Update time: %s", abs_time_to_ep_str(&tmp_time, ABSOLUTE_TIME_LOCAL, TRUE)); offset += 4; - proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, offset, 128, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_unused, tvb, offset, 128, ENC_NA); offset += 128; length = tvb_length(tvb) - offset; - proto_tree_add_item(adwin_tree, hf_adwin_config_data, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_config_data, tvb, offset, length, ENC_NA); return tvb_length(tvb); } diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 12bc723b76..e4911200d5 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -622,8 +622,8 @@ 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_BIG_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 18, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_password, tvb, 8, 10, ENC_ASCII|ENC_NA); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 18, 2, ENC_NA); switch(instructionID) { case I_3PLUS1: @@ -633,32 +633,32 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(adwin_tree, hf_adwin_parameter, tvb, 24, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_val1, tvb, 28, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_val1f, tvb, 28, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_NA); break; case I_3P1_GET_PAR: proto_tree_add_item(adwin_tree, hf_adwin_parameter, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; case I_3P1_GET_MEMORY_INFO: case I_3P1_GET_DETAILED_MEM_INFO: proto_tree_add_item(adwin_tree, hf_adwin_mem_type, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; case I_3P1_START: case I_3P1_STOP: case I_3P1_CLEAR_PROCESS: proto_tree_add_item(adwin_tree, hf_adwin_process_no, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; case I_3P1_GET_DATA_LENGTH: proto_tree_add_item(adwin_tree, hf_adwin_data_no32, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; case I_3P1_CLEAR_FIFO: case I_3P1_GET_FIFO_EMPTY: case I_3P1_GET_FIFO_COUNT: proto_tree_add_item(adwin_tree, hf_adwin_fifo_no32, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; default: ; /* should not happen */ /* illegal values should be displayed properly @@ -668,25 +668,25 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo, case I_BOOT: proto_tree_add_item(adwin_tree, hf_adwin_memsize, tvb, 20, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_blocksize, tvb, 24, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_processor, tvb, 28, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_binfilesize, tvb, 32, 4, ENC_LITTLE_ENDIAN); break; case I_LOAD_BIN_FILE: - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 6, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_blocksize, tvb, 26, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_processor, tvb, 28, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_binfilesize, tvb, 32, 4, ENC_LITTLE_ENDIAN); break; case I_GET_WORKLOAD: proto_tree_add_item(adwin_tree, hf_adwin_instruction, tvb, 20, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_NA); break; case I_GET_DATA_TYPE: - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 4, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_data_no32, tvb, 24, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_start_index, tvb, 28, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_NA); break; case I_GET_DATA: case I_SET_DATA: @@ -701,50 +701,50 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(adwin_tree, hf_adwin_blocksize, tvb, 22, 2, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_start_index, tvb, 24, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 28, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 32, 4, ENC_NA); break; case I_GET_DATA_SMALL: - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 4, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_data_no16, tvb, 24, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_start_index, tvb, 28, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 32, 4, ENC_LITTLE_ENDIAN); break; case I_GET_PAR_ALL: proto_tree_add_item(adwin_tree, hf_adwin_start_index, tvb, 20, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; case I_SET_DATA_LAST_STATUS: proto_tree_add_item(adwin_tree, hf_adwin_data_packet_index, tvb, 20, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_NA); break; case I_GET_ARM_VERSION: proto_tree_add_item(adwin_tree, hf_adwin_armVersion, tvb, 20, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 12, ENC_NA); break; case I_GET_FIFO: case I_SET_FIFO: proto_tree_add_item(adwin_tree, hf_adwin_data_type, tvb, 20, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_fifo_no16, tvb, 24, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 6, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 32, 4, ENC_LITTLE_ENDIAN); break; case I_GET_FIFO_RETRY: case I_SET_FIFO_RETRY: proto_tree_add_item(adwin_tree, hf_adwin_data_type, tvb, 20, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_fifo_no16, tvb, 24, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 26, 2, ENC_NA); proto_tree_add_item(adwin_tree, hf_adwin_retry_packet_index, tvb, 28, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 32, 4, ENC_LITTLE_ENDIAN); break; case I_TEST_VERSION: - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 16, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 20, 16, ENC_NA); break; case I_GET_MEMORY: proto_tree_add_item(adwin_tree, hf_adwin_address, tvb, 20, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_count, tvb, 24, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 28, 8, ENC_NA); break; default: ; /* should not happen */ /* illegal values should be displayed properly by @@ -754,7 +754,7 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(adwin_debug_tree, hf_adwin_link_addr, tvb, 36, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_timeout, tvb, 40, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_debug_tree, hf_adwin_osys, tvb, 44, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 48, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 48, 4, ENC_NA); } @@ -821,7 +821,7 @@ dissect_UDPR1(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(adwin_tree, hf_adwin_val2, tvb, 12, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_val3, tvb, 16, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_val4, tvb, 20, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 8, ENC_LITTLE_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 8, ENC_NA); } static void @@ -999,7 +999,7 @@ dissect_GDSHP(tvbuff_t *tvb, packet_info *pinfo, SET_PACKET_TYPE(adwin_tree, APT_GDSHP); proto_tree_add_item(adwin_tree, hf_adwin_packet_index, tvb, 0, 4, ENC_BIG_ENDIAN); proto_tree_add_item(adwin_tree, hf_adwin_packet_no, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(adwin_tree, hf_adwin_unused, tvb, 8, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_tree, hf_adwin_unused, tvb, 8, 4, ENC_NA); if (! global_adwin_dissect_data) { proto_tree_add_text(adwin_debug_tree, tvb, 12, 336 * 4, "Data"); @@ -1064,7 +1064,7 @@ dissect_GDSHR(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_text(adwin_tree, tvb, 12, 12, "GDSH status: unknown code %d", is_range); } - proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 40, ENC_BIG_ENDIAN); + proto_tree_add_item(adwin_debug_tree, hf_adwin_unused, tvb, 24, 40, ENC_NA); } /* here we determine which type of packet is sent by looking at its diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index ae65955c26..2f5870427b 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -656,7 +656,7 @@ dissect_atn_cm( ti, ett_atn_cm); - /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , FALSE); */ + /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , ENC_NA); */ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */ /* determine whether it is uplink or downlink */ diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index bd193bfed1..edfdc2a61e 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -1988,7 +1988,7 @@ dissect_atn_ulcs( tvb, 0, 0 , - FALSE); + ENC_NA); atn_ulcs_tree = proto_item_add_subtree( ti, diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 0382a71142..a8151876c3 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -608,7 +608,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_ROOT_IDENTIFIER , 2, root_identifier_system_id_extension); proto_tree_add_item(root_id_tree, hf_bpdu_root_mac, tvb, - BPDU_ROOT_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_ROOT_IDENTIFIER + 2, 6, ENC_NA); } else { root_id_item = proto_tree_add_text(bpdu_tree, tvb, @@ -621,7 +621,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_ROOT_IDENTIFIER , 2, root_identifier_bridge_priority); proto_tree_add_item(root_id_tree, hf_bpdu_root_mac, tvb, - BPDU_ROOT_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_ROOT_IDENTIFIER + 2, 6, ENC_NA); } /* end of Identifier formatting */ @@ -646,7 +646,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_BRIDGE_IDENTIFIER , 2, bridge_identifier_system_id_extension); proto_tree_add_item(bridge_id_tree, hf_bpdu_bridge_mac, tvb, - BPDU_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } else { bridge_id_item = proto_tree_add_text(bpdu_tree, tvb, BPDU_BRIDGE_IDENTIFIER, 8, @@ -658,7 +658,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_BRIDGE_IDENTIFIER , 2, bridge_identifier_bridge_priority); proto_tree_add_item(bridge_id_tree, hf_bpdu_bridge_mac, tvb, - BPDU_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } /* end of Identifier formatting */ @@ -803,7 +803,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_CIST_BRIDGE_IDENTIFIER , 2, cist_bridge_identifier_system_id_extension); proto_tree_add_item(cist_bridge_id_tree, hf_bpdu_cist_bridge_mac, tvb, - BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } else { cist_bridge_id_item = proto_tree_add_text(mstp_tree, tvb, @@ -816,7 +816,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp BPDU_CIST_BRIDGE_IDENTIFIER , 2, cist_bridge_identifier_bridge_priority); proto_tree_add_item(cist_bridge_id_tree, hf_bpdu_cist_bridge_mac, tvb, - BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } /* end of Identifier formatting */ @@ -847,7 +847,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp ALT_BPDU_CIST_BRIDGE_IDENTIFIER , 2, cist_bridge_identifier_system_id_extension); proto_tree_add_item(cist_bridge_id_tree, hf_bpdu_cist_bridge_mac, tvb, - ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } else { cist_bridge_id_item = proto_tree_add_text(mstp_tree, tvb, ALT_BPDU_CIST_BRIDGE_IDENTIFIER, 8, @@ -859,7 +859,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp ALT_BPDU_CIST_BRIDGE_IDENTIFIER , 2, cist_bridge_identifier_bridge_priority); proto_tree_add_item(cist_bridge_id_tree, hf_bpdu_cist_bridge_mac, tvb, - ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_BIG_ENDIAN); + ALT_BPDU_CIST_BRIDGE_IDENTIFIER + 2, 6, ENC_NA); } /* end of Identifier formatting */ @@ -933,7 +933,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp /* pri, MSTID, Regional root */ hidden_item = proto_tree_add_item(msti_tree, hf_bpdu_msti_regional_root_mac, tvb, - offset + MSTI_REGIONAL_ROOT + 2, 6, ENC_BIG_ENDIAN); + offset + MSTI_REGIONAL_ROOT + 2, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(msti_tree, tvb, offset + MSTI_REGIONAL_ROOT, 8, @@ -1021,7 +1021,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp /* pri, MSTID, Regional root */ hidden_item = proto_tree_add_item(msti_tree, hf_bpdu_msti_regional_root_mac, tvb, - offset + ALT_MSTI_REGIONAL_ROOT + 2, 6, ENC_BIG_ENDIAN); + offset + ALT_MSTI_REGIONAL_ROOT + 2, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(msti_tree, tvb, offset + ALT_MSTI_REGIONAL_ROOT, 8, diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index d6306f9276..1afd1f0a20 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -1504,7 +1504,7 @@ lsarpc_dissect_element_lsa_LookupNames3_names_X(tvbuff_t *tvb _U_, int offset _U proto_tree *tree = NULL; int old_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_lsarpc_names, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_lsarpc_names, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_lsarpc_names); } offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, di, drep, lsarpc_dissect_element_lsa_LookupNames3_names_); diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index ecec159a47..98f85785e6 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -4069,7 +4069,7 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ tr = proto_item_add_subtree(it, ett_mapi_mapi_request); pdu_len = tvb_get_letohs(decrypted_tvb, 0); proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, FALSE); + proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); /* analyze contents */ offset = mapi_dissect_element_EcDoRpc_request__(decrypted_tvb, 0, pinfo, tr, di, drep); /* analyze mapi handles */ @@ -4117,7 +4117,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvbuff_t *tvb _U_, int of guint8 unknown; origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_req); } old_offset = offset; @@ -4153,7 +4153,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvbuff_t *tvb _U_, int offs guint32 mapitag; origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_GetProps_req); } old_offset = offset; @@ -4191,7 +4191,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int origin_offset = offset; old_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenMsgStore_req); } codepage = tvb_get_letohl(tvb, offset); @@ -4311,7 +4311,7 @@ mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet tr = proto_item_add_subtree(it, ett_mapi_mapi_response); pdu_len = tvb_get_letohs(decrypted_tvb, 0); proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, FALSE); + proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); /* Analyze contents */ offset = mapi_dissect_element_EcDoRpc_response__(decrypted_tvb, 0, pinfo, tr, di, drep); /* Analyze mapi handles */ @@ -4344,7 +4344,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int o guint16 unknown; origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_repl); } old_offset = offset; @@ -4368,7 +4368,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int off guint16 length; origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_GetProps_repl); } old_offset = offset; diff --git a/epan/dissectors/packet-dmx-sip.c b/epan/dissectors/packet-dmx-sip.c index 3a64ffd3ca..220dc9938e 100644 --- a/epan/dissectors/packet-dmx-sip.c +++ b/epan/dissectors/packet-dmx-sip.c @@ -90,7 +90,7 @@ dissect_dmx_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *checksum_tree; proto_tree *ti = proto_tree_add_item(tree, proto_dmx_sip, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); proto_tree *dmx_sip_tree = proto_item_add_subtree(ti, ett_dmx_sip); @@ -153,7 +153,7 @@ dissect_dmx_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (offset < byte_count) { proto_tree_add_item(dmx_sip_tree, hf_dmx_sip_reserved, tvb, - offset, byte_count - offset, ENC_BIG_ENDIAN); + offset, byte_count - offset, ENC_NA); offset += (byte_count - offset); } diff --git a/epan/dissectors/packet-dmx-test.c b/epan/dissectors/packet-dmx-test.c index c86e4f40d9..599e6e2319 100644 --- a/epan/dissectors/packet-dmx-test.c +++ b/epan/dissectors/packet-dmx-test.c @@ -64,13 +64,13 @@ dissect_dmx_test(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *item; proto_tree *ti = proto_tree_add_item(tree, proto_dmx_test, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); proto_tree *dmx_test_tree = proto_item_add_subtree(ti, ett_dmx_test); size = tvb_reported_length_remaining(tvb, offset); item = proto_tree_add_item(dmx_test_tree, hf_dmx_test_data, tvb, - offset, size, ENC_BIG_ENDIAN); + offset, size, ENC_NA); offset += size; if (size == DMX_TEST_PACKET_SIZE) { diff --git a/epan/dissectors/packet-dmx-text.c b/epan/dissectors/packet-dmx-text.c index 09f64211ab..0c19d508a6 100644 --- a/epan/dissectors/packet-dmx-text.c +++ b/epan/dissectors/packet-dmx-text.c @@ -59,7 +59,7 @@ dissect_dmx_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint size; proto_tree *ti = proto_tree_add_item(tree, proto_dmx_text, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); proto_tree *dmx_text_tree = proto_item_add_subtree(ti, ett_dmx_text); proto_tree_add_item(dmx_text_tree, hf_dmx_text_page_nr, tvb, @@ -73,7 +73,7 @@ dissect_dmx_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) size = tvb_reported_length_remaining(tvb, offset); proto_tree_add_item(dmx_text_tree, hf_dmx_text_string, tvb, - offset, size, ENC_BIG_ENDIAN); + offset, size, ENC_ASCII|ENC_NA); } } diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 01bb90e326..3e4d7f95e4 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -218,7 +218,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(tvb, offset, length - 1)); - proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_NA); + proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_ASCII|ENC_NA); } else expert_add_info(pinfo, tlv_length_item, &ei_dtp_tlv_length_invalid); diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index a5535cf16d..b7b7339aee 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -510,7 +510,7 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ /* We need the length here, hardcode the LOWADR_LEN = 21 */ - ti = proto_tree_add_item(elcom_tree, hf_elcom_initiator, tvb, offset, TOTAL_LEN, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(elcom_tree, hf_elcom_initiator, tvb, offset, TOTAL_LEN, ENC_NA); offset = dissect_lower_address(ti, ett_elcom_initiator, tvb, offset, hf_elcom_initiator_endian, hf_elcom_initiator_ip, @@ -519,7 +519,7 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_length_remaining(tvb, offset) <= 0) return; - ti = proto_tree_add_item(elcom_tree, hf_elcom_responder, tvb, offset, TOTAL_LEN, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(elcom_tree, hf_elcom_responder, tvb, offset, TOTAL_LEN, ENC_NA); offset = dissect_lower_address(ti, ett_elcom_responder, tvb, offset, hf_elcom_responder_endian, hf_elcom_responder_ip, diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 53a6c48fe6..a70d67f8e6 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1290,10 +1290,10 @@ dissect_tcpip_last_conflict(packet_info *pinfo, proto_tree *tree, proto_item *it } proto_tree_add_item(tree, hf_tcpip_lcd_acd_activity, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_NA); if ( tvb_get_guint8(tvb, offset) == 0 ) - proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_NA); else { /* Dissect ARP PDU, but don't have it change column info */ @@ -1441,7 +1441,7 @@ dissect_dlr_last_active_node_on_port_1(packet_info *pinfo, proto_tree *tree, pro } proto_tree_add_item(tree, hf_dlr_lanp1_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1457,7 +1457,7 @@ dissect_dlr_last_active_node_on_port_2(packet_info *pinfo, proto_tree *tree, pro } proto_tree_add_item(tree, hf_dlr_lanp2_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1478,7 +1478,7 @@ dissect_dlr_ring_protocol_participants_list(packet_info *pinfo, proto_tree *tree while ( pos < total_len) { proto_tree_add_item(tree, hf_dlr_rppl_dev_ip_addr, tvb, offset+pos, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_NA); pos+=10; } return total_len; @@ -1496,7 +1496,7 @@ dissect_dlr_active_supervisor_address(packet_info *pinfo, proto_tree *tree, prot } proto_tree_add_item(tree, hf_dlr_asa_supervisor_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1558,7 +1558,7 @@ dissect_dlr_active_gateway_address(packet_info *pinfo, proto_tree *tree, proto_i } proto_tree_add_item(tree, hf_dlr_aga_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -2326,7 +2326,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_item( dlr_tree, hf_dlr_supervisorprecedence, tvb, DLR_BE_SUPERVISOR_PRECEDENCE, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beaconinterval, tvb, DLR_BE_BEACON_INTERVAL, 4, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beacontimeout, tvb, DLR_BE_BEACON_TIMEOUT, 4, ENC_BIG_ENDIAN ); - proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_BIG_ENDIAN ); + proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_NA ); } else if ( dlr_frametype == DLR_FT_NEIGHBOR_REQ ) { diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index ccc7a0e4b1..6036a5e6bc 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -118,7 +118,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_NA); + expert_ti = proto_tree_add_item(finger_tree, hf_finger_query, tvb, 0, -1, ENC_ASCII|ENC_NA); if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { /* * From RFC742, Send a single "command line", ending with <CRLF>. @@ -131,7 +131,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_NA); + proto_tree_add_item(finger_tree, hf_finger_response, tvb, 0, -1, ENC_ASCII|ENC_NA); if (finger_trans->req_frame) { nstime_t ns; diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index a2a16bc941..d2e71b3bcb 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -155,7 +155,7 @@ dissect_string_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, pr format_text(string_value, strlen(string_value))); proto_tree_add_item(string_tree, hf_fdp_string_data, tvb, offset, length, ENC_NA); - proto_tree_add_item(string_tree, hf_fdp_string_text, tvb, offset, length, ENC_ASCII); + proto_tree_add_item(string_tree, hf_fdp_string_text, tvb, offset, length, ENC_ASCII|ENC_NA); return offset; } diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index dc37f3ebd8..018defa87e 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -389,7 +389,7 @@ dissect_gmtrailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void dissect_gmtlv(tvb, pinfo, gmhdr_tree, offset, length); if (extra_trailer) { - proto_tree_add_item(tree, hf_gmhdr_trailer, tvb, length + 5, extra_trailer, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gmhdr_trailer, tvb, length + 5, extra_trailer, ENC_NA); } } return tvblen; diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 543c8b2466..44fbcab4f0 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -304,7 +304,7 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_item(rh_tree, hf_gre_wccp_alternative_bucket_used, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rh_tree, hf_gre_wccp_redirect_header_valid, tvb, offset, 1, FALSE); + proto_tree_add_item(rh_tree, hf_gre_wccp_redirect_header_valid, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rh_tree, hf_gre_wccp_service_id, tvb, offset +1, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 3e7851c6ef..7de0afc560 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -2865,16 +2865,16 @@ dissect_gtpv2_authentication_quintuplets(tvbuff_t *tvb, proto_tree *tree, int of xres_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_xres_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_xres, tvb, offset, xres_len, ENC_BIG_ENDIAN); + proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_xres, tvb, offset, xres_len, ENC_NA); offset += xres_len; - proto_tree_add_item(auth_qui_tree, hf_gtpv2_ck, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(auth_qui_tree, hf_gtpv2_ck, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(auth_qui_tree, hf_gtpv2_ik, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(auth_qui_tree, hf_gtpv2_ik, tvb, offset, 16, ENC_NA); offset += 16; autn_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_autn_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_autn, tvb, offset, autn_len, ENC_BIG_ENDIAN); + proto_tree_add_item(auth_qui_tree, hf_gtpv2_mm_context_autn, tvb, offset, autn_len, ENC_NA); offset += autn_len; } @@ -2910,7 +2910,7 @@ dissect_gtpv2_authentication_quadruplets(tvbuff_t *tvb, proto_tree *tree, int of tvb_bytes_to_ep_str(tvb, offset, tmp)); offset += tmp; - proto_tree_add_item(tree, hf_gtpv2_mm_context_kasme, tvb, offset, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_mm_context_kasme, tvb, offset, 32, ENC_NA); offset += 32; } @@ -3127,10 +3127,10 @@ dissect_gtpv2_mm_context_utms_cq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr offset += 1; /* Octet 8 to 23 CK */ - proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_NA); offset += 16; /* Octet 24 to 39 IK */ - proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_NA); offset += 16; /* @@ -3334,10 +3334,10 @@ dissect_gtpv2_mm_context_utms_q(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(flag_tree, hf_gtpv2_spare, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Octet 8 to 23 CK */ - proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_NA); offset += 16; /* Octet 24 to 39 IK */ - proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_NA); offset += 16; /* @@ -3476,7 +3476,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset += 3; /* Octet 14-45 */ - proto_tree_add_item(tree, hf_gtpv2_mm_context_kasme, tvb, offset, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_mm_context_kasme, tvb, offset, 32, ENC_NA); offset += 32; qua_item = proto_tree_add_text(tree, tvb, offset, 0, "Authentication Quadruplets %u", nr_qua); @@ -3588,10 +3588,10 @@ dissect_gtpv2_mm_context_utms_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree_add_item(flag_tree, hf_gtpv2_spare, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* Octet 8 to 23 CK */ - proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ck, tvb, offset, 16, ENC_NA); offset += 16; /* Octet 24 to 39 IK */ - proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_ik, tvb, offset, 16, ENC_NA); offset += 16; if ( nr_qua ) @@ -3892,7 +3892,7 @@ dissect_gtpv2_F_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p xid_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, hf_gtpv2_bss_con_xid_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(sub_tree, hf_gtpv2_bss_con_xid, tvb, offset, xid_len, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_gtpv2_bss_con_xid, tvb, offset, xid_len, ENC_NA); } return; default: @@ -4872,7 +4872,7 @@ dissect_gtpv2_tmgi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot proto_item_append_text(item, "%012" G_GINT64_MODIFIER "x", tmgi); - proto_tree_add_item(tree, hf_gtpv2_mbms_service_id, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_gtpv2_mbms_service_id, tvb, offset, 3, ENC_NA); offset += 3; dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE); diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 841ef564c6..c7322ab7f0 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -399,7 +399,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); + proto_tree_add_item(hcast_tree, hf_hazelcast_name, tvb, offset, nameLength, ENC_ASCII|ENC_NA); offset += nameLength; } diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 1deb585605..7b05c2cef9 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -120,7 +120,7 @@ static const value_string chan_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_BIG_ENDIAN); + proto_tree_add_item(tree, hf_hpfeeds_errmsg, tvb, offset, -1, ENC_ASCII|ENC_NA); } static void @@ -142,11 +142,11 @@ 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_BIG_ENDIAN); + ENC_ASCII|ENC_NA); offset += len; proto_tree_add_item(data_subtree, hf_hpfeeds_nonce, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_NA); } static void @@ -159,11 +159,11 @@ 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_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; proto_tree_add_item(tree, hf_hpfeeds_secret, tvb, - offset, -1, ENC_BIG_ENDIAN); + offset, -1, ENC_NA); } static void @@ -180,7 +180,7 @@ dissect_hpfeeds_publish_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_hpfeeds_ident, tvb, offset, len, - ENC_BIG_ENDIAN); + ENC_ASCII|ENC_NA); offset += len; len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_hpfeeds_chan_len, tvb, offset, 1, @@ -192,7 +192,7 @@ dissect_hpfeeds_publish_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ strptr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); proto_tree_add_item(tree, hf_hpfeeds_channel, tvb, offset, len, - ENC_BIG_ENDIAN); + ENC_ASCII|ENC_NA); offset += len; channel = str_to_val(strptr, chan_vals, CH_EINVAL); pinfo->private_data = strptr; @@ -228,11 +228,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_BIG_ENDIAN); + ENC_ASCII|ENC_NA); /* move forward inside data */ offset += len; proto_tree_add_item(tree, hf_hpfeeds_channel, tvb, offset, -1, - ENC_BIG_ENDIAN); + ENC_ASCII|ENC_NA); } /* diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index d1731a84b6..d281d46a19 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -534,7 +534,7 @@ static void dissect_ice_params(packet_info *pinfo, proto_tree *tree, proto_item } /* encapsulated params */ - proto_tree_add_item(tree, hf_icep_params_encapsulated, tvb, offset, (size - ICEP_MIN_PARAMS_SIZE), ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_icep_params_encapsulated, tvb, offset, (size - ICEP_MIN_PARAMS_SIZE), ENC_NA); (*consumed) += (size - ICEP_MIN_PARAMS_SIZE); } diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 0ac0225bca..2cef13f582 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -1072,7 +1072,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, if (PINFO_FD_VISITED(pinfo)) { /* No response found - add field and expert info */ it = proto_tree_add_item(tree, hf_icmp_no_resp, NULL, 0, 0, - ENC_BIG_ENDIAN); + ENC_NA); PROTO_ITEM_SET_GENERATED(it); col_append_fstr(pinfo->cinfo, COL_INFO, " (no response found!)"); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 573c11349d..830ac7c278 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1648,7 +1648,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_NA); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_error_message, tvb, idx, avp_len, ENC_ASCII|ENC_NA); break; case PROTOCOL_VERSION: @@ -1756,14 +1756,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); + tvb, idx, avp_len, ENC_ASCII|ENC_NA); 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); + tvb, idx, avp_len, ENC_ASCII|ENC_NA); break; case SUB_ADDRESS: diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 995c57d991..acf36b5753 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -467,7 +467,7 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FIXME if "S func=GREJ", extend */ /* Create LAPSat tree */ - lapsat_ti = proto_tree_add_item(tree, proto_lapsat, tvb, 0, hlen, ENC_BIG_ENDIAN); + lapsat_ti = proto_tree_add_item(tree, proto_lapsat, tvb, 0, hlen, ENC_NA); lapsat_tree = proto_item_add_subtree(lapsat_ti, ett_lapsat); /* Dissect address field */ diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index f1bb8b7d4b..34c62e30ed 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -956,7 +956,7 @@ dissect_m3ap_IPAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, return offset; tvb_len = tvb_length(parameter_tvb); - proto_tree_add_item(tree, hf_m3ap_IPAddress, parameter_tvb, 0, tvb_len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_m3ap_IPAddress, parameter_tvb, 0, tvb_len, ENC_NA); return offset; diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 2ea46ec183..4c4d408318 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -953,7 +953,7 @@ static gint16 dissect_ip_addr(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tree { /*IPv6 Addr*/ len = tvb_get_guint8(tvb, offset + 3); - proto_tree_add_item(tlv_tree,hf_ipv6_addr, tvb, offset+2, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree,hf_ipv6_addr, tvb, offset+2, len, ENC_NA); return (offset+3+len); } else @@ -1648,13 +1648,13 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin switch(mihf_id_len) { case 12: /* checks if the length corresponds to a MAC address */ - proto_tree_add_item(tlv_tree, hf_mihf_id_mac, tvb_mihf_id, 0, mihf_id_len/2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_mihf_id_mac, tvb_mihf_id, 0, mihf_id_len/2, ENC_NA); break; case 64: /* checks if the length corresponds to an IPv4 address */ proto_tree_add_item(tlv_tree, hf_mihf_id_ipv4, tvb_mihf_id, 0, mihf_id_len/2, ENC_BIG_ENDIAN); break; case 128: /* checks if the length corresponds to an IPv6 address */ - proto_tree_add_item(tlv_tree, hf_mihf_id_ipv6, tvb_mihf_id, 0, mihf_id_len/2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_mihf_id_ipv6, tvb_mihf_id, 0, mihf_id_len/2, ENC_NA); break; } } diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index e68c419ff0..03a38fcd31 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -755,7 +755,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo, if (flags2 & PRIVATE_DATA_FLAG) { proto_tree_add_item(tree, hf_mpeg_pes_private_data, tvb, - offset, 16, ENC_BIG_ENDIAN); + offset, 16, ENC_NA); offset += 16; } if (flags2 & PACK_LENGTH_FLAG) { diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 9772d04249..6e26cbd199 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -767,23 +767,23 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto } if (tree) { proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_p2mp_id, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz1, - tvb, offset + 8, 2, FALSE); + tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id, - tvb, offset + 10, 2, FALSE); + tvb, offset + 10, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_fec_tree, tvb, offset + 12, 4, "Extended Tunnel ID: 0x%08X (%s)", tvb_get_ntohl(tvb, offset + 12), tvb_ip_to_str(tvb, offset + 12)); hidden_item = proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ext_tunnel_id, - tvb, offset + 12, 4, FALSE); + tvb, offset + 12, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ipv4_sender, - tvb, offset + 16, 4, FALSE); + tvb, offset + 16, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz2, - tvb, offset + 20, 2, FALSE); + tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_lsp_id, - tvb, offset + 22, 2, FALSE); + tvb, offset + 22, 2, ENC_BIG_ENDIAN); } break; @@ -797,23 +797,23 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto } if (tree) { proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_p2mp_id, - tvb, offset + 4, 16, FALSE); + tvb, offset + 4, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz1, - tvb, offset + 20, 2, FALSE); + tvb, offset + 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id, - tvb, offset + 22, 2, FALSE); + tvb, offset + 22, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_fec_tree, tvb, offset + 24, 16, "Extended Tunnel ID: 0x%s (%s)", tvb_bytes_to_ep_str(tvb, offset + 24, 16), tvb_ip6_to_str(tvb, offset + 24)); hidden_item = proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ext_tunnel_id, - tvb, offset + 24, 16, FALSE); + tvb, offset + 24, 16, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ipv6_sender, - tvb, offset + 40, 16, FALSE); + tvb, offset + 40, 16, ENC_NA); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ip_mbz2, - tvb, offset + 56, 2, FALSE); + tvb, offset + 56, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_lsp_id, - tvb, offset + 58, 2, FALSE); + tvb, offset + 58, 2, ENC_BIG_ENDIAN); } break; case TLV_FEC_STACK_STATIC_LSP: @@ -1165,7 +1165,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr "Empty (Multipath Length = 0)"); tlv_ddstlv_map_tree = proto_item_add_subtree(ddsti2, ett_mpls_echo_tlv_ddstlv_map); proto_tree_add_item(tlv_ddstlv_map_tree, hf_mpls_echo_sub_tlv_multipath_info, - tvb, offset + 4, multipath_length, ENC_BIG_ENDIAN); + tvb, offset + 4, multipath_length, ENC_NA); break; case TLV_MULTIPATH_IP_ADDRESS: @@ -1260,7 +1260,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_sub_tlv_multipath_length, tvb, offset + 1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_sub_tlv_multipath_value, tvb, - offset + 3, rem, ENC_BIG_ENDIAN); + offset + 3, rem, ENC_NA); break; } @@ -1329,7 +1329,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr tlv_dd_map_tree = proto_item_add_subtree(ddsti, ett_mpls_echo_tlv_dd_map); proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_tlv_dd_map_type, tvb, offset - 4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_tlv_dd_map_length, tvb, offset - 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_tlv_dd_map_value, tvb, offset, subtlv_length, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_dd_map_tree, hf_mpls_echo_tlv_dd_map_value, tvb, offset, subtlv_length, ENC_NA); rem -= subtlv_length; break; } @@ -1565,7 +1565,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_echo_jitter, - tvb, offset + 4, 4, FALSE); + tvb, offset + 4, 4, ENC_BIG_ENDIAN); break; case TLV_P2MP_RESPONDER_IDENT: { guint16 resp_ident_type, resp_ident_len; @@ -1584,13 +1584,13 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_type, - tvb, offset + 4, 2, FALSE); + tvb, offset + 4, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_len, tvb, - offset + 6, 2, FALSE); + offset + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_ipv4, - tvb, offset + 8, 4, FALSE); + tvb, offset + 8, 4, ENC_BIG_ENDIAN); break; case TLV_P2MP_RESPONDER_IDENT_IPV6_EGRESS_ADDR: case TLV_P2MP_RESPONDER_IDENT_IPV6_NODE_ADDR: @@ -1601,12 +1601,12 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; } proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_type, - tvb, offset + 4, 2, FALSE); + tvb, offset + 4, 2, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_len, - tvb, offset + 6, 2, FALSE); + tvb, offset + 6, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_responder_indent_ipv4, - tvb, offset + 8, 16, FALSE); + tvb, offset + 8, 16, ENC_BIG_ENDIAN); break; } break; diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 74e2e3543b..66fd7c6a39 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -523,82 +523,82 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case REQUEST_LINE: { col_set_str(pinfo->cinfo, COL_INFO, "Request: "); - line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Request_Line, tvb, offset, linelen, ENC_UTF_8); + line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Request_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA); request_line_item = proto_item_add_subtree(line_item, ett_Request_Line); /* version */ str_len = (gint)strlen(field1); - proto_tree_add_item(request_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(request_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* message length */ str_len = (gint)strlen(field2); - proto_tree_add_item(request_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(request_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* method name */ col_append_str(pinfo->cinfo, COL_INFO, field3); str_len = (gint)strlen(field3); - proto_tree_add_item(request_line_item, hf_mrcpv2_Method, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(request_line_item, hf_mrcpv2_Method, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* request ID */ str_len = (gint)strlen(field4); - proto_tree_add_item(request_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(request_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA); /*offset += str_len + 2;*/ /* add CRLF */ } break; case RESPONSE_LINE: { col_set_str(pinfo->cinfo, COL_INFO, "Response: "); - line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Response_Line, tvb, offset, linelen, ENC_UTF_8); + line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Response_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA); response_line_item = proto_item_add_subtree(line_item, ett_Response_Line); /* version */ str_len = (gint)strlen(field1); - proto_tree_add_item(response_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(response_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* message length */ str_len = (gint)strlen(field2); - proto_tree_add_item(response_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(response_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* request ID */ str_len = (gint)strlen(field3); - proto_tree_add_item(response_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(response_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* status code */ str_len = (gint)strlen(field4); status_code_item = proto_tree_add_item(response_line_item, hf_mrcpv2_status_code, tvb, offset, - str_len, ENC_UTF_8); + str_len, ENC_UTF_8|ENC_NA); proto_item_append_text(status_code_item, " %s", str_to_str(field4, status_code_vals, "Unknown Status Code")); offset += str_len + 1; /* add SP */ /* request state */ col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) %s", field4, field5); str_len = (gint)strlen(field5); - proto_tree_add_item(response_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(response_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8|ENC_NA); /*offset += str_len + 2;*/ /* add CRLF */ } break; case EVENT_LINE: { col_set_str(pinfo->cinfo, COL_INFO, "Event: "); - line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Event_Line, tvb, offset, linelen, ENC_UTF_8); + line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Event_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA); event_line_item = proto_item_add_subtree(line_item, ett_Event_Line); /* version */ str_len = (gint)strlen(field1); - proto_tree_add_item(event_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(event_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* message length */ str_len = (gint)strlen(field2); - proto_tree_add_item(event_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(event_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* event name */ col_append_str(pinfo->cinfo, COL_INFO, field3); str_len = (gint)strlen(field3); - proto_tree_add_item(event_line_item, hf_mrcpv2_Event, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(event_line_item, hf_mrcpv2_Event, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* request ID */ str_len = (gint)strlen(field4); - proto_tree_add_item(event_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(event_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len + 1; /* add SP */ /* request state */ str_len = (gint)strlen(field5); - proto_tree_add_item(event_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8); + proto_tree_add_item(event_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8|ENC_NA); /*offset += str_len + 2;*/ /* add CRLF */ } break; @@ -606,7 +606,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* mark whole packet as unknown and return */ col_set_str(pinfo->cinfo, COL_INFO, "UNKNOWN message"); - proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Message, tvb, offset, tvb_len, ENC_UTF_8); + proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Message, tvb, offset, tvb_len, ENC_UTF_8|ENC_NA); return tvb_len; } } @@ -636,7 +636,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) colon_offset = tvb_find_guint8(tvb, offset, linelen, ':'); if (colon_offset == -1) { /* header type should end with ':' */ - proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8); + proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA); continue; } header_name = tvb_get_string(wmem_packet_scope(), tvb, offset, colon_offset - offset); @@ -949,7 +949,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_string(mrcpv2_tree, hf_mrcpv2_Weight, tvb, offset, linelen, header_value); break; default: - proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8); + proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA); break; } } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 2e8c68d2dc..6428754adf 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -4324,12 +4324,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_BIG_ENDIAN); + tvb, offset, length, ENC_ASCII|ENC_NA); break; case 34003: /* cts_sgt_destination_name */ ti = proto_tree_add_item(pdutree, hf_cflow_cts_sgt_destination_name, - tvb, offset, length, ENC_BIG_ENDIAN); + tvb, offset, length, ENC_ASCII|ENC_NA); break; case 37000: /* packets_dropped */ diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index a143ca4d46..f8b92b8a88 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -192,11 +192,11 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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_LITTLE_ENDIAN); + proto_tree_add_item(ns_tree,hf_ns_src_vm,tvb,pnstr->data_offset,src_vmname_len,ENC_ASCII|ENC_NA); } 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_LITTLE_ENDIAN); + proto_tree_add_item(ns_tree,hf_ns_dst_vm,tvb,pnstr->data_offset+src_vmname_len,dst_vmname_len,ENC_ASCII|ENC_NA); } diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c index 9b7905e7bb..cf0ea556bc 100644 --- a/epan/dissectors/packet-oipf.c +++ b/epan/dissectors/packet-oipf.c @@ -120,7 +120,7 @@ dissect_oipf_ciplus(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi offset += 2; proto_tree_add_item(oipf_ciplus_tree, hf_oipf_ciplus_data, - tvb, offset, dat_len, ENC_BIG_ENDIAN); + tvb, offset, dat_len, ENC_NA); offset += dat_len; } diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index ff2944f99b..bf86e4b066 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -3453,7 +3453,7 @@ dissect_openflow_tablemod_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * offset+=3; /* uint32_t config; */ - ti = proto_tree_add_item(tree, hf_openflow_v5_tablemod_config, tvb, offset, 4, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_openflow_v5_tablemod_config, tvb, offset, 4, ENC_NA); conf_tree = proto_item_add_subtree(ti, ett_openflow_v5_tablemod_config); proto_tree_add_item(conf_tree, hf_openflow_v5_tablemod_config_eviction, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -4396,7 +4396,7 @@ dissect_openflow_table_desc_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset+=1; /* uint32_t config; */ - ti = proto_tree_add_item(desc_tree, hf_openflow_v5_table_desc_config, tvb, offset, 4, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(desc_tree, hf_openflow_v5_table_desc_config, tvb, offset, 4, ENC_NA); conf_tree = proto_item_add_subtree(ti, ett_openflow_v5_table_desc_config); proto_tree_add_item(conf_tree, hf_openflow_v5_table_desc_config_eviction, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5656,7 +5656,7 @@ dissect_openflow_role_status_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset+=1; /* uint8_t pad[3]; */ - proto_tree_add_item(tree, hf_openflow_v5_role_status_pad, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_openflow_v5_role_status_pad, tvb, offset, 3, ENC_NA); offset+=3; /* uint64_t generation_id; */ @@ -5682,7 +5682,7 @@ dissect_openflow_table_status_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr offset+=1; /* uint8_t pad[7]; */ - proto_tree_add_item(tree, hf_openflow_v5_table_status_pad, tvb, offset, 7, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_openflow_v5_table_status_pad, tvb, offset, 7, ENC_NA); offset+=1; /* struct ofp_table_desc table; */ @@ -5831,7 +5831,7 @@ dissect_openflow_bundle_add_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset+=4; /* uint16_t pad; */ - proto_tree_add_item(tree, hf_openflow_v5_bundle_add_pad, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_openflow_v5_bundle_add_pad, tvb, offset, 2, ENC_NA); offset+=2; /* uint16_t flags; */ diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index 8698053437..588cbdea9b 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -1107,7 +1107,7 @@ dissect_openwire_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in { if (tvb_length_remaining(tvb, offset) >= 17) { - proto_tree_add_item(tree, hf_openwire_wireformatinfo_magic, tvb, offset + 0, 8, ENC_NA); + 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_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-ouch.c b/epan/dissectors/packet-ouch.c index ec13ce1d9f..583529f67c 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -648,7 +648,7 @@ dissect_ouch( /* Create a sub-tree for the OUCH packet details */ ti = proto_tree_add_item(tree, proto_ouch, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); ouch_tree = proto_item_add_subtree(ti, ett_ouch); @@ -667,7 +667,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -685,7 +685,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 8; proto_tree_add_item(ouch_tree, @@ -703,7 +703,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 4; proto_tree_add_item(ouch_tree, @@ -754,7 +754,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -772,7 +772,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 8; proto_tree_add_item(ouch_tree, @@ -790,7 +790,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 4; proto_tree_add_item(ouch_tree, @@ -848,13 +848,13 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_existing_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, hf_ouch_replacement_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -898,7 +898,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -912,7 +912,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -950,7 +950,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_replacement_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -968,7 +968,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_stock, tvb, offset, 8, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 8; proto_tree_add_item(ouch_tree, @@ -986,7 +986,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_firm, tvb, offset, 4, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 4; proto_tree_add_item(ouch_tree, @@ -1034,7 +1034,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_previous_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; if (reported_len == 80) { /* Added in 4.2 */ @@ -1055,7 +1055,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1080,7 +1080,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1123,7 +1123,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1160,7 +1160,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1185,7 +1185,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1216,7 +1216,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; proto_tree_add_item(ouch_tree, @@ -1235,7 +1235,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; break; @@ -1248,7 +1248,7 @@ dissect_ouch( proto_tree_add_item(ouch_tree, hf_ouch_order_token, tvb, offset, 14, - ENC_ASCII); + ENC_ASCII|ENC_NA); offset += 14; break; diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 0066ae8a98..e5913296b3 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -2683,7 +2683,7 @@ dissect_lcp_internationalization_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, 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_NA); + length - 6, ENC_ASCII|ENC_NA); } static void @@ -3975,7 +3975,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_NA); + length - 4, ENC_ASCII|ENC_NA); } } break; @@ -3992,7 +3992,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_NA); + length - 8, ENC_ASCII|ENC_NA); } } break; diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index 34d530e90a..2c4f6704ce 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -759,7 +759,7 @@ dissect_rdm_pd_device_model_description(tvbuff_t *tvb, guint offset, proto_tree switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_device_model_description, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; } @@ -775,7 +775,7 @@ dissect_rdm_pd_device_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint case RDM_CC_SET_COMMAND: case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_device_label, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; } @@ -880,7 +880,7 @@ dissect_rdm_pd_sensor_definition(tvbuff_t *tvb, guint offset, proto_tree *tree, offset += 1; proto_tree_add_item(tree, hf_rdm_pd_sensor_description, tvb, - offset, len - 13, ENC_BIG_ENDIAN); + offset, len - 13, ENC_ASCII|ENC_NA); offset += (len - 13); break; } @@ -935,7 +935,7 @@ dissect_rdm_pd_manufacturer_label(tvbuff_t *tvb, guint offset, proto_tree *tree, switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_manu_label, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; } @@ -1104,7 +1104,7 @@ dissect_rdm_pd_status_id_description(tvbuff_t *tvb, guint offset, proto_tree *tr case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_status_id_description, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; } @@ -1192,7 +1192,7 @@ dissect_rdm_pd_parameter_description(tvbuff_t *tvb, guint offset, proto_tree *tr offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_rdm_pd_parameter_description, tvb, - offset, len - 0x14, ENC_BIG_ENDIAN); + offset, len - 0x14, ENC_ASCII|ENC_NA); offset += (len - 0x14); break; } @@ -1238,7 +1238,7 @@ dissect_rdm_pd_language_capabilities(tvbuff_t *tvb, guint offset, proto_tree *tr case RDM_CC_GET_COMMAND_RESPONSE: while (len >= 2) { proto_tree_add_item(tree, hf_rdm_pd_language_code, tvb, - offset, 2, ENC_BIG_ENDIAN); + offset, 2, ENC_ASCII|ENC_NA); offset += 2; len -= 2; } @@ -1255,7 +1255,7 @@ dissect_rdm_pd_language(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc case RDM_CC_SET_COMMAND: case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_language_code, tvb, - offset, 2, ENC_BIG_ENDIAN); + offset, 2, ENC_ASCII|ENC_NA); offset += 2; break; } @@ -1269,7 +1269,7 @@ dissect_rdm_pd_software_version_label(tvbuff_t *tvb, guint offset, proto_tree *t switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_software_version_label, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; @@ -1299,7 +1299,7 @@ dissect_rdm_pd_boot_software_version_label(tvbuff_t *tvb, guint offset, proto_tr switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_boot_software_version_label, tvb, - offset, len, ENC_BIG_ENDIAN); + offset, len, ENC_ASCII|ENC_NA); offset += len; break; @@ -1337,19 +1337,19 @@ dissect_rdm_pd_dmx_personality_description(tvbuff_t *tvb, guint offset, proto_tr switch(cc) { case RDM_CC_GET_COMMAND: proto_tree_add_item(tree, hf_rdm_pd_dmx_pers_description, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_ASCII|ENC_NA); offset += 1; break; case RDM_CC_GET_COMMAND_RESPONSE: proto_tree_add_item(tree, hf_rdm_pd_dmx_pers_description, tvb, - offset, 1, ENC_BIG_ENDIAN); + offset, 1, ENC_ASCII|ENC_NA); offset += 1; proto_tree_add_item(tree, hf_rdm_pd_dmx_pers_slots, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_rdm_pd_dmx_pers_text, tvb, - offset, (len - 3), ENC_BIG_ENDIAN); + offset, (len - 3), ENC_ASCII|ENC_NA); offset += (len - 3); break; } @@ -1397,7 +1397,7 @@ dissect_rdm_pd_slot_description(tvbuff_t *tvb, guint offset, proto_tree *tree, g offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_rdm_pd_slot_description, tvb, - offset, (len - 2), ENC_BIG_ENDIAN); + offset, (len - 2), ENC_ASCII|ENC_NA); offset += (len - 2); break; } @@ -1465,7 +1465,7 @@ dissect_rdm_pd_record_sensors(tvbuff_t *tvb, guint offset, proto_tree *tree, gui offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_rdm_pd_sensor_description, tvb, - offset, (len - 13), ENC_BIG_ENDIAN); + offset, (len - 13), ENC_ASCII|ENC_NA); offset += (len - 13); break; @@ -1708,7 +1708,7 @@ dissect_rdm_pd_self_test_description(tvbuff_t *tvb, guint offset, proto_tree *tr offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(tree, hf_rdm_pd_selftest_description, tvb, - offset, (len - 1), ENC_BIG_ENDIAN); + offset, (len - 1), ENC_ASCII|ENC_NA); offset += (len - 1); break; } @@ -1795,7 +1795,7 @@ dissect_rdm_mdb(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 2; hi = proto_tree_add_item(tree, hf_rdm_mdb, tvb, - offset, -1, ENC_BIG_ENDIAN); + offset, -1, ENC_NA); mdb_tree = proto_item_add_subtree(hi,ett_rdm); @@ -1816,7 +1816,7 @@ dissect_rdm_mdb(tvbuff_t *tvb, guint offset, proto_tree *tree) if (parameter_data_length > 0) { hi = proto_tree_add_item(mdb_tree, hf_rdm_parameter_data, tvb, - offset, parameter_data_length, ENC_BIG_ENDIAN); + offset, parameter_data_length, ENC_NA); si = proto_item_add_subtree(hi,ett_rdm); switch(param_id) { diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c index aecd1f6f2c..c710af6082 100644 --- a/epan/dissectors/packet-rtcdc.c +++ b/epan/dissectors/packet-rtcdc.c @@ -128,7 +128,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_BIG_ENDIAN); + proto_tree_add_item(rtcdc_tree, hf_label, tvb, LABEL_OFFSET, -1, ENC_ASCII|ENC_NA); } return; } @@ -230,8 +230,8 @@ dissect_new_open_request_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if (NEW_OPEN_REQUEST_HEADER_LENGTH + (guint)label_length + (guint)protocol_length != tvb_length(tvb)) { expert_add_info(pinfo, rtcdc_item, &ei_rtcdc_inconsistent_label_and_parameter_length); } - proto_tree_add_item(rtcdc_tree, hf_new_label, tvb, NEW_LABEL_OFFSET, label_length, ENC_BIG_ENDIAN); - proto_tree_add_item(rtcdc_tree, hf_new_protocol, tvb, NEW_LABEL_OFFSET + label_length, protocol_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); } return; } diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 69e4a45ed8..10645365f0 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -1785,7 +1785,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) item = proto_tree_add_text(tree, tvb, offset, 83, "CB page %u data", n+1); subtree = proto_item_add_subtree(item, ett_sabp_cbs_page); /* octet 2 - 83 CBS-Message-Information-Page 1 */ - cbs_page_item = proto_tree_add_item(subtree, hf_sabp_cb_msg_inf_page, tvb, offset, 82, ENC_BIG_ENDIAN); + cbs_page_item = proto_tree_add_item(subtree, hf_sabp_cb_msg_inf_page, tvb, offset, 82, ENC_NA); cb_inf_msg_len = tvb_get_guint8(tvb,offset+82); page_tvb = tvb_new_subset(tvb, offset, cb_inf_msg_len, cb_inf_msg_len); unpacked_tvb = dissect_cbs_data(sms_encoding, page_tvb, subtree, pinfo, 0); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 8601ece50b..ece4e9accc 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -170,7 +170,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (is_ipv6) proto_tree_add_item(sap_tree, hf_sap_originating_source_ipv4, tvb, offset, addr_len, ENC_BIG_ENDIAN); else - proto_tree_add_item(sap_tree, hf_sap_originating_source_ipv6, tvb, offset, addr_len, ENC_BIG_ENDIAN); + proto_tree_add_item(sap_tree, hf_sap_originating_source_ipv6, tvb, offset, addr_len, ENC_NA); offset += addr_len; /* Authentication data lives in its own subtree */ diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index 88aae23342..95713d028c 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -209,7 +209,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_item(ritem, hf_sbc_crc_check, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(ritem, hf_sbc_data, tvb, offset, frame_length, ENC_BIG_ENDIAN); + proto_tree_add_item(ritem, hf_sbc_data, tvb, offset, frame_length, ENC_NA); offset += frame_length; /* TODO: expert_info for invalid CRC*/ diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c index bd1e9b0d59..a6bdd17612 100644 --- a/epan/dissectors/packet-sdh.c +++ b/epan/dissectors/packet-sdh.c @@ -164,8 +164,8 @@ dissect_sdh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) h2 = tvb_get_guint8(tvb, 3*level+(3*level*COLUMNS)); au = (h2 | ((0x03 & h1) << 8)); - proto_tree_add_item(sdh_tree, hf_sdh_a1, tvb, 0*level, 3*level, ENC_BIG_ENDIAN); - proto_tree_add_item(sdh_tree, hf_sdh_a2, tvb, 3*level, 3*level, ENC_BIG_ENDIAN); + proto_tree_add_item(sdh_tree, hf_sdh_a1, tvb, 0*level, 3*level, ENC_NA); + proto_tree_add_item(sdh_tree, hf_sdh_a2, tvb, 3*level, 3*level, ENC_NA); proto_tree_add_item(sdh_tree, hf_sdh_j0, tvb, 6*level, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sdh_tree, hf_sdh_b1, tvb, 0*level+(1*level*COLUMNS), 1, ENC_BIG_ENDIAN); proto_tree_add_item(sdh_tree, hf_sdh_e1, tvb, 3*level+(1*level*COLUMNS), 1, ENC_BIG_ENDIAN); @@ -176,7 +176,7 @@ dissect_sdh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sdh_tree, hf_sdh_h1, tvb, 0*level+(3*level*COLUMNS), 1, ENC_BIG_ENDIAN); proto_tree_add_item(sdh_tree, hf_sdh_h2, tvb, 3*level+(3*level*COLUMNS), 1, ENC_BIG_ENDIAN); proto_tree_add_uint(sdh_tree, hf_sdh_au, tvb, 0*level+(3*level*COLUMNS), 3*level+1, au); - proto_tree_add_item(sdh_tree, hf_sdh_b2, tvb, 0*level+(4*level*COLUMNS), 3*level, ENC_BIG_ENDIAN); + proto_tree_add_item(sdh_tree, hf_sdh_b2, tvb, 0*level+(4*level*COLUMNS), 3*level, ENC_NA); proto_tree_add_item(sdh_tree, hf_sdh_k1, tvb, 3*level+(4*level*COLUMNS), 1, ENC_BIG_ENDIAN); proto_tree_add_item(sdh_tree, hf_sdh_k2, tvb, 6*level+(4*level*COLUMNS), 1, ENC_BIG_ENDIAN); proto_tree_add_item(sdh_tree, hf_sdh_d4, tvb, 0*level+(5*level*COLUMNS), 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index ead974b1ea..6698dced0d 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -12970,7 +12970,7 @@ dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO(tvbuff_t *tvb, /* 4 reserved bytes */ CHECK_BYTE_COUNT_SUBR(4); - proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 4, ENC_NA); COUNT_BYTES_SUBR(4); *trunc = FALSE; diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 2c251c44a3..746d283bb4 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -295,7 +295,7 @@ dissect_soupbintcp_common( /* Create sub-tree for SoupBinTCP details */ ti = proto_tree_add_item(tree, proto_soupbintcp, - tvb, 0, -1, FALSE); + tvb, 0, -1, ENC_NA); soupbintcp_tree = proto_item_add_subtree(ti, ett_soupbintcp); diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 4bf7463086..efa8f0fd7e 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1678,7 +1678,7 @@ dissect_spice_common_server_messages(tvbuff_t *tvb, proto_tree *tree, const guin 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); + proto_tree_add_item(tree, hf_notify_message, tvb, offset, message_len + 1, ENC_ASCII|ENC_NA); offset += (message_len + 1); break; default: diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 8cb95714f5..81994edffd 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -3121,7 +3121,7 @@ dissect_ssl3_hnd_cli_cert_verify(tvbuff_t *tvb, proto_tree *tree, tvb, offset, 2, ENC_BIG_ENDIAN); /* XXX check that ..._vrfy_sig_len == length-2 */ proto_tree_add_item(ssl_sig_tree, hf_ssl_handshake_client_cert_vrfy_sig, - tvb, offset+2, length-2, ENC_BIG_ENDIAN); + tvb, offset+2, length-2, ENC_NA); } static void diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 32d0655e01..38268db036 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -500,13 +500,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); + proto_tree_add_item(seg_tree, hf_4607_mission_plan, tvb, offset, 12, ENC_ASCII|ENC_NA); offset += 12; - proto_tree_add_item(seg_tree, hf_4607_mission_flight_plan, tvb, offset, 12, ENC_ASCII); + proto_tree_add_item(seg_tree, hf_4607_mission_flight_plan, tvb, offset, 12, ENC_ASCII|ENC_NA); offset += 12; proto_tree_add_item(seg_tree, hf_4607_mission_platform, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_mission_platform_config, tvb, offset, 10, ENC_ASCII); + proto_tree_add_item(seg_tree, hf_4607_mission_platform_config, tvb, offset, 10, ENC_ASCII|ENC_NA); offset += 10; proto_tree_add_item(seg_tree, hf_4607_mission_time_year, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -728,7 +728,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_NA); offset += 1; - proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_model, tvb, offset, 6, ENC_ASCII); + proto_tree_add_item(seg_tree, hf_4607_jobdef_sensor_model, tvb, offset, 6, ENC_ASCII|ENC_NA); offset += 6; proto_tree_add_item(seg_tree, hf_4607_jobdef_filter, tvb, offset, 1, ENC_NA); offset += 1; @@ -861,14 +861,14 @@ dissect_stanag4607(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); + proto_tree_add_item(hdr_tree, hf_4607_version, tvb, 0, 2, ENC_ASCII|ENC_NA); 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); + proto_tree_add_item(hdr_tree, hf_4607_nationality, tvb, 6, 2, ENC_ASCII|ENC_NA); proto_tree_add_item(hdr_tree, hf_4607_sec_class, tvb, 8, 1, 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_system, tvb, 9, 2, ENC_ASCII|ENC_NA); 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_NA); - proto_tree_add_item(hdr_tree, hf_4607_platform_id, tvb, 14, 10, ENC_ASCII); + 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_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-stun.c b/epan/dissectors/packet-stun.c index 8036be77b0..680187a6ff 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -673,7 +673,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole case REFLECTED_FROM: if (att_length < 1) break; - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_NA); if (att_length < 2) break; proto_tree_add_item(att_tree, stun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -713,7 +713,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole case OTHER_ADDRESS: if (att_length < 1) break; - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_NA); if (att_length < 2) break; proto_tree_add_item(att_tree, stun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -771,7 +771,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole case ERROR_CODE: if (att_length < 2) break; - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 2, ENC_NA); if (att_length < 3) break; proto_tree_add_item(att_tree, stun_att_error_class, tvb, offset+2, 1, ENC_BIG_ENDIAN); @@ -846,7 +846,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole case XOR_REFLECTED_FROM: if (att_length < 1) break; - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset, 1, ENC_NA); if (att_length < 2) break; proto_tree_add_item(att_tree, stun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -918,7 +918,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole proto_tree_add_item(att_tree, stun_att_family, tvb, offset, 1, ENC_BIG_ENDIAN); if (att_length < 4) break; - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+1, 3, ENC_NA); break; case EVEN_PORT: if (att_length < 1) @@ -1009,7 +1009,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole val_to_str(protoCode, transportnames, "Unknown (0x%8x)") ); } - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+1, 3, ENC_NA); break; case CHANNEL_NUMBER: @@ -1025,7 +1025,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole chan ); } - proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_reserved, tvb, offset+2, 2, ENC_NA); break; case BANDWIDTH: diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 9d199ccf63..ef13ec5a1a 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2338,12 +2338,12 @@ dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, case 0xf989: /* FF: draft-ietf-tcpm-fastopen-02, TCP Fast Open */ hidden_item = proto_tree_add_item(exp_tree, hf_tcp_option_fast_open, - tvb, offset + 2, 2, ENC_BIG_ENDIAN); + tvb, offset + 2, 2, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); if ((optlen - 2) == 2) { /* Fast Open Cookie Request */ proto_tree_add_item(exp_tree, hf_tcp_option_fast_open_cookie_request, - tvb, offset + 2, 2, ENC_BIG_ENDIAN); + tvb, offset + 2, 2, ENC_NA); col_append_str(pinfo->cinfo, COL_INFO, " TFO=R"); } else if ((optlen - 2) > 2) { /* Fast Open Cookie */ diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 48097e98ba..1c9f97e04b 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1110,7 +1110,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); + proto_tree_add_item(tree, hf_telnet_auth_name, tvb, offset, len, ENC_ASCII|ENC_NA); break; } } diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index ee75785cfa..c434ef29cf 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -2045,7 +2045,7 @@ dissect_outbound_text_header(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset offset += 2; proto_tree_add_item(tn3270_tree, hf_tn3270_outbound_text_header_hdr, - tvb, offset, hdr_length, ENC_BIG_ENDIAN); + tvb, offset, hdr_length, ENC_NA); offset += hdr_length; offset += dissect_unknown_data(tn3270_tree, tvb, offset, start, sf_body_length); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index a5bfe5b7f9..c622479f79 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -1,4 +1,5 @@ -/* Routines for UMTS FP disassembly +/* packet-umts_fp.c + * Routines for UMTS FP disassembly * * Martin Mathieson * @@ -1010,7 +1011,7 @@ dissect_spare_extension_and_crc(tvbuff_t *tvb, packet_info *pinfo, guint16 calc_crc, read_crc; guint8 * data = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, header_length, offset-header_length); calc_crc = crc16_8005_noreflect_noxor(data, offset-header_length); - read_crc = tvb_get_bits16(tvb, offset*8, 16, FALSE); + read_crc = tvb_get_bits16(tvb, offset*8, 16, ENC_BIG_ENDIAN); if (calc_crc == read_crc) { proto_item_append_text(pi, " [correct]"); diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 8bcd0577d9..cc609d289f 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -1,4 +1,5 @@ -/* Routines for UMTS MAC (3GPP TS 25.321) disassembly +/* packet-umts_mac.c + * Routines for UMTS MAC (3GPP TS 25.321) disassembly * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -230,11 +231,11 @@ static guint16 tree_add_common_dcch_dtch_fields(tvbuff_t *tvb, packet_info *pinf bitoffs += 2; if (ueid_type == MAC_UEID_TYPE_URNTI) { proto_tree_add_bits_item(tree, hf_mac_urnti, tvb, bitoffs, 32, ENC_BIG_ENDIAN); - rlcinf->urnti[fpinf->cur_tb] = tvb_get_bits32(tvb, bitoffs, 32,FALSE); + rlcinf->urnti[fpinf->cur_tb] = tvb_get_bits32(tvb, bitoffs, 32,ENC_BIG_ENDIAN); bitoffs += 32; } else if (ueid_type == MAC_UEID_TYPE_CRNTI) { proto_tree_add_bits_item(tree, hf_mac_crnti, tvb, 4, 16, ENC_BIG_ENDIAN); - rlcinf->urnti[fpinf->cur_tb] = tvb_get_bits16(tvb, bitoffs, 16,FALSE); + rlcinf->urnti[fpinf->cur_tb] = tvb_get_bits16(tvb, bitoffs, 16,ENC_BIG_ENDIAN); bitoffs += 16; } diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index 6b287b865f..c9d70ed5e2 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -118,7 +118,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, whois_tree = proto_item_add_subtree(ti, ett_whois); if (is_query) { - expert_ti = proto_tree_add_item(whois_tree, hf_whois_query, tvb, 0, -1, ENC_NA); + expert_ti = proto_tree_add_item(whois_tree, hf_whois_query, tvb, 0, -1, ENC_ASCII|ENC_NA); if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { /* * From RFC3912, section 2: @@ -132,7 +132,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PROTO_ITEM_SET_GENERATED(ti); } } else if (tree && whois_trans->rep_frame) { - proto_tree_add_item(whois_tree, hf_whois_answer, tvb, 0, -1, ENC_NA); + proto_tree_add_item(whois_tree, hf_whois_answer, tvb, 0, -1, ENC_ASCII|ENC_NA); if (whois_trans->req_frame) { nstime_t ns; diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index 8a9f329b11..5ab4bfe2a4 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -885,7 +885,7 @@ gint WrethIdentPacket(tvbuff_t *tvb, guint8 Offset, packet_info * pInfo, proto_t proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationState, tvb, Offset + 12, 1, ENC_LITTLE_ENDIAN); /*Client MAC address*/ - proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationMacAddr, tvb, Offset + 13, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationMacAddr, tvb, Offset + 13, 6, ENC_NA); col_set_str(pInfo->cinfo, COL_INFO, "Identification response"); @@ -1072,7 +1072,7 @@ gint WrethNackPacket(tvbuff_t *tvb, guint8 Offset, packet_info * pInfo, proto_tr if(Size == 6) { - proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationMacAddr, tvb, Offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(pWrethTree, hf_Wreth_IdentificationMacAddr, tvb, Offset, 6, ENC_NA); } return Offset; diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 48bb60632a..63ae88b702 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -254,7 +254,7 @@ static int dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_tree_add_item(xdmcp_tree, hf_xdmcp_client_address_ipv4, tvb, offset+2, alen, ENC_BIG_ENDIAN); offset += 6; } else if (alen == 16) { - proto_tree_add_item(xdmcp_tree, hf_xdmcp_client_address_ipv6, tvb, offset+2, alen, ENC_BIG_ENDIAN); + proto_tree_add_item(xdmcp_tree, hf_xdmcp_client_address_ipv6, tvb, offset+2, alen, ENC_NA); offset += 18; } else { offset += xdmcp_add_bytes(xdmcp_tree, hf_xdmcp_client_address_bytes, hf_xdmcp_client_address_bytes_len, @@ -345,7 +345,7 @@ static int dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_ipv4, tvb, caddrs_offset, alen, ENC_BIG_ENDIAN); proto_item_append_text(connection_ti, ": %s", tvb_ip_to_str(tvb, caddrs_offset)); } else if ((ctype == 6) && (alen == 16)) { - proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_ipv6, tvb, caddrs_offset, alen, ENC_BIG_ENDIAN); + proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_ipv6, tvb, caddrs_offset, alen, ENC_NA); proto_item_append_text(connection_ti, ": %s", tvb_ip6_to_str(tvb, caddrs_offset)); } else { proto_tree_add_item(connection_tree, hf_xdmcp_connection_address_bytes, tvb, caddrs_offset, alen, ENC_NA); diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 150b629dfb..fdec329079 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -433,7 +433,7 @@ zebra_interface(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 version) offset += 4; if (maclen > 0) proto_tree_add_item(tree, hf_zebra_mac, tvb, - offset, maclen, ENC_BIG_ENDIAN); + offset, maclen, ENC_NA); offset += maclen; } return offset; diff --git a/epan/dissectors/pidl/lsa.cnf b/epan/dissectors/pidl/lsa.cnf index 8c575ab261..e030e4d8d2 100644 --- a/epan/dissectors/pidl/lsa.cnf +++ b/epan/dissectors/pidl/lsa.cnf @@ -273,7 +273,7 @@ lsarpc_dissect_element_lsa_LookupNames3_names_X(tvbuff_t *tvb _U_, int offset _U int old_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_lsarpc_names, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_lsarpc_names, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_lsarpc_names); } diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index f3dca6e983..9afd25650a 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -144,7 +144,7 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ pdu_len = tvb_get_letohs(decrypted_tvb, 0); proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, FALSE); + proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); /* analyze contents */ offset = mapi_dissect_element_EcDoRpc_request__(decrypted_tvb, 0, pinfo, tr, di, drep); @@ -209,7 +209,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenFolder(tvbuff_t *tvb _U_, int of origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_req); } @@ -251,7 +251,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_GetProps(tvbuff_t *tvb _U_, int offs origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_GetProps_req); } @@ -298,7 +298,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REQ_UNION_OpenMsgStore(tvbuff_t *tvb _U_, int old_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenMsgStore_req); } diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index a525557364..dad8afb44e 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -153,7 +153,7 @@ mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet pdu_len = tvb_get_letohs(decrypted_tvb, 0); proto_tree_add_uint(tr, hf_mapi_pdu_len, decrypted_tvb, 0, 2, pdu_len); - proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, FALSE); + proto_tree_add_item(tr, hf_mapi_decrypted_data, decrypted_tvb, 2, pdu_len - 2, ENC_NA); /* Analyze contents */ offset = mapi_dissect_element_EcDoRpc_response__(decrypted_tvb, 0, pinfo, tr, drep); @@ -196,7 +196,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_OpenFolder(tvbuff_t *tvb _U_, int o origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_OpenFolder_repl); } @@ -226,7 +226,7 @@ mapi_dissect_element_EcDoRpc_MAPI_REPL_UNION_GetProps(tvbuff_t *tvb _U_, int off origin_offset = offset; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, tvb, offset, -1, TRUE); + item = proto_tree_add_item(parent_tree, hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_mapi_GetProps_repl); } |