Apply found fix-encoding-args.pl errors in the dissector directory.
authorMichael Mann <mmann78@netscape.net>
Sun, 6 Apr 2014 14:57:33 +0000 (10:57 -0400)
committerMichael Mann <mmann78@netscape.net>
Sun, 6 Apr 2014 15:11:36 +0000 (15:11 +0000)
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:
asn1/atn-cm/packet-atn-cm-template.c
asn1/atn-ulcs/packet-atn-ulcs-template.c
epan/dissectors/packet-3g-a11.c
epan/dissectors/packet-adwin-config.c
epan/dissectors/packet-adwin.c
epan/dissectors/packet-atn-cm.c
epan/dissectors/packet-atn-ulcs.c
epan/dissectors/packet-bpdu.c
epan/dissectors/packet-dcerpc-lsa.c
epan/dissectors/packet-dcerpc-mapi.c
epan/dissectors/packet-dmx-sip.c
epan/dissectors/packet-dmx-test.c
epan/dissectors/packet-dmx-text.c
epan/dissectors/packet-dtp.c
epan/dissectors/packet-elcom.c
epan/dissectors/packet-enip.c
epan/dissectors/packet-finger.c
epan/dissectors/packet-foundry.c
epan/dissectors/packet-gmhdr.c
epan/dissectors/packet-gre.c
epan/dissectors/packet-gtpv2.c
epan/dissectors/packet-hazelcast.c
epan/dissectors/packet-hpfeeds.c
epan/dissectors/packet-icep.c
epan/dissectors/packet-icmp.c
epan/dissectors/packet-l2tp.c
epan/dissectors/packet-lapsat.c
epan/dissectors/packet-m3ap.c
epan/dissectors/packet-mih.c
epan/dissectors/packet-mpeg-pes.c
epan/dissectors/packet-mpls-echo.c
epan/dissectors/packet-mrcpv2.c
epan/dissectors/packet-netflow.c
epan/dissectors/packet-nstrace.c
epan/dissectors/packet-oipf.c
epan/dissectors/packet-openflow_v5.c
epan/dissectors/packet-openwire.c
epan/dissectors/packet-ouch.c
epan/dissectors/packet-ppp.c
epan/dissectors/packet-rdm.c
epan/dissectors/packet-rtcdc.c
epan/dissectors/packet-sabp.c
epan/dissectors/packet-sap.c
epan/dissectors/packet-sbc.c
epan/dissectors/packet-sdh.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-soupbintcp.c
epan/dissectors/packet-spice.c
epan/dissectors/packet-ssl.c
epan/dissectors/packet-stanag4607.c
epan/dissectors/packet-stun.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-telnet.c
epan/dissectors/packet-tn3270.c
epan/dissectors/packet-umts_fp.c
epan/dissectors/packet-umts_mac.c
epan/dissectors/packet-whois.c
epan/dissectors/packet-wreth.c
epan/dissectors/packet-xdmcp.c
epan/dissectors/packet-zebra.c
epan/dissectors/pidl/lsa.cnf
epan/dissectors/pidl/mapi/request.cnf.c
epan/dissectors/pidl/mapi/response.cnf.c

index e439e6a10124a6b123f08c33866996229e3a148d..9e02aacb2e8c9cb0b69476bb692fb4056fcd1864 100644 (file)
@@ -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 */
index 455a1513d7775675c67df9f8a04e99522d2e9eac..0445b29e05b891e395dd2069336e69c34e899027 100644 (file)
@@ -592,7 +592,7 @@ dissect_atn_ulcs(
                                                tvb,
                                                0,
                                                0 ,
-                                               FALSE);
+                                               ENC_NA);
 
                                atn_ulcs_tree = proto_item_add_subtree(
                                                ti,
index 37bdd9c1cdeba85fc2b735a40f4018f03800520d..29558db57715e1a8ec4c4111a1b7807548497796 100644 (file)
@@ -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 */
index c4357e33c0b67370093c766628fe0c660d5badc5..d6484a889cc48d12644c6f23230877bc29e983e2 100644 (file)
@@ -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);
 }
index 12bc723b761c752553ea53e631d6701cbf20c618..e4911200d549d6400feeafccf70ad3567e38c63f 100644 (file)
@@ -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
index ae65955c26341151a5c9d792e9be2ee14208ad68..2f5870427b4ca0157a40633e4a5827e0c9e8b1af 100644 (file)
@@ -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 */
index bd193bfed1f379b455c158a1ebfc9e6ae60c79e3..edfdc2a61e2e4267ad7dc0b8e35297464a847338 100644 (file)
@@ -1988,7 +1988,7 @@ dissect_atn_ulcs(
                                                tvb,
                                                0,
                                                0 ,
-                                               FALSE);
+                                               ENC_NA);
 
                                atn_ulcs_tree = proto_item_add_subtree(
                                                ti,
index 0382a71142e4dd5b791b226512bef9e49a8fd3f3..a8151876c32abda9cf8323497363ae52b177532c 100644 (file)
@@ -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,
index d6306f9276bfb40bb03608c5787b957e190e0940..1afd1f0a20aeab736bd018f0e737cdf49ab81db4 100644 (file)
@@ -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_);
index ecec159a47686287255a1de55199f559b580e981..98f85785e618f2347ced068fe4d77b2e748a66d1 100644 (file)
@@ -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;
index 3a64ffd3ca182ded87fb150d39d74b672dcea6d2..220dc9938e5117719a747bcd7626298c7a28e2b7 100644 (file)
@@ -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);
                }
 
index c86e4f40d977cea2ca1982afc5048c6a655c4ed3..599e6e231998dcd11d654dde2b2e7c536cf52c85 100644 (file)
@@ -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) {
index 09f64211ab98d71b4feae227cd40732886d082cd..0c19d508a6409b29366551bdf2380fa04d198400 100644 (file)
@@ -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);
        }
 }
 
index 01bb90e326f7a1aea2c60ae07472ca74cec98876..3e4d7f95e45729ed4c1ae9a1152516004ef33454 100644 (file)
@@ -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);
index a5535cf16d363fde4fa76fac12b46cf619f87179..b7b7339aee751cbc3c372c572bd365c0aa4c3f29 100644 (file)
@@ -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,
index 53a6c48fe69e41f69e95778c1805736970eab107..a70d67f8e63c972f927a27d4d8f894e505dd0be3 100644 (file)
@@ -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 )
    {
index ccc7a0e4b188cfb46d45d2220781180ed5a7f704..6036a5e6bc622d751c7bf0126e97f2057975652e 100644 (file)
@@ -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;
 
index a2a16bc94172f788a6b6ef20d080b1f0c1811a0a..d2e71b3bcb53b3f52f2b19c9440ed9c7301a742d 100644 (file)
@@ -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;
 }
index dc37f3ebd886f8802dce4b8c866e424364506437..018defa87ecfa677b1a2a9e9276c828e8035b1ec 100644 (file)
@@ -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;
index 543c8b246668d6640443b6acc5ada16543ec0aac..44fbcab4f05425a27e94f176d00928f7aec3dc03 100644 (file)
@@ -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);
 
index 3e7851c6efd0853a3b564a0ca311539bc2a2d3de..7de0afc560e9b99af3799a8628fa8722aaab01dd 100644 (file)
@@ -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);
index 841ef564c6ee5139cce08324ff97760f6d58ee48..c7322ab7f006aeabc326b11563c1ea7caf5fd8ef 100644 (file)
@@ -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;
     }
 
index 1deb585605b2bff5dc3f7ab50fd5d2ceb782e0be..7b05c2cef94307f9c3bf51c9c00860d04e791240 100644 (file)
@@ -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);
 }
 
 /*
index d1731a84b6c074d93ad6d9f7017761739fff4902..d281d46a1952d86171c80a6ea92b67031967a42b 100644 (file)
@@ -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);
 }
index 0ac0225bca0dc88420a0b14d4fa50f95f0ccee68..2cef13f582ca6438a5111fbb9c76aadb1025898f 100644 (file)
@@ -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!)");
index 573c11349d5d7d740ca3b4d3eaecb77001240f53..830ac7c278f625a725a0bce7a6c425741f79816e 100644 (file)
@@ -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:
index 995c57d991cc17ead28c81c5fc1b7ffdc8cc9091..acf36b575364ddadc9dfc63b7e4ee2a0d6219c46 100644 (file)
@@ -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 */
index f1bb8b7d4bc5040b42c304d12293425af28ec425..34c62e30ed825e4acb7101143d112d4f33e448ad 100644 (file)
@@ -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;
index 2ea46ec183438fc1ca33e769a2eaf95f66a3bd7f..4c4d408318a166a516b5c07ca43af708a6a31ae9 100644 (file)
@@ -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;
                                                 }
                                         }
index e68c419ff023a0634710406aa0b0e149c1617591..03a38fcd319c7f968f96ecb02ad345c4ec299afb 100644 (file)
@@ -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) {
index 9772d04249f17e724e2eb4ee98e443235fb464fd..6e26cbd1993afd78a62f9961647ca7b7f5f24f62 100644 (file)
@@ -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;
index 74e2e3543b5d27b60c503fe1e04ae4be8b61ef6c..66fd7c6a39f42a9f847a85d0bf6e8bd3e87dc574 100644 (file)
@@ -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;
             }
         }
index 2e8c68d2dc6ef5506459f620e443f83d7f530ccb..6428754adfb364c691ea43df8baad3fccf4b7bad 100644 (file)
@@ -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 */
index a143ca4d46ea4fb7def6fbd9cda770e9940b01c6..f8b92b8a88d15e371631ecaae5f8211c2e663920 100644 (file)
@@ -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);
                        }
 
 
index 9b7905e7bb2a970f1eb27bb0e6ba8d2aeca72977..cf0ea556bcf4b58ab63f91e0d2c91e8768387839 100644 (file)
@@ -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;
     }
 
index ff2944f99bf7d44bd73adc0e3ec59cb6b7c53c49..bf86e4b06646c5ce4692cb9e1b3f2ac2a1e3487b 100644 (file)
@@ -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; */
index 86980534378d2a3a36852968431d2f24ae67e8e2..588cbdea9b4b7d92fa6bc1f064e058667bf9cd33 100644 (file)
@@ -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);
index ec13ce1d9f7e439e2281139ea96c572a7e760335..583529f67cea533182602da427a17dfefc4e03b8 100644 (file)
@@ -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;
 
index 0066ae8a9811cbee5de464d9641f59e9880beadc..e5913296b38597f13e40d10028c09e8678bab58c 100644 (file)
@@ -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;
index 34d530e90a9e9e10e9bc6e966b9a06a3577d7b98..2c4f6704ce8a976f59bd503397902c0778fb3758 100644 (file)
@@ -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) {
index aecd1f6f2cae2cf9451dfb753b37938333431269..c710af60824b444a99e9b11e5f37c7998422aff2 100644 (file)
@@ -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;
 }
index 69e4a45ed8f9e0e0193c85acfdf4924e737d5e9a..10645365f04136d306f10c7f1c464dcef8545587 100644 (file)
@@ -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);
index 8601ece50b90cd77c1b9beea7583ea540446c25e..ece4e9accca7e2a6786dd56664a177d3760edb2a 100644 (file)
@@ -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 */
index 88aae23342c5d370a50f3d8b52ff6dd51a415cba..95713d028c9da0c8fef993815a276d0a57f392aa 100644 (file)
@@ -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*/
index bd1e9b0d59fada6610c45539984264ca90bd8239..a6bdd176121ffbc3a3cd2426870e4de09d4bcf32 100644 (file)
@@ -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);
index ead974b1ea55010573e93fa568f6b20b95e65d7e..6698dced0d177ca8ac2057620e0b9e264ff2b10e 100644 (file)
@@ -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;
index 2c251c44a36529259d5ecf0d187a82617556308b..746d283bb4a6e05421564c3bad7e8e023d2644be 100644 (file)
@@ -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);
 
index 4bf746308601e85a82dae26768dcfc54479b31a8..efa8f0fd7e0f956f3551360ca4c55591db0936f2 100644 (file)
@@ -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:
index 8cb95714f518e3a70ecccfa3e72ab74de3663e8d..81994edffd1ca698cb66cb8d5c8e6fc31046ceaf 100644 (file)
@@ -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
index 32d0655e01b99cdd8f0985707cf2f728a29acea5..38268db03649adcb5a68165a71ad5a88e0ce624f 100644 (file)
@@ -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);
        }
index 8036be77b03f585e0dbd1bce116ff8f624298fd5..680187a6ff878bb2aee50a9ab90efb498262bb59 100644 (file)
@@ -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:
index 9d199ccf63307526e09d219ab70b40d0694c731f..ef13ec5a1a58e0557713f1e012ada6f9a924de7f 100644 (file)
@@ -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 */
index 48097e98ba35f4e7927c432f1b93297eb081632b..1c9f97e04bcf9c4aaa26c6db05adf453b69316e2 100644 (file)
@@ -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;
   }
 }
index ee75785cfac4ad56b1d8e6dc65c292758b909c1c..c434ef29cf5532550c4f02ab59b144ab7eebf968 100644 (file)
@@ -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);
index a5bfe5b7f949d89e1c72d3cac3b4e2c9bc211450..c622479f79ee78a870256e499795eb214470691b 100644 (file)
@@ -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]");
index 8bcd0577d94640cc7fef425023935de6de4582f9..cc609d289f2db7145c0f42ece792be3b54b39dce 100644 (file)
@@ -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;
     }
 
index 6b287b865f0ff6e63ecba9dd34aa5bd08a2a1822..c9d70ed5e2553d4721afcf19877ea1f6514cc885 100644 (file)
@@ -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;
 
index 8a9f329b11fdfb11386ee65bdfdf9b24e8600e3b..5ab4bfe2a40fdf7643adb9d2eda6ccd2afa6dd3d 100644 (file)
@@ -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;
index 48bb60632a7bc81eec2ff69425b309e26a5af0aa..63ae88b702b244b173b06747d0eeb3d024fc9bcd 100644 (file)
@@ -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);
index 150b629dfb306fa4d73f27b49e2ba72ccc9900f8..fdec329079324e837705a6a851db0f241346d4b1 100644 (file)
@@ -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;
index 8c575ab261e8aa75da953ab9e9be1f4522af2c00..e030e4d8d2fd16de8f2d26a4aee220f0167f3c65 100644 (file)
@@ -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);
        }
 
index f3dca6e9833cecab86bf2ccfdb7398ce0d7ce478..9afd25650a779c8c66a9ca3cfc6f9dc6bce61369 100644 (file)
@@ -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);
        }
 
index a52555736464e0725e85e24c07ff993095887b7e..dad8afb44e0e62925517d9a878ccd5d5d95e5fef 100644 (file)
@@ -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);
        }