aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-10-15 18:46:26 +0000
committerBill Meier <wmeier@newsguy.com>2011-10-15 18:46:26 +0000
commit126aa8539380e6b0b465b48d30f349b76afdc489 (patch)
tree16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors
parent4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (diff)
Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-3com-njack.c4
-rw-r--r--epan/dissectors/packet-3g-a11.c2
-rw-r--r--epan/dissectors/packet-9p.c32
-rw-r--r--epan/dissectors/packet-acn.c6
-rw-r--r--epan/dissectors/packet-afp.c48
-rw-r--r--epan/dissectors/packet-agentx.c2
-rw-r--r--epan/dissectors/packet-aim-location.c4
-rw-r--r--epan/dissectors/packet-aim-signon.c2
-rw-r--r--epan/dissectors/packet-aim-ssi.c10
-rw-r--r--epan/dissectors/packet-aim-userlookup.c2
-rw-r--r--epan/dissectors/packet-aim.c4
-rw-r--r--epan/dissectors/packet-ajp13.c4
-rw-r--r--epan/dissectors/packet-amqp.c352
-rw-r--r--epan/dissectors/packet-ancp.c2
-rw-r--r--epan/dissectors/packet-applemidi.c2
-rw-r--r--epan/dissectors/packet-artnet.c14
-rw-r--r--epan/dissectors/packet-aruba-papi.c2
-rw-r--r--epan/dissectors/packet-assa_r3.c12
-rw-r--r--epan/dissectors/packet-atalk.c24
-rw-r--r--epan/dissectors/packet-banana.c2
-rw-r--r--epan/dissectors/packet-bittorrent.c8
-rw-r--r--epan/dissectors/packet-bjnp.c2
-rw-r--r--epan/dissectors/packet-bootp.c34
-rw-r--r--epan/dissectors/packet-bpdu.c2
-rw-r--r--epan/dissectors/packet-bthci_cmd.c6
-rw-r--r--epan/dissectors/packet-bthci_evt.c6
-rw-r--r--epan/dissectors/packet-btrfcomm.c4
-rw-r--r--epan/dissectors/packet-capwap.c28
-rw-r--r--epan/dissectors/packet-cast.c36
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c10
-rw-r--r--epan/dissectors/packet-cdp.c6
-rw-r--r--epan/dissectors/packet-cfm.c4
-rw-r--r--epan/dissectors/packet-cigi.c2
-rw-r--r--epan/dissectors/packet-cip.c4
-rw-r--r--epan/dissectors/packet-classicstun.c6
-rw-r--r--epan/dissectors/packet-collectd.c4
-rw-r--r--epan/dissectors/packet-componentstatus.c4
-rw-r--r--epan/dissectors/packet-cops.c4
-rw-r--r--epan/dissectors/packet-daap.c2
-rw-r--r--epan/dissectors/packet-data.c2
-rw-r--r--epan/dissectors/packet-daytime.c2
-rw-r--r--epan/dissectors/packet-db-lsp.c2
-rw-r--r--epan/dissectors/packet-dcc.c2
-rw-r--r--epan/dissectors/packet-dcerpc-epm.c8
-rw-r--r--epan/dissectors/packet-dcerpc-fileexp.c6
-rw-r--r--epan/dissectors/packet-dcerpc-fldb.c16
-rw-r--r--epan/dissectors/packet-dcerpc-netlogon.c6
-rw-r--r--epan/dissectors/packet-dcerpc-rpriv.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_acct.c4
-rw-r--r--epan/dissectors/packet-dcerpc-rs_misc.c2
-rw-r--r--epan/dissectors/packet-dcerpc-rs_pgo.c4
-rw-r--r--epan/dissectors/packet-dcerpc.c2
-rw-r--r--epan/dissectors/packet-dcp-etsi.c4
-rw-r--r--epan/dissectors/packet-dec-dnart.c10
-rw-r--r--epan/dissectors/packet-dhcp-failover.c6
-rw-r--r--epan/dissectors/packet-diameter_3gpp.c10
-rw-r--r--epan/dissectors/packet-distcc.c8
-rw-r--r--epan/dissectors/packet-dmp.c16
-rw-r--r--epan/dissectors/packet-dplay.c4
-rw-r--r--epan/dissectors/packet-dpnss.c6
-rw-r--r--epan/dissectors/packet-dsi.c10
-rw-r--r--epan/dissectors/packet-dtn.c32
-rw-r--r--epan/dissectors/packet-dua.c4
-rw-r--r--epan/dissectors/packet-dvbci.c12
-rw-r--r--epan/dissectors/packet-edonkey.c18
-rw-r--r--epan/dissectors/packet-enip.c4
-rw-r--r--epan/dissectors/packet-enttec.c2
-rw-r--r--epan/dissectors/packet-epl.c2
-rw-r--r--epan/dissectors/packet-epmd.c8
-rw-r--r--epan/dissectors/packet-erldp.c6
-rw-r--r--epan/dissectors/packet-etch.c2
-rw-r--r--epan/dissectors/packet-fcdns.c20
-rw-r--r--epan/dissectors/packet-fcfcs.c18
-rw-r--r--epan/dissectors/packet-fcfzs.c22
-rw-r--r--epan/dissectors/packet-fcswils.c22
-rw-r--r--epan/dissectors/packet-ff.c130
-rw-r--r--epan/dissectors/packet-fix.c2
-rw-r--r--epan/dissectors/packet-ftp.c6
-rw-r--r--epan/dissectors/packet-fw1.c6
-rw-r--r--epan/dissectors/packet-gdsdb.c14
-rw-r--r--epan/dissectors/packet-glbp.c2
-rw-r--r--epan/dissectors/packet-gnutella.c4
-rw-r--r--epan/dissectors/packet-gopher.c10
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c4
-rw-r--r--epan/dissectors/packet-gsm_ipa.c8
-rw-r--r--epan/dissectors/packet-gtp.c2
-rw-r--r--epan/dissectors/packet-hdfs.c44
-rw-r--r--epan/dissectors/packet-hdfsdata.c16
-rw-r--r--epan/dissectors/packet-http.c8
-rw-r--r--epan/dissectors/packet-iax2.c2
-rw-r--r--epan/dissectors/packet-icmpv6.c2
-rw-r--r--epan/dissectors/packet-ieee80211-prism.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c26
-rw-r--r--epan/dissectors/packet-image-png.c6
-rw-r--r--epan/dissectors/packet-imf.c34
-rw-r--r--epan/dissectors/packet-infiniband.c4
-rw-r--r--epan/dissectors/packet-interlink.c2
-rw-r--r--epan/dissectors/packet-ipmi-app.c2
-rw-r--r--epan/dissectors/packet-ipmi-picmg.c2
-rw-r--r--epan/dissectors/packet-ipmi-se.c2
-rw-r--r--epan/dissectors/packet-ipmi-storage.c4
-rw-r--r--epan/dissectors/packet-ipmi-transport.c40
-rw-r--r--epan/dissectors/packet-ipxwan.c4
-rw-r--r--epan/dissectors/packet-irc.c4
-rw-r--r--epan/dissectors/packet-isakmp.c30
-rw-r--r--epan/dissectors/packet-iscsi.c2
-rw-r--r--epan/dissectors/packet-iua.c4
-rw-r--r--epan/dissectors/packet-jxta.c38
-rw-r--r--epan/dissectors/packet-kdp.c2
-rw-r--r--epan/dissectors/packet-kpasswd.c2
-rw-r--r--epan/dissectors/packet-laplink.c2
-rw-r--r--epan/dissectors/packet-linx.c6
-rw-r--r--epan/dissectors/packet-lwres.c14
-rw-r--r--epan/dissectors/packet-m2ua.c4
-rw-r--r--epan/dissectors/packet-m3ua.c2
-rw-r--r--epan/dissectors/packet-mac-lte.c8
-rw-r--r--epan/dissectors/packet-mactelnet.c4
-rw-r--r--epan/dissectors/packet-megaco.c30
-rw-r--r--epan/dissectors/packet-memcache.c34
-rw-r--r--epan/dissectors/packet-mgcp.c4
-rw-r--r--epan/dissectors/packet-miop.c2
-rw-r--r--epan/dissectors/packet-mip.c4
-rw-r--r--epan/dissectors/packet-mongo.c6
-rw-r--r--epan/dissectors/packet-ms-mms.c4
-rw-r--r--epan/dissectors/packet-msrp.c18
-rw-r--r--epan/dissectors/packet-multipart.c2
-rw-r--r--epan/dissectors/packet-mysql.c34
-rw-r--r--epan/dissectors/packet-nasdaq-itch.c32
-rw-r--r--epan/dissectors/packet-nasdaq-soup.c20
-rw-r--r--epan/dissectors/packet-ncp.c4
-rw-r--r--epan/dissectors/packet-netflow.c32
-rw-r--r--epan/dissectors/packet-netsync.c8
-rw-r--r--epan/dissectors/packet-nsrp.c6
-rw-r--r--epan/dissectors/packet-ntlmssp.c2
-rw-r--r--epan/dissectors/packet-ntp.c2
-rw-r--r--epan/dissectors/packet-oicq.c2
-rw-r--r--epan/dissectors/packet-olsr.c2
-rw-r--r--epan/dissectors/packet-omron-fins.c58
-rw-r--r--epan/dissectors/packet-packetlogger.c2
-rw-r--r--epan/dissectors/packet-pdcp-lte.c2
-rw-r--r--epan/dissectors/packet-pflog.c6
-rw-r--r--epan/dissectors/packet-pgsql.c30
-rw-r--r--epan/dissectors/packet-pktc.c8
-rw-r--r--epan/dissectors/packet-pnrp.c6
-rw-r--r--epan/dissectors/packet-ppi-antenna.c6
-rw-r--r--epan/dissectors/packet-ppi-gps.c2
-rw-r--r--epan/dissectors/packet-ppi-vector.c4
-rw-r--r--epan/dissectors/packet-ppp.c8
-rw-r--r--epan/dissectors/packet-pppoe.c10
-rw-r--r--epan/dissectors/packet-pptp.c20
-rw-r--r--epan/dissectors/packet-ptp.c12
-rw-r--r--epan/dissectors/packet-quake.c22
-rw-r--r--epan/dissectors/packet-radius_packetcable.c8
-rw-r--r--epan/dissectors/packet-redbackli.c2
-rw-r--r--epan/dissectors/packet-reload.c4
-rw-r--r--epan/dissectors/packet-rip.c2
-rw-r--r--epan/dissectors/packet-rlc-lte.c2
-rw-r--r--epan/dissectors/packet-rlogin.c14
-rw-r--r--epan/dissectors/packet-rmp.c6
-rw-r--r--epan/dissectors/packet-rpcap.c12
-rw-r--r--epan/dissectors/packet-rsip.c2
-rw-r--r--epan/dissectors/packet-rsync.c18
-rw-r--r--epan/dissectors/packet-rtcp.c10
-rw-r--r--epan/dissectors/packet-rtmpt.c2
-rw-r--r--epan/dissectors/packet-sasp.c8
-rw-r--r--epan/dissectors/packet-scriptingservice.c4
-rw-r--r--epan/dissectors/packet-scsi-mmc.c6
-rw-r--r--epan/dissectors/packet-scsi.c6
-rw-r--r--epan/dissectors/packet-sctp.c2
-rw-r--r--epan/dissectors/packet-sdp.c80
-rw-r--r--epan/dissectors/packet-sebek.c8
-rw-r--r--epan/dissectors/packet-ses.c12
-rw-r--r--epan/dissectors/packet-sip.c30
-rw-r--r--epan/dissectors/packet-skinny.c138
-rw-r--r--epan/dissectors/packet-slsk.c150
-rw-r--r--epan/dissectors/packet-smb-browse.c10
-rw-r--r--epan/dissectors/packet-smb-mailslot.c2
-rw-r--r--epan/dissectors/packet-smb-pipe.c14
-rw-r--r--epan/dissectors/packet-smb.c18
-rw-r--r--epan/dissectors/packet-smtp.c6
-rw-r--r--epan/dissectors/packet-socks.c4
-rw-r--r--epan/dissectors/packet-spice.c2
-rw-r--r--epan/dissectors/packet-srvloc.c56
-rw-r--r--epan/dissectors/packet-ssh.c2
-rw-r--r--epan/dissectors/packet-starteam.c6
-rw-r--r--epan/dissectors/packet-stun.c10
-rw-r--r--epan/dissectors/packet-sua.c4
-rw-r--r--epan/dissectors/packet-synergy.c4
-rw-r--r--epan/dissectors/packet-syslog.c2
-rw-r--r--epan/dissectors/packet-tapa.c2
-rw-r--r--epan/dissectors/packet-tds.c6
-rw-r--r--epan/dissectors/packet-teamspeak2.c34
-rw-r--r--epan/dissectors/packet-telnet.c2
-rw-r--r--epan/dissectors/packet-tftp.c14
-rw-r--r--epan/dissectors/packet-tipc.c4
-rw-r--r--epan/dissectors/packet-tivoconnect.c12
-rw-r--r--epan/dissectors/packet-tnef.c10
-rw-r--r--epan/dissectors/packet-tns.c10
-rw-r--r--epan/dissectors/packet-tsp.c2
-rw-r--r--epan/dissectors/packet-turbocell.c2
-rw-r--r--epan/dissectors/packet-ua.c2
-rw-r--r--epan/dissectors/packet-ucp.c2
-rw-r--r--epan/dissectors/packet-uma.c2
-rw-r--r--epan/dissectors/packet-usb-at.c2
-rw-r--r--epan/dissectors/packet-v52.c2
-rw-r--r--epan/dissectors/packet-v5ua.c10
-rw-r--r--epan/dissectors/packet-vnc.c12
-rw-r--r--epan/dissectors/packet-vtp.c10
-rw-r--r--epan/dissectors/packet-wbxml.c2
-rw-r--r--epan/dissectors/packet-wifi-p2p.c12
-rw-r--r--epan/dissectors/packet-wlccp.c6
-rw-r--r--epan/dissectors/packet-wow.c2
-rw-r--r--epan/dissectors/packet-wps.c18
-rw-r--r--epan/dissectors/packet-wsmp.c2
-rw-r--r--epan/dissectors/packet-wsp.c4
-rw-r--r--epan/dissectors/packet-wtls.c6
-rw-r--r--epan/dissectors/packet-x224.c2
-rw-r--r--epan/dissectors/packet-xcsl.c12
-rw-r--r--epan/dissectors/packet-xmcp.c12
-rw-r--r--epan/dissectors/packet-xml.c2
-rw-r--r--epan/dissectors/packet-xot.c4
-rw-r--r--epan/dissectors/packet-yhoo.c8
-rw-r--r--epan/dissectors/packet-ymsg.c6
-rw-r--r--epan/dissectors/packet-zebra.c4
-rw-r--r--epan/dissectors/packet-ziop.c2
-rw-r--r--epan/dissectors/packet-zrtp.c12
226 files changed, 1442 insertions, 1442 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 621d809247..766b9e458e 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -487,7 +487,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset)
case NJACK_CMD_PRODUCTNAME:
case NJACK_CMD_SERIALNO:
proto_tree_add_item(tlv_tree, hf_njack_tlv_typestring,
- tvb, offset, tlv_length, ENC_BIG_ENDIAN);
+ tvb, offset, tlv_length, ENC_ASCII|ENC_NA);
offset += tlv_length;
break;
case NJACK_CMD_PORT1:
@@ -585,7 +585,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
njack_tree = proto_item_add_subtree(ti, ett_njack);
proto_tree_add_item(njack_tree, hf_njack_magic, tvb, offset, 5,
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
offset += 5;
proto_tree_add_item(njack_tree, hf_njack_type, tvb, offset, 1,
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index c39aa5618f..3dee019255 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1449,7 +1449,7 @@ dissect_a11_extensions( tvbuff_t *tvb, int offset, proto_tree *tree)
* UTF-8.
*/
proto_tree_add_item(ext_tree, hf_a11_next_nai, tvb, offset,
- ext_len, ENC_UTF_8|ENC_BIG_ENDIAN);
+ ext_len, ENC_UTF_8|ENC_NA);
break;
case GEN_AUTH_EXT: /* RFC 3012 */
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index cab9215200..9245d5103b 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -253,7 +253,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=4;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_version, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_version, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_version);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
@@ -263,13 +263,13 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=4;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_uname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_uname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_uname);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_aname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_aname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_aname);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset +=2;
@@ -280,7 +280,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case RERROR:
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_ename, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_ename, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_ename);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset +=2;
@@ -299,13 +299,13 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=4;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_uname, tvb, offset+2, tmp16, ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_uname, tvb, offset+2, tmp16, ENC_ASCII|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_uname);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16 + 2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_aname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_aname, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_aname);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
@@ -338,7 +338,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
proto_tree *wname_tree;
tmplen = tvb_get_letohs(tvb,offset);
- wname = proto_tree_add_item(ninep_tree, hf_9P_wname, tvb, offset+2, tmplen, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ wname = proto_tree_add_item(ninep_tree, hf_9P_wname, tvb, offset+2, tmplen, ENC_UTF_8|ENC_NA);
wname_tree = proto_item_add_subtree(wname,ett_9P_wname);
proto_tree_add_item(wname_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@@ -379,7 +379,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=4;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_name, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_name, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_filename);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16 + 2;
@@ -483,25 +483,25 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=8;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_filename, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_filename, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_filename);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_uid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_uid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_uid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_gid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_gid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_gid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_muid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_muid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_muid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
@@ -543,25 +543,25 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
offset +=8;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_filename, tvb, offset+2, tmp16, ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_filename, tvb, offset+2, tmp16, ENC_ASCII|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_filename);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_uid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_uid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_uid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_gid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_gid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_gid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
tmp16 = tvb_get_letohs(tvb,offset);
- ti = proto_tree_add_item(ninep_tree, hf_9P_muid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_LITTLE_ENDIAN);
+ ti = proto_tree_add_item(ninep_tree, hf_9P_muid, tvb, offset+2, tmp16, ENC_UTF_8|ENC_NA);
tmp_tree = proto_item_add_subtree(ti,ett_9P_muid);
proto_tree_add_item(tmp_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += tmp16+2;
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index fe181d43af..eed5c50696 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -2109,10 +2109,10 @@ dissect_acn_dmx_pdu(guint32 protocol_id, tvbuff_t *tvb, packet_info *pinfo, prot
switch (vector) {
case 0x02:
if(protocol_id==ACN_PROTOCOL_ID_DMX_2){
- proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 64, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 64, ENC_UTF_8|ENC_NA);
data_offset += 64;
} else{
- proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 32, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 32, ENC_UTF_8|ENC_NA);
data_offset += 32;
}
@@ -2612,7 +2612,7 @@ dissect_acn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
data_offset += 2;
proto_tree_add_item(acn_tree, hf_acn_postamble_size, tvb, data_offset, 2, ENC_BIG_ENDIAN);
data_offset += 2;
- proto_tree_add_item(acn_tree, hf_acn_packet_identifier, tvb, data_offset, 12, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(acn_tree, hf_acn_packet_identifier, tvb, data_offset, 12, ENC_UTF_8|ENC_NA);
data_offset += 12;
/* one past the last byte */
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 860159af8b..3775a741ec 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -1358,7 +1358,7 @@ parse_long_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse
len = tvb_get_guint8(tvb, tp_ofs);
proto_tree_add_item(tree, hf_afp_path_len, tvb, tp_ofs, 1,ENC_BIG_ENDIAN);
tp_ofs++;
- proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_NA);
tp_ofs += len;
}
return tp_ofs;
@@ -1397,7 +1397,7 @@ parse_UTF8_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse
proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, tp_ofs, 2,ENC_BIG_ENDIAN);
tp_ofs += 2;
- proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_NA);
tp_ofs += len;
}
return tp_ofs;
@@ -1928,7 +1928,7 @@ dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
len = tvb_reported_length_remaining(tvb,offset);
if (len >= 8) {
/* optionnal password */
- proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, 8,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, 8,ENC_UTF_8|ENC_NA);
offset += 8;
}
return offset;
@@ -2455,7 +2455,7 @@ decode_uam_parameters(const guint8 *uam, int len_uam, tvbuff_t *tvb, proto_tree
PAD(1);
len = 8; /* tvb_strsize(tvb, offset);*/
- proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, len,ENC_UTF_8|ENC_NA);
offset += len;
}
else if (!g_ascii_strncasecmp(uam, "DHCAST128", len_uam)) {
@@ -2531,7 +2531,7 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
len = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(tree, hf_afp_user_len, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len,ENC_UTF_8|ENC_NA);
offset += len;
/* directory service */
@@ -2545,14 +2545,14 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_afp_path_len, tvb, offset, 1,ENC_BIG_ENDIAN);
offset++;
- proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_NA);
offset += len;
break;
case 3:
len = tvb_get_ntohs(tvb, offset);
proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_NA);
offset += len;
break;
default:
@@ -3178,10 +3178,10 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
PAD(1);
proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_UTF_8|ENC_NA);
offset += 4;
- proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN);
@@ -3202,7 +3202,7 @@ dissect_query_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
PAD(1);
proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_icon_index, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -3219,7 +3219,7 @@ dissect_reply_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4,ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN);
@@ -3240,10 +3240,10 @@ dissect_query_afp_add_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
PAD(1);
proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
- proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN);
@@ -3284,7 +3284,7 @@ dissect_query_afp_add_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
PAD(1);
offset = decode_dt_did(tree, tvb, offset);
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4,ENC_BIG_ENDIAN);
@@ -3305,7 +3305,7 @@ dissect_query_afp_rmv_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
PAD(1);
offset = decode_dt_did(tree, tvb, offset);
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
offset = decode_name(tree, pinfo, tvb, offset);
@@ -3322,7 +3322,7 @@ dissect_query_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_afp_appl_index, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -3418,7 +3418,7 @@ dissect_reply_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
}
}
if (size) {
- proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_BIG_ENDIAN);
}
else {
proto_tree_add_item(tree, hf_afp_unknown, tvb, offset, len, ENC_NA);
@@ -3449,7 +3449,7 @@ dissect_query_afp_map_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
len = tvb_get_guint8(tvb, offset);
break;
}
- proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_map_name, tvb, offset, size, ENC_ASCII|ENC_BIG_ENDIAN);
offset += len +size;
return offset;
@@ -3620,7 +3620,7 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot
proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 2,ENC_BIG_ENDIAN);
offset += 2;
if (len) {
- proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_UTF_8|ENC_NA);
offset += len;
}
} else {
@@ -3634,7 +3634,7 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot
proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 1,ENC_BIG_ENDIAN);
offset += 1;
if (len) {
- proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_ASCII|ENC_NA);
offset += len;
}
}
@@ -3726,7 +3726,7 @@ decode_attr_name (proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint
sub_tree = proto_item_add_subtree(item, ett_afp_extattr_names);
proto_tree_add_item(sub_tree, hf_afp_extattr_namelen, tvb, offset, 2,ENC_BIG_ENDIAN);
- proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset +2, len, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset +2, len, ENC_UTF_8|ENC_NA);
}
offset += 2 +len;
@@ -3882,7 +3882,7 @@ dissect_reply_afp_list_ext_attrs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
sub_tree = proto_item_add_subtree(item, ett_afp_extattr_names);
while ( remain > 0) {
length = tvb_strsize(tvb, offset);
- proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset, length, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset, length, ENC_UTF_8|ENC_NA);
offset += length;
remain -= length;
}
@@ -4409,7 +4409,7 @@ dissect_query_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
case SPOTLIGHT_CMD_GET_VOLPATH:
tvb_get_ephemeral_stringz(tvb, offset, &len);
- proto_tree_add_item(tree, hf_afp_spotlight_volpath_client, tvb, offset, len, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_spotlight_volpath_client, tvb, offset, len, ENC_UTF_8|ENC_NA);
offset += len;
break;
@@ -4616,7 +4616,7 @@ dissect_reply_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
offset += 4;
tvb_get_ephemeral_stringz(tvb, offset, &len);;
- proto_tree_add_item(tree, hf_afp_spotlight_volpath_server, tvb, offset, len, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_afp_spotlight_volpath_server, tvb, offset, len, ENC_UTF_8|ENC_NA);
offset += len;
break;
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index fa93946ed7..f0faf143a5 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -310,7 +310,7 @@ dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, guint8 flags)
* XXX - an "octet string" is not necessarily a text string, so
* having hf_ostring be FT_STRING is not necessarily appropriate.
*/
- proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, ENC_ASCII|ENC_NA);
return p_noct + 4;
}
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index 9032e0133f..25bfa012d1 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -138,7 +138,7 @@ static int dissect_aim_snac_location_request_user_information(tvbuff_t *tvb,
offset += 1;
/* Buddy name */
- proto_tree_add_item(tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
offset += buddyname_length;
return offset;
@@ -157,7 +157,7 @@ static int dissect_aim_snac_location_user_information(tvbuff_t *tvb,
offset += 1;
/* Buddy name */
- proto_tree_add_item(tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
offset += buddyname_length;
/* Warning level */
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index f47c26cced..fb8bfb3c36 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -112,7 +112,7 @@ static int dissect_aim_snac_signon_signon_reply(tvbuff_t *tvb,
offset += 2;
/* Challenge */
- proto_tree_add_item(tree, hf_aim_signon_challenge, tvb, offset, challenge_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_signon_challenge, tvb, offset, challenge_length, ENC_ASCII|ENC_NA);
offset += challenge_length;
return offset;
}
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 490726efe3..97e5ef5562 100644
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
@@ -117,7 +117,7 @@ static int dissect_ssi_item(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, p
/* Buddy Name */
if (buddyname_length > 0) {
- proto_tree_add_item(ssi_entry, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(ssi_entry, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
offset += buddyname_length;
}
@@ -242,7 +242,7 @@ static int dissect_aim_snac_ssi_auth_request(tvbuff_t *tvb, packet_info *pinfo _
/* show buddy name */
if (buddyname_length > 0) {
- proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
offset += buddyname_length;
}
/* get reason message length (2 bytes) */
@@ -252,7 +252,7 @@ static int dissect_aim_snac_ssi_auth_request(tvbuff_t *tvb, packet_info *pinfo _
/* show reason message if present */
if (reason_length > 0) {
- proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_ASCII|ENC_NA);
offset += reason_length;
}
@@ -276,7 +276,7 @@ static int dissect_aim_snac_ssi_auth_reply(tvbuff_t *tvb, packet_info *pinfo _U_
/* show buddy name */
if (buddyname_length > 0) {
- proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
offset += buddyname_length;
}
@@ -291,7 +291,7 @@ static int dissect_aim_snac_ssi_auth_reply(tvbuff_t *tvb, packet_info *pinfo _U_
/* show reason message if present */
if (reason_length > 0) {
- proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_ASCII|ENC_NA);
offset += reason_length;
}
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index fa6850d571..ddfc45bf01 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -48,7 +48,7 @@ static gint ett_aim_userlookup = -1;
static int dissect_aim_userlookup_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *lookup_tree)
{
- proto_tree_add_item(lookup_tree, hf_aim_userlookup_email, tvb, 0, tvb_length(tvb), ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(lookup_tree, hf_aim_userlookup_email, tvb, 0, tvb_length(tvb), ENC_ASCII|ENC_NA);
return tvb_length(tvb);
}
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index f9f3e48761..adf165ecb6 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -840,7 +840,7 @@ dissect_aim_buddyname(tvbuff_t *tvb, packet_info *pinfo _U_, int offset,
tvb_format_text(tvb, offset, buddyname_length));
buddy_tree = proto_item_add_subtree(ti, ett_aim_buddyname);
proto_tree_add_item(buddy_tree, hf_aim_buddyname_len, tvb, offset-1, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(buddy_tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_BIG_ENDIAN);
+ proto_tree_add_item(buddy_tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_ASCII|ENC_NA);
}
return offset+buddyname_length;
@@ -1293,7 +1293,7 @@ dissect_aim_tlv_value_messageblock (proto_item *ti, guint16 valueid _U_, tvbuff_
proto_item_set_text(ti, "Message: %s",
format_text(buf, blocklen - 4));
proto_tree_add_item(entry, hf_aim_messageblock_message, tvb,
- offset, blocklen-4, ENC_ASCII|ENC_BIG_ENDIAN);
+ offset, blocklen-4, ENC_ASCII|ENC_NA);
offset += tvb_length_remaining(tvb, offset);
}
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 30f4819c8d..8fed44fd05 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -467,7 +467,7 @@ display_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ajp13_tree, ajp13_con
/* MESSAGE DATA (COPOUT)
*/
if (ajp13_tree)
- proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, -1, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, -1, ENC_UTF_8|ENC_NA);
break;
}
}
@@ -517,7 +517,7 @@ display_req_body(tvbuff_t *tvb, proto_tree *ajp13_tree, ajp13_conv_data* cd)
*/
content_length = tvb_get_ntohs( tvb, pos);
cd->content_length -= content_length;
- proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, content_length, ENC_UTF_8|ENC_BIG_ENDIAN);
+ proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, content_length, ENC_UTF_8|ENC_NA);
}
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 4146eccc59..21538e19b8 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -2467,7 +2467,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_start_ok_mechanism,
tvb, offset + 1, tvb_get_guint8(tvb, offset),
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + tvb_get_guint8(tvb, offset), length);
}
if (flag1 & 0x04) {
@@ -2483,7 +2483,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_start_ok_locale,
tvb, offset + 1, tvb_get_guint8(tvb, offset),
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + tvb_get_guint8(tvb, offset), length);
}
break;
@@ -2582,7 +2582,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_method_connection_open_virtual_host,
tvb,
offset + 1,
- tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, tvb_get_guint8(tvb, offset) + 1, length);
}
if (flag1 & 0x02) {
@@ -2638,7 +2638,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_redirect_host,
tvb, offset + 2, tvb_get_ntohs(tvb, offset),
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 2 + tvb_get_ntohs(tvb, offset), length);
}
if (flag1 & 0x02) {
@@ -2677,7 +2677,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_close_reply_text,
tvb, offset + 1, tvb_get_guint8(tvb, offset),
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + tvb_get_guint8(tvb, offset), length);
}
break;
@@ -3122,7 +3122,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
if ((offset + 2 + size) > length)
THROW(ReportedBoundsError);
proto_tree_add_item(args_tree, hf_amqp_0_10_method_execution_description,
- tvb, offset + 2, size, ENC_BIG_ENDIAN);
+ tvb, offset + 2, size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (2 + size), length);
}
if (flag1 & 0x40) {
@@ -3209,7 +3209,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW(ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_transfer_destination,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* accept-mode (accept-mode [uint8]) */
@@ -3268,7 +3268,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_reject_text,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -3320,7 +3320,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
if (flag1 & 0x02) {
@@ -3329,7 +3329,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 2 + size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_resume_id,
- tvb, offset + 2, size, ENC_BIG_ENDIAN);
+ tvb, offset + 2, size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 2 + size, length);
}
break;
@@ -3343,7 +3343,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_subscribe_queue,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
if (flag1 & 0x02) {
@@ -3352,7 +3352,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
if (flag1 & 0x04) { /* accept-mode (accept-mode [uint8]) */
@@ -3379,7 +3379,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 2 + size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_resume_id,
- tvb, offset, 2 + size, ENC_BIG_ENDIAN);
+ tvb, offset, 2 + size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 2 + size, length);
}
if (flag1 & 0x40) {
@@ -3416,7 +3416,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
break;
@@ -3430,7 +3430,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
if (flag1 & 0x02) {
@@ -3451,7 +3451,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
if (flag1 & 0x02) {
@@ -3479,7 +3479,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
break;
@@ -3493,7 +3493,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_dest,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, 1 + str_size, length);
}
break;
@@ -3797,7 +3797,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* type (str8) */
@@ -3805,7 +3805,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_type,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* alternate-exchange (name [str8]) */
@@ -3813,7 +3813,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_alt_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -3854,7 +3854,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -3873,7 +3873,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -3886,7 +3886,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_bind_queue,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* exchange (name [str8]) */
@@ -3894,7 +3894,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* binding-key (str8) */
@@ -3902,7 +3902,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x08) { /* arguments (map) */
@@ -3931,7 +3931,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_bind_queue,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* exchange (name [str8]) */
@@ -3939,7 +3939,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* binding-key (str8) */
@@ -3947,7 +3947,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -3960,7 +3960,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_declare_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* queue (queue.name [str8]) */
@@ -3968,7 +3968,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_bind_queue,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* binding-key (str8) */
@@ -3976,7 +3976,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x08) { /* arguments (map) */
@@ -4063,7 +4063,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* alternate-exchange (exchange.name [str8]) */
@@ -4071,7 +4071,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_alt_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4115,7 +4115,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4137,7 +4137,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4150,7 +4150,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4249,7 +4249,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) <= length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* consumer-tag (str8) */
@@ -4257,7 +4257,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4302,7 +4302,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4315,7 +4315,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_identifier,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* content-size (uint64) */
@@ -4345,7 +4345,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_publish_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* routing-key (str8) */
@@ -4353,7 +4353,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_publish_routing_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4370,7 +4370,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_identifier,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4389,7 +4389,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_return_reply_text,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* exchange (exchange.name [str8]) */
@@ -4397,7 +4397,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_return_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x08) { /* routing-key (str8) */
@@ -4405,7 +4405,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_return_routing_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4418,7 +4418,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_deliver_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* delivery-tag (uint64) */
@@ -4438,7 +4438,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_deliver_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x10) { /* routing-key (str8) */
@@ -4446,7 +4446,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_deliver_routing_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x20) { /* identifier (str8) */
@@ -4454,7 +4454,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_file_identifier,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4592,7 +4592,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* consumer-tag (str8) */
@@ -4600,7 +4600,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4642,7 +4642,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4655,7 +4655,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) <= length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_publish_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* routing-key (str8) */
@@ -4663,7 +4663,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_publish_routing_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
/*
@@ -4691,7 +4691,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_return_reply_text,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x04) { /* exchange (exchange.name [str8]) */
@@ -4699,7 +4699,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_return_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x08) { /* routing-key (str8) */
@@ -4707,7 +4707,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_return_routing_key,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4720,7 +4720,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_deliver_consumer_tag,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x02) { /* delivery-tag (uint64) */
@@ -4734,7 +4734,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_deliver_exchange,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
if (flag1 & 0x08) { /* queue (queue.name [str8]) */
@@ -4742,7 +4742,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
THROW_ON(((offset + 1 + str_size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_stream_deliver_queue,
- tvb, offset + 1, str_size, ENC_BIG_ENDIAN);
+ tvb, offset + 1, str_size, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + str_size), length);
}
break;
@@ -4834,7 +4834,7 @@ dissect_amqp_0_10_struct_delivery_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(args_tree,
hf_amqp_0_10_struct_delivery_properties_exchange,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag2 & 0x02) {
@@ -4842,7 +4842,7 @@ dissect_amqp_0_10_struct_delivery_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(args_tree,
hf_amqp_0_10_struct_delivery_properties_routing_key,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag2 & 0x04) {
@@ -4851,7 +4851,7 @@ dissect_amqp_0_10_struct_delivery_properties(tvbuff_t *tvb,
THROW_ON(((offset + 2 + len16) > max_length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_resume_id,
- tvb, offset + 2, len16, ENC_BIG_ENDIAN);
+ tvb, offset + 2, len16, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (2 + len16), max_length);
}
if (flag2 & 0x08) {
@@ -4978,7 +4978,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(args_tree,
hf_amqp_0_10_struct_reply_to_exchange,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (subflag1 & 0x02) {
@@ -4986,7 +4986,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(args_tree,
hf_amqp_0_10_struct_reply_to_routing_key,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
}
@@ -4995,7 +4995,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_content_type,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x20) {
@@ -5003,7 +5003,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_content_encoding,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x40) {
@@ -5073,7 +5073,7 @@ dissect_amqp_0_10_struct_exchange_query_result(tvbuff_t *tvb,
THROW_ON(((offset + 1 + len8) > max_length), ReportedBoundsError);
proto_tree_add_item(result,
hf_amqp_0_10_method_exchange_declare_type,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
proto_tree_add_item(result,
@@ -5135,7 +5135,7 @@ dissect_amqp_0_10_struct_queue_query_result(tvbuff_t *tvb,
THROW_ON(((offset + 1 + len8) > max_length), ReportedBoundsError);
proto_tree_add_item(result,
hf_amqp_0_10_method_queue_name,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x02) { /* alternate-exchange (exchange.name [str8]) */
@@ -5143,7 +5143,7 @@ dissect_amqp_0_10_struct_queue_query_result(tvbuff_t *tvb,
THROW_ON(((offset + 1 + len8) > max_length), ReportedBoundsError);
proto_tree_add_item(result,
hf_amqp_0_10_method_queue_alt_exchange,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
/*
@@ -5220,7 +5220,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_content_type,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x02) {
@@ -5228,7 +5228,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_content_encoding,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x04) {
@@ -5259,7 +5259,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_reply_to,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x20) {
@@ -5267,7 +5267,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_message_id,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x40) {
@@ -5275,7 +5275,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_filename,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x80) {
@@ -5293,7 +5293,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_file_properties_cluster_id,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
}
@@ -5330,7 +5330,7 @@ dissect_amqp_0_10_struct_stream_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_stream_properties_content_type,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x02) {
@@ -5338,7 +5338,7 @@ dissect_amqp_0_10_struct_stream_properties(tvbuff_t *tvb,
len8 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(props,
hf_amqp_0_10_struct_stream_properties_content_encoding,
- tvb, offset + 1, len8, ENC_BIG_ENDIAN);
+ tvb, offset + 1, len8, ENC_ASCII|ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x04) {
@@ -5615,7 +5615,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN);
amqp_tree = proto_item_add_subtree(ti, ett_amqp_init);
- proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN);
@@ -5761,7 +5761,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_BIG_ENDIAN);
amqp_tree = proto_item_add_subtree(ti, ett_amqp_init);
- proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN);
@@ -6464,7 +6464,7 @@ dissect_amqp_0_9_method_connection_start_ok(tvbuff_t *tvb, packet_info *pinfo,
/* mechanism (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_start_ok_mechanism,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* response (longstr) */
@@ -6474,7 +6474,7 @@ dissect_amqp_0_9_method_connection_start_ok(tvbuff_t *tvb, packet_info *pinfo,
/* locale (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_start_ok_locale,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6564,12 +6564,12 @@ dissect_amqp_0_9_method_connection_open(tvbuff_t *tvb,
{
/* virtual-host (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_open_virtual_host,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* capabilities (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_capabilities,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* insist (bit) */
@@ -6587,7 +6587,7 @@ dissect_amqp_0_9_method_connection_open_ok(tvbuff_t *tvb,
{
/* known-hosts (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_ok_known_hosts,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6601,12 +6601,12 @@ dissect_amqp_0_9_method_connection_redirect(tvbuff_t *tvb _U_,
{
/* host (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_redirect_host,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* known-hosts (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_redirect_known_hosts,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6625,7 +6625,7 @@ dissect_amqp_0_9_method_connection_close(tvbuff_t *tvb _U_,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_close_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* class-id (short) */
@@ -6658,7 +6658,7 @@ dissect_amqp_0_9_method_channel_open(tvbuff_t *tvb _U_,
{
/* out-of-band (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_channel_open_out_of_band,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6717,7 +6717,7 @@ dissect_amqp_0_9_method_channel_close(tvbuff_t *tvb _U_,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_channel_close_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* class-id (short) */
@@ -6791,7 +6791,7 @@ dissect_amqp_0_9_method_access_request(tvbuff_t *tvb _U_,
{
/* realm (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_access_request_realm,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exclusive (bit) */
@@ -6845,12 +6845,12 @@ dissect_amqp_0_9_method_exchange_declare(tvbuff_t *tvb, packet_info *pinfo,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_declare_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* type (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_declare_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* passive (bit) */
@@ -6907,17 +6907,17 @@ dissect_amqp_0_9_method_exchange_bind(tvbuff_t *tvb, packet_info *pinfo,
/* destination (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_bind_destination,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* source (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_bind_source,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_bind_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -6957,7 +6957,7 @@ dissect_amqp_0_9_method_exchange_delete(tvbuff_t *tvb _U_,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_delete_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* if-unused (bit) */
@@ -6994,7 +6994,7 @@ dissect_amqp_0_9_method_queue_declare(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_declare_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* passive (bit) */
@@ -7036,7 +7036,7 @@ dissect_amqp_0_9_method_queue_declare_ok(tvbuff_t *tvb _U_,
{
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_declare_ok_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* message-count (long) */
@@ -7066,17 +7066,17 @@ dissect_amqp_0_9_method_queue_bind(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_bind_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_bind_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_bind_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -7117,17 +7117,17 @@ dissect_amqp_0_9_method_queue_unbind(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_unbind_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_unbind_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_unbind_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* arguments (table) */
@@ -7162,7 +7162,7 @@ dissect_amqp_0_9_method_queue_purge(tvbuff_t *tvb _U_,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_purge_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -7199,7 +7199,7 @@ dissect_amqp_0_9_method_queue_delete(tvbuff_t *tvb _U_,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_queue_delete_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* if-unused (bit) */
@@ -7277,12 +7277,12 @@ dissect_amqp_0_9_method_basic_consume(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -7320,7 +7320,7 @@ dissect_amqp_0_9_method_basic_consume_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7334,7 +7334,7 @@ dissect_amqp_0_9_method_basic_cancel(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -7352,7 +7352,7 @@ dissect_amqp_0_9_method_basic_cancel_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7371,12 +7371,12 @@ dissect_amqp_0_9_method_basic_publish(tvbuff_t *tvb _U_,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_publish_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_publish_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* mandatory (bit) */
@@ -7403,17 +7403,17 @@ dissect_amqp_0_9_method_basic_return(tvbuff_t *tvb _U_,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7427,7 +7427,7 @@ dissect_amqp_0_9_method_basic_deliver(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -7442,12 +7442,12 @@ dissect_amqp_0_9_method_basic_deliver(tvbuff_t *tvb _U_,
offset += 1;
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_deliver_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_deliver_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7466,7 +7466,7 @@ dissect_amqp_0_9_method_basic_get(tvbuff_t *tvb _U_,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_get_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-ack (bit) */
@@ -7494,12 +7494,12 @@ dissect_amqp_0_9_method_basic_get_ok(tvbuff_t *tvb _U_,
offset += 1;
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_get_ok_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_get_ok_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* message-count (long) */
@@ -7518,7 +7518,7 @@ dissect_amqp_0_9_method_basic_get_empty(tvbuff_t *tvb _U_,
{
/* cluster-id (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_get_empty_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7619,12 +7619,12 @@ dissect_amqp_0_9_method_file_consume(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -7662,7 +7662,7 @@ dissect_amqp_0_9_method_file_consume_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7676,7 +7676,7 @@ dissect_amqp_0_9_method_file_cancel(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -7694,7 +7694,7 @@ dissect_amqp_0_9_method_file_cancel_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7708,7 +7708,7 @@ dissect_amqp_0_9_method_file_open(tvbuff_t *tvb _U_,
{
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_open_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* content-size (longlong) */
@@ -7755,12 +7755,12 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb _U_,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* mandatory (bit) */
@@ -7774,7 +7774,7 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb _U_,
offset += 1;
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7793,17 +7793,17 @@ dissect_amqp_0_9_method_file_return(tvbuff_t *tvb _U_,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7817,7 +7817,7 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -7832,17 +7832,17 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb _U_,
offset += 1;
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7935,12 +7935,12 @@ dissect_amqp_0_9_method_stream_consume(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -7974,7 +7974,7 @@ dissect_amqp_0_9_method_stream_consume_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7988,7 +7988,7 @@ dissect_amqp_0_9_method_stream_cancel(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -8006,7 +8006,7 @@ dissect_amqp_0_9_method_stream_cancel_ok(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8025,12 +8025,12 @@ dissect_amqp_0_9_method_stream_publish(tvbuff_t *tvb _U_,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* mandatory (bit) */
@@ -8057,17 +8057,17 @@ dissect_amqp_0_9_method_stream_return(tvbuff_t *tvb _U_,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8081,7 +8081,7 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb _U_,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -8091,12 +8091,12 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb _U_,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8182,7 +8182,7 @@ dissect_amqp_0_9_method_dtx_start(tvbuff_t *tvb _U_,
{
/* dtx-identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_dtx_start_dtx_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8230,7 +8230,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-type (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_content_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8238,7 +8238,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8272,7 +8272,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* correlation-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_correlation_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8280,7 +8280,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* reply-to (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_reply_to,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8288,7 +8288,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* expiration (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_expiration,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8296,7 +8296,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* message-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_message_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8312,7 +8312,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* type (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8320,7 +8320,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* user-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_user_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8328,7 +8328,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* app-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_app_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8336,7 +8336,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* cluster-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8357,7 +8357,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-type (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_content_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8365,7 +8365,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8390,7 +8390,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* reply-to (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_reply_to,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8398,7 +8398,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* message-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_message_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8406,7 +8406,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* filename (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_filename,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8422,7 +8422,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* cluster-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8443,7 +8443,7 @@ dissect_amqp_0_9_content_header_stream(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-type (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_stream_content_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8451,7 +8451,7 @@ dissect_amqp_0_9_content_header_stream(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_stream_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8506,7 +8506,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* proxy-name (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_proxy_name,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8514,7 +8514,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* data-name (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_data_name,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c
index 69528b31ab..19d406d6ca 100644
--- a/epan/dissectors/packet-ancp.c
+++ b/epan/dissectors/packet-ancp.c
@@ -427,7 +427,7 @@ dissect_ancp_port_up_dn_mgmt(tvbuff_t *tvb, proto_tree *ancp_tree, gint offset)
default:
/* Assume TLV value is string - covers ALCID, OAM resp */
proto_tree_add_item(tlv_tree, hf_ancp_ext_tlv_value_str,
- tvb, offset, tlen, FALSE);
+ tvb, offset, tlen, ENC_ASCII|ENC_NA);
offset += tlen;
SKIPPADDING(offset, tlen);
break;
diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c
index 99e2aad606..c679636e70 100644
--- a/epan/dissectors/packet-applemidi.c
+++ b/epan/dissectors/packet-applemidi.c
@@ -150,7 +150,7 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
/* Name is optional */
if ( len > 0 ) {
name = tvb_get_ephemeral_string( tvb, offset, len );
- proto_tree_add_item( applemidi_tree, hf_applemidi_name, tvb, offset, len, FALSE );
+ proto_tree_add_item( applemidi_tree, hf_applemidi_name, tvb, offset, len, ENC_ASCII|ENC_NA );
col_append_fstr( pinfo->cinfo, COL_INFO, ": peer = \"%s\"", name );
}
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index 7d9d6c5adf..38fe3895d4 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -550,15 +550,15 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 2;
proto_tree_add_item(tree, hf_artnet_poll_reply_short_name,
- tvb, offset, 18, ENC_BIG_ENDIAN);
+ tvb, offset, 18, ENC_ASCII|ENC_NA);
offset += 18;
proto_tree_add_item(tree, hf_artnet_poll_reply_long_name,
- tvb, offset, 64, ENC_BIG_ENDIAN);
+ tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
proto_tree_add_item(tree, hf_artnet_poll_reply_node_report,
- tvb, offset, 64, ENC_BIG_ENDIAN);
+ tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
@@ -846,11 +846,11 @@ dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) {
offset += 2;
proto_tree_add_item(tree, hf_artnet_address_short_name,
- tvb, offset, 18, ENC_BIG_ENDIAN);
+ tvb, offset, 18, ENC_ASCII|ENC_NA);
offset += 18;
proto_tree_add_item(tree, hf_artnet_address_long_name,
- tvb, offset, 64, ENC_BIG_ENDIAN);
+ tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
hi = proto_tree_add_item(tree,
@@ -1002,7 +1002,7 @@ dissect_artnet_video_setup(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
offset += 1;
proto_tree_add_item(tree, hf_artnet_video_setup_win_font_name,
- tvb, offset, 64, ENC_BIG_ENDIAN);
+ tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
size = last_font * font_height;
@@ -1386,7 +1386,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb_get_ephemeral_string(tvb, offset, 8));
if( tree ){
proto_tree_add_item(artnet_header_tree, hf_artnet_header_id,
- tvb, offset, 8, ENC_BIG_ENDIAN);
+ tvb, offset, 8, ENC_ASCII|ENC_NA);
}
offset += 8;
diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c
index e2c2572490..fb3ec9c0c9 100644
--- a/epan/dissectors/packet-aruba-papi.c
+++ b/epan/dissectors/packet-aruba-papi.c
@@ -90,7 +90,7 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree)
while(offset < tvb_reported_length(tvb)) {
switch(tvb_get_guint8(tvb,offset)) {
case 0x00:
- ti = proto_tree_add_item(debug_tree, hf_papi_debug_text, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), FALSE);
+ ti = proto_tree_add_item(debug_tree, hf_papi_debug_text, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), ENC_ASCII|ENC_NA);
debug_sub_tree = proto_item_add_subtree(ti, ett_papi);
proto_tree_add_item(debug_sub_tree, hf_papi_debug_text_length, tvb, offset+1, 2, ENC_BIG_ENDIAN);
offset += tvb_get_ntohs(tvb, offset+1) + 3;
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index b13e550a13..17642864e7 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -3545,7 +3545,7 @@ static void dissect_r3_upstreamcommand_debugmsg (tvbuff_t *tvb, guint32 start_of
debugmsg_item = proto_tree_add_text (tree, tvb, start_offset, -1, "Debug message");
debugmsg_tree = proto_item_add_subtree (debugmsg_item, ett_r3debugmsg);
- proto_tree_add_item (debugmsg_tree, hf_r3_debugmsg, tvb, start_offset + 1, -1, TRUE);
+ proto_tree_add_item (debugmsg_tree, hf_r3_debugmsg, tvb, start_offset + 1, -1, ENC_ASCII|ENC_NA);
}
static void dissect_r3_upstreamcommand_queryversion (tvbuff_t *tvb, guint32 start_offset, guint32 length, packet_info *pinfo, proto_tree *tree)
@@ -3653,7 +3653,7 @@ static void dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start
break;
case CONFIGTYPE_STRING :
- proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_string, tvb, offset + 3, tvb_get_guint8 (tvb, offset + 0) - 3, TRUE);
+ proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata_string, tvb, offset + 3, tvb_get_guint8 (tvb, offset + 0) - 3, ENC_ASCII|ENC_NA);
break;
default :
@@ -4422,12 +4422,12 @@ static void dissect_r3_upstreammfgfield_keypadchar (tvbuff_t *tvb, guint32 start
static void dissect_r3_upstreammfgfield_magcard (tvbuff_t *tvb, guint32 start_offset _U_, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree)
{
- proto_tree_add_item (tree, hf_r3_testmagcard, tvb, 0, -1, TRUE);
+ proto_tree_add_item (tree, hf_r3_testmagcard, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
static void dissect_r3_upstreammfgfield_proxcard (tvbuff_t *tvb, guint32 start_offset _U_, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree)
{
- proto_tree_add_item (tree, hf_r3_testproxcard, tvb, 0, -1, TRUE);
+ proto_tree_add_item (tree, hf_r3_testproxcard, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
/*
@@ -4607,7 +4607,7 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint
break;
case CONFIGTYPE_STRING :
- proto_tree_add_item (sc_tree, hf_r3_configitemdata_string, payload_tvb, offset + 2, tvb_get_guint8 (payload_tvb, offset + 0) - 2, TRUE);
+ proto_tree_add_item (sc_tree, hf_r3_configitemdata_string, payload_tvb, offset + 2, tvb_get_guint8 (payload_tvb, offset + 0) - 2, ENC_ASCII|ENC_NA);
break;
default :
@@ -5587,7 +5587,7 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
if (!(tvb_strneql (tvb, start_offset, "~~~ds", 5)))
{
if (r3_tree)
- proto_tree_add_item (r3_tree, hf_r3_tildex3ds, tvb, start_offset + 0, -1, TRUE);
+ proto_tree_add_item (r3_tree, hf_r3_tildex3ds, tvb, start_offset + 0, -1, ENC_ASCII|ENC_NA);
offset = start_offset + 5;
}
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 763123d2d4..b8910630cf 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -1019,7 +1019,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
proto_tree_add_item(sub_tree, hf_asp_server_flag_utf8_name , tvb, ofs, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_tree, hf_asp_server_flag_fast_copy , tvb, ofs, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tree, hf_asp_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_asp_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_ASCII|ENC_BIG_ENDIAN);
flag = tvb_get_ntohs(tvb, ofs);
if ((flag & AFPSRVRINFO_SRVSIGNATURE)) {
@@ -1054,7 +1054,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
}
if (machine_ofs)
- proto_tree_add_item(tree, hf_asp_server_type, tvb, machine_ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_asp_server_type, tvb, machine_ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF);
if (ofs) {
@@ -1064,7 +1064,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
sub_tree = proto_item_add_subtree(ti, ett_asp_vers);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_asp_server_vers, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_asp_server_vers, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
@@ -1077,7 +1077,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
sub_tree = proto_item_add_subtree(ti, ett_asp_uams);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_asp_server_uams, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_asp_server_uams, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
@@ -1153,7 +1153,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
sub_tree = proto_item_add_subtree(ti, ett_asp_directory);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_asp_server_directory, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_asp_server_directory, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
@@ -1516,7 +1516,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
sub_tree = proto_item_add_subtree(ti, ett_zip_zones_list);
for (i= 0; i < count; i++) {
len = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(sub_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
offset += len +1;
}
break;
@@ -1580,7 +1580,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 4;
len = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
offset += len +1;
len = tvb_get_guint8(tvb, offset);
@@ -1589,7 +1589,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
offset += len;
- proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
break;
case 2: /* Reply */
@@ -1605,7 +1605,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(net_tree, hf_zip_network, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
len = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(net_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(net_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
offset += len +1;
}
break;
@@ -1615,7 +1615,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_NA);
offset += 4;
- proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
break;
case 6 : /* GetNetInfo reply */
@@ -1634,7 +1634,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
len = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
offset += len +1;
len = tvb_get_guint8(tvb, offset);
@@ -1643,7 +1643,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
offset += len;
if ((flag & 0x80) != 0)
- proto_tree_add_item(zip_tree, hf_zip_default_zone, tvb, offset, 1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(zip_tree, hf_zip_default_zone, tvb, offset, 1,ENC_ASCII|ENC_BIG_ENDIAN);
break;
default:
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index f4ce94192f..cc17e03e51 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -181,7 +181,7 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
if (val > MAX_ELEMENT_VAL) {
expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_ERROR, "String length %" G_GINT64_MODIFIER "d longer than we can handle", val);
}
- proto_tree_add_item(tree, hf_banana_string, tvb, offset, (guint32) val, FALSE);
+ proto_tree_add_item(tree, hf_banana_string, tvb, offset, (guint32) val, ENC_ASCII|ENC_NA);
offset += (gint) val;
break;
case BE_NEG_INT:
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 4e6e9a78ad..725bc8ff38 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -343,7 +343,7 @@ static int dissect_bencoding_str(tvbuff_t *tvb, packet_info *pinfo _U_,
}
if (tree) {
proto_tree_add_uint(tree, hf_bittorrent_bstr_length, tvb, offset, used, stringlen);
- proto_tree_add_item(tree, hf_bittorrent_bstr, tvb, offset+used, stringlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_bittorrent_bstr, tvb, offset+used, stringlen, ENC_ASCII|ENC_NA);
if (treeadd==1) {
proto_item_append_text(ti, " Key: %s", format_text(ep_tvb_memdup(tvb, offset+used, stringlen), stringlen));
@@ -658,7 +658,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
throw an exception, so we won't use msgtype or type. */
if (isamp) {
proto_tree_add_item(mtree, hf_azureus_msg_type_len, tvb, offset, 4, ENC_BIG_ENDIAN);
- proto_tree_add_item(mtree, hf_azureus_msg_type, tvb, offset+4, typelen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(mtree, hf_azureus_msg_type, tvb, offset+4, typelen, ENC_ASCII|ENC_NA);
proto_item_append_text(ti, ": Len %u, %s", length, msgtype);
proto_tree_add_item(mtree, hf_azureus_msg_prio, tvb, offset+4+typelen, 1, ENC_BIG_ENDIAN);
offset += 4+typelen+1;
@@ -743,7 +743,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
case AZUREUS_MESSAGE_JPC_HELLO:
stringlen = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(mtree, hf_azureus_jpc_addrlen, tvb, offset, 4, ENC_BIG_ENDIAN);
- proto_tree_add_item(mtree, hf_azureus_jpc_addr, tvb, offset+4, stringlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(mtree, hf_azureus_jpc_addr, tvb, offset+4, stringlen, ENC_ASCII|ENC_NA);
proto_tree_add_item(mtree, hf_azureus_jpc_port, tvb, offset+4+stringlen, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(mtree, hf_azureus_jpc_session, tvb, offset+4+stringlen+4, 4, ENC_BIG_ENDIAN);
break;
@@ -766,7 +766,7 @@ static void dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, p
col_set_str(pinfo->cinfo, COL_INFO, "Handshake");
proto_tree_add_item(tree, hf_bittorrent_prot_name_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1;
- proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, ENC_BIG_ENDIAN); offset += 19;
+ proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, ENC_ASCII|ENC_NA); offset += 19;
proto_tree_add_item(tree, hf_bittorrent_reserved, tvb, offset, 8, ENC_NA); offset += 8;
proto_tree_add_item(tree, hf_bittorrent_sha1_hash, tvb, offset, 20, ENC_NA);
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 27028a45b9..bab87fd678 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -100,7 +100,7 @@ static void dissect_bjnp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item (tree, proto_bjnp, tvb, offset, -1, ENC_NA);
bjnp_tree = proto_item_add_subtree (ti, ett_bjnp);
- proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item (bjnp_tree, hf_bjnp_id, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
dev_type = tvb_get_guint8 (tvb, offset);
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5ed457da97..8234fa9231 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -1640,7 +1640,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
* should we check for non-printables?
*/
- proto_tree_add_item(v_tree, hf_bootp_option_vendor_class_id, tvb, optoff, consumed-2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_vendor_class_id, tvb, optoff, consumed-2, ENC_ASCII|ENC_NA);
if ((tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_MTA_CAP10,
(int)strlen(PACKETCABLE_MTA_CAP10)) == 0)
||
@@ -1856,7 +1856,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
optoff++;
optleft = optlen - 1;
- proto_tree_add_item(v_tree, hf_bootp_option_slp_service_scope_string, tvb, optoff, optleft, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_slp_service_scope_string, tvb, optoff, optleft, ENC_ASCII|ENC_NA);
break;
case 81: /* Client Fully Qualified Domain Name */
@@ -1882,7 +1882,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
tvb, optoff+3, optlen-3, dns_name);
} else {
proto_tree_add_item(v_tree, hf_bootp_fqdn_asciiname,
- tvb, optoff+3, optlen-3, ENC_BIG_ENDIAN);
+ tvb, optoff+3, optlen-3, ENC_ASCII|ENC_NA);
}
}
break;
@@ -1897,7 +1897,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
/* Option 85 can be sent as a string */
/* Added by Greg Morris (gmorris[AT]novell.com) */
if (novell_string) {
- proto_tree_add_item(v_tree, hf_bootp_option_novell_dss_string, tvb, optoff, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_novell_dss_string, tvb, optoff, optlen, ENC_ASCII|ENC_NA);
} else{
/* IP addresses */
for (i = optoff, optleft = optlen; optleft > 0;
@@ -1966,7 +1966,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
break;
default:
- proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_rdm_rdv, tvb, optoff, 8, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_rdm_rdv, tvb, optoff, 8, ENC_ASCII|ENC_NA);
break;
}
optoff += 8;
@@ -1990,7 +1990,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_secret_id, tvb, optoff, 4, ENC_BIG_ENDIAN);
optoff += 4;
optleft -= 4;
- proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_hmac_md5_hash, tvb, optoff, 16, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_hmac_md5_hash, tvb, optoff, 16, ENC_ASCII|ENC_NA);
break;
}
@@ -1998,7 +1998,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
if (optleft == 0)
break;
- proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_information, tvb, optoff, optleft, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_information, tvb, optoff, optleft, ENC_ASCII|ENC_NA);
break;
}
break;
@@ -2007,7 +2007,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
if (optleft == 0)
break;
- proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_information, tvb, optoff, optleft, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_dhcp_authentication_information, tvb, optoff, optleft, ENC_ASCII|ENC_NA);
break;
}
break;
@@ -2018,7 +2018,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
if (optleft >= 3)
{
proto_tree_add_item(v_tree, hf_bootp_option_civic_location_what, tvb, optoff, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(v_tree, hf_bootp_option_civic_location_country, tvb, optoff+1, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_civic_location_country, tvb, optoff+1, 2, ENC_ASCII|ENC_NA);
optleft = optleft - 3;
optoff = optoff + 3;
@@ -2036,7 +2036,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
if (optleft >= calength)
{
- proto_tree_add_item(v_tree, hf_bootp_option_civic_location_ca_value, tvb, optoff, calength, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_civic_location_ca_value, tvb, optoff, calength, ENC_ASCII|ENC_NA);
optoff = optoff + calength;
optleft = optleft - calength;
@@ -2128,14 +2128,14 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id_option, tvb, optoff, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id_len, tvb, optoff+1, 1, ENC_BIG_ENDIAN);
s_len = tvb_get_guint8(tvb, optoff+1);
- proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id, tvb, optoff+2, s_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id, tvb, optoff+2, s_len, ENC_ASCII|ENC_NA);
if (optlen > s_len+2) { /* Second DSS_ID*/
proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id_option, tvb, optoff+2+s_len, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id_len, tvb, optoff+1+2+s_len, 1, ENC_BIG_ENDIAN);
s_len = tvb_get_guint8(tvb, optoff+1+2+s_len);
- proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id, tvb, optoff+2+2+s_len, s_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_cl_dss_id, tvb, optoff+2+2+s_len, s_len, ENC_ASCII|ENC_NA);
}
} else {
expert_add_info_format(pinfo, vti, PI_PROTOCOL, PI_ERROR, "Invalid length of DHCP option!");
@@ -2168,7 +2168,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
optoff += 5;
optleft -= 5;
- proto_tree_add_item(v_tree, hf_bootp_option_vi_class_data, tvb, optoff, data_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(v_tree, hf_bootp_option_vi_class_data, tvb, optoff, data_len, ENC_ASCII|ENC_NA);
/* look for next enterprise number */
optoff += data_len;
@@ -2851,7 +2851,7 @@ dissect_vendor_cablelabs_suboption(packet_info *pinfo, proto_item *v_ti, proto_t
proto_tree_add_bytes_format_value(o43cl_v_tree, hf_bootp_option43_cl_oui_bytes, tvb, suboptoff, subopt_len, NULL,
"%02x:%02x:%02x", tvb_get_guint8(tvb, suboptoff), tvb_get_guint8(tvb, suboptoff+1), tvb_get_guint8(tvb, suboptoff+2));
} else if (subopt_len == 6) {
- proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_cl_oui_string, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_cl_oui_string, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA);
} else {
expert_add_info_format(pinfo, vti, PI_PROTOCOL, PI_ERROR, "length isn't 3 or 6");
}
@@ -2975,7 +2975,7 @@ dissect_vendor_alcatel_suboption(packet_info *pinfo, proto_item *v_ti, proto_tre
proto_tree_add_item(o43alcatel_v_tree, hf_bootp_option43_alcatel_app_type, tvb, suboptoff, 1, ENC_BIG_ENDIAN);
break;
case 67: /* 0x43 - Alcatel-Lucent SIP URL */
- proto_tree_add_item(o43alcatel_v_tree, hf_bootp_option43_alcatel_sip_url, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(o43alcatel_v_tree, hf_bootp_option43_alcatel_sip_url, tvb, suboptoff, subopt_len, ENC_ASCII|ENC_NA);
break;
default:
expert_add_info_format(pinfo, vti, PI_PROTOCOL, PI_ERROR, "ERROR, please report: Unknown subopt type handler %d", subopt);
@@ -4720,7 +4720,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tvb_get_guint8(tvb, SERVER_NAME_OFFSET) != '\0') {
proto_tree_add_item(bp_tree, hf_bootp_server, tvb,
SERVER_NAME_OFFSET,
- SERVER_NAME_LEN, ENC_BIG_ENDIAN);
+ SERVER_NAME_LEN, ENC_ASCII|ENC_NA);
} else {
proto_tree_add_string_format(bp_tree, hf_bootp_server, tvb,
@@ -4739,7 +4739,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tvb_get_guint8(tvb, FILE_NAME_OFFSET) != '\0') {
proto_tree_add_item(bp_tree, hf_bootp_file, tvb,
FILE_NAME_OFFSET,
- FILE_NAME_LEN, ENC_BIG_ENDIAN);
+ FILE_NAME_LEN, ENC_ASCII|ENC_NA);
} else {
proto_tree_add_string_format(bp_tree, hf_bootp_file, tvb,
FILE_NAME_OFFSET,
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 231e9853e0..f521bac23b 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -658,7 +658,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(mstp_tree, hf_bpdu_mst_config_format_selector, tvb,
BPDU_MST_CONFIG_FORMAT_SELECTOR, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(mstp_tree, hf_bpdu_mst_config_name, tvb,
- BPDU_MST_CONFIG_NAME, 32, ENC_BIG_ENDIAN);
+ BPDU_MST_CONFIG_NAME, 32, ENC_ASCII|ENC_NA);
proto_tree_add_item(mstp_tree, hf_bpdu_mst_config_revision_level, tvb,
BPDU_MST_CONFIG_REVISION_LEVEL, 2, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 77d0c04355..8bb0b35298 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -929,7 +929,7 @@ dissect_bthci_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *pinfo
break;
case 0x08: /* Device Name, shortened */
case 0x09: /* Device Name, full */
- proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_device_name, tvb, offset+i+2, length-1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_device_name, tvb, offset+i+2, length-1, ENC_ASCII|ENC_NA);
proto_item_append_text(ti_eir_struct,": %s", tvb_format_text(tvb,offset+i+2,length-1));
break;
case 0x0A: /* Tx Power Level */
@@ -1069,7 +1069,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
proto_tree_add_item(tree, hf_bthci_cmd_pin_code_length ,tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset++;
- proto_tree_add_item(tree, hf_bthci_cmd_pin_code ,tvb, offset, 16, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(tree, hf_bthci_cmd_pin_code ,tvb, offset, 16, ENC_ASCII|ENC_NA);
offset+=16;
break;
@@ -1543,7 +1543,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
case 0x0013: /* Change Local Name */
proto_tree_add_item(tree, hf_bthci_cmd_device_name,
- tvb, offset, 248, ENC_BIG_ENDIAN);
+ tvb, offset, 248, ENC_ASCII|ENC_NA);
offset+=248;
break;
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 1e35a9983c..3733f5b3d0 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -891,7 +891,7 @@ dissect_bthci_evt_remote_name_req_complete(tvbuff_t *tvb, int offset, packet_inf
offset = dissect_bthci_evt_bd_addr(tvb, offset, pinfo, tree);
- proto_tree_add_item(tree, hf_bthci_evt_remote_name, tvb, offset, 248, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_bthci_evt_remote_name, tvb, offset, 248, ENC_ASCII|ENC_NA);
offset+=248;
return offset;
@@ -1266,7 +1266,7 @@ dissect_bthci_evt_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *p
break;
case 0x08: /* Device Name, shortened */
case 0x09: /* Device Name, full */
- proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_device_name, tvb, offset+i+2, length-1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_device_name, tvb, offset+i+2, length-1, ENC_ASCII|ENC_NA);
proto_item_append_text(ti_eir_struct,": %s", tvb_format_text(tvb,offset+i+2,length-1));
break;
case 0x0A: /* Tx Power Level */
@@ -1630,7 +1630,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo
proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset++;
- proto_tree_add_item(tree, hf_bthci_evt_device_name, tvb, offset, 248, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_bthci_evt_device_name, tvb, offset, 248, ENC_ASCII|ENC_NA);
offset+=248;
break;
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index af7eee3af7..6a7a20fd7e 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -846,7 +846,7 @@ dissect_bthf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_add_fstr(pinfo->cinfo, COL_INFO, "%s \"%s\"",
pinfo->p2p_dir==P2P_DIR_SENT?"Sent":"Rcvd", tvb_format_text(tvb, 0, length));
- proto_tree_add_item(st, hf_at_cmd, tvb, 0, -1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(st, hf_at_cmd, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
void
@@ -909,7 +909,7 @@ dissect_btdun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_add_fstr(pinfo->cinfo, COL_INFO, "%s \"%s\"",
pinfo->p2p_dir==P2P_DIR_SENT?"Sent":"Rcvd", tvb_format_text(tvb, 0, length));
- proto_tree_add_item(st, hf_dun_at_cmd, tvb, 0, -1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(st, hf_dun_at_cmd, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
else {
/* ... or raw PPP */
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index f6d72d2146..306f3d79e8 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -774,11 +774,11 @@ dissect_capwap_ac_information(tvbuff_t *tvb, proto_tree *ac_information_type_tre
proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_value, tvb, offset+8, optlen, ENC_NA);
switch (ac_information_type) {
case AC_INFORMATION_HARDWARE_VERSION:
- proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_hardware_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_hardware_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
case AC_INFORMATION_SOFTWARE_VERSION:
- proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_software_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
default:
@@ -811,19 +811,19 @@ dissect_capwap_wtp_descriptor(tvbuff_t *tvb, proto_tree *wtp_descriptor_type_tre
switch (wtp_descriptor_type) {
case WTP_DESCRIPTOR_HARDWARE_VERSION:
- proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_hardware_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_hardware_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
case WTP_DESCRIPTOR_ACTIVE_SOFTWARE_VERSION:
- proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_active_software_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_active_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
case WTP_DESCRIPTOR_BOOT_VERSION:
- proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_boot_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_boot_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
case WTP_DESCRIPTOR_OTHER_SOFTWARE_VERSION:
- proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_other_software_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_other_software_version, tvb, offset+8, optlen, ENC_ASCII|ENC_NA);
break;
default:
@@ -854,19 +854,19 @@ dissect_capwap_board_data(tvbuff_t *tvb, proto_tree *board_data_type_tree, guint
proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_value, tvb, offset+4, optlen, ENC_NA);
switch (board_data_type) {
case BOARD_DATA_WTP_MODEL_NUMBER:
- proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_model_number, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_model_number, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case BOARD_DATA_WTP_SERIAL_NUMBER:
- proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case BOARD_DATA_BOARD_ID:
- proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_id, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_id, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case BOARD_DATA_BOARD_REVISION:
- proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case BOARD_DATA_BASE_MAC_ADDRESS:
@@ -962,12 +962,12 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
}
break;
case TYPE_AC_NAME: /* AC Name (4) */
- proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case TYPE_AC_NAME_W_PRIORITY: /* AC Name With Priority (5) */
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name_with_priority, tvb, offset+1, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+5, optlen-1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+5, optlen-1, ENC_ASCII|ENC_NA);
break;
case TYPE_CAPWAP_CONTROL_IPV4_ADDRESS: /* CAPWAP Control IPv4 Address (10) */
@@ -998,7 +998,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
break;
case TYPE_LOCATION_DATA: /* Location Data (28) */
- proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_location_data, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_location_data, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case TYPE_MAXIMUM_MESSAGE_LENGTH: /* Maximum Message Length (29) */
@@ -1090,7 +1090,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
break;
case TYPE_WTP_NAME: /* WTP Name (45) */
- proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_name, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_name, tvb, offset+4, optlen, ENC_ASCII|ENC_NA);
break;
case TYPE_WTP_REBOOT_STATISTICS: /* WTP Reboot Statistics (48) */
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index ba6407afc3..3e1484092a 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -804,13 +804,13 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
case 0x10 : /* CallInfo */
i = offset+12;
- proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_callingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_callingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_calledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
@@ -818,25 +818,25 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
i += 4;
proto_tree_add_item(cast_tree, hf_cast_callType, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(cast_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
proto_tree_add_item(cast_tree, hf_cast_lastRedirectingReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(cast_tree, hf_cast_callInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
@@ -873,7 +873,7 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
break;
case 0x13 : /* MakeCall */
- proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_calledParty, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(cast_tree, hf_cast_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
break;
@@ -954,22 +954,22 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
case 0x90 : /* RemoteInfoRequest */
i = offset+12;
- proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
proto_tree_add_item(cast_tree, hf_cast_requestorIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN);
break;
case 0x91 : /* RemoteInfoResponse */
i = offset+12;
- proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_stationFriendlyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_stationGUID, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
proto_tree_add_item(cast_tree, hf_cast_stationIpAddress, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(cast_tree, hf_cast_directoryNumber, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
break;
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 77c770fea5..113af9d5d6 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -1781,7 +1781,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
context_name = tvb_get_const_stringz(tvb, offset, &context_length);
if (dct2000_tree) {
proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_context, tvb,
- offset, context_length, FALSE);
+ offset, context_length, ENC_ASCII|ENC_NA);
}
offset += context_length;
@@ -1809,7 +1809,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
protocol_name = tvb_get_const_stringz(tvb, offset, &protocol_length);
if (dct2000_tree) {
proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_protocol, tvb,
- offset, protocol_length, FALSE);
+ offset, protocol_length, ENC_ASCII|ENC_NA);
}
is_comment = (strcmp(protocol_name, "comment") == 0);
offset += protocol_length;
@@ -1819,7 +1819,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
variant_string = tvb_get_const_stringz(tvb, offset, &variant_length);
if (!is_comment) {
proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_variant, tvb,
- offset, variant_length, FALSE);
+ offset, variant_length, ENC_ASCII|ENC_NA);
}
offset += variant_length;
@@ -1827,7 +1827,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
outhdr_string = tvb_get_const_stringz(tvb, offset, &outhdr_length);
if (!is_comment && (outhdr_length > 1)) {
proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_outhdr, tvb,
- offset, outhdr_length, FALSE);
+ offset, outhdr_length, ENC_ASCII|ENC_NA);
}
offset += outhdr_length;
@@ -2009,7 +2009,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Show comment string */
string_ti = proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_comment, tvb,
- offset, -1, FALSE);
+ offset, -1, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", string);
if (catapult_dct2000_dissect_mac_lte_oob_messages) {
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 10044eb0e3..053b68ded0 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -308,7 +308,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv);
proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4, FALSE);
+ proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA);
}
offset += length;
break;
@@ -337,7 +337,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv);
proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tlv_tree, hf_cdp_portid, tvb, offset + 4, real_length - 4, FALSE);
+ proto_tree_add_item(tlv_tree, hf_cdp_portid, tvb, offset + 4, real_length - 4, ENC_ASCII|ENC_NA);
}
offset += real_length;
break;
@@ -409,7 +409,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv);
proto_tree_add_item(tlv_tree, hf_cdp_tlvtype, tvb, offset + TLV_TYPE, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, FALSE);
+ proto_tree_add_item(tlv_tree, hf_cdp_platform, tvb, offset + 4, length - 4, ENC_ASCII|ENC_NA);
}
offset += length;
break;
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index 1154db6eb6..aaef067ead 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -432,7 +432,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
} else {
/* MD name format is regular string or DNS string */
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_string,
- tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN);
+ tvb, maid_offset, cfm_maid_md_name_length, ENC_ASCII|ENC_NA);
}
maid_offset += cfm_maid_md_name_length;
}
@@ -446,7 +446,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
if ((cfm_maid_ma_name_format == 2) ||
(cfm_maid_ma_name_format == 32)) {
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_string,
- tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN);
+ tvb, maid_offset, cfm_maid_ma_name_length, ENC_ASCII|ENC_NA);
} else {
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex,
tvb, maid_offset, cfm_maid_ma_name_length, ENC_NA);
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 985695d87f..258afba766 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -4155,7 +4155,7 @@ cigi2_add_image_generator_message(tvbuff_t *tvb, proto_tree *tree, gint offset)
proto_tree_add_item(tree, hf_cigi2_image_generator_message_id, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_cigi2_image_generator_message_message, tvb, offset, packet_size-4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_cigi2_image_generator_message_message, tvb, offset, packet_size-4, ENC_ASCII|ENC_NA);
offset += packet_size-4;
return offset;
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 0017fb134a..116af236db 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -666,7 +666,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt
PROTO_ITEM_SET_GENERATED(it);
}
else
- proto_tree_add_item( port_tree, hf_cip_link_address_string, tvb, offset+pathpos+2, opt_link_size, FALSE );
+ proto_tree_add_item( port_tree, hf_cip_link_address_string, tvb, offset+pathpos+2, opt_link_size, ENC_ASCII|ENC_NA );
proto_item_append_text( epath_item, ", Address: %s", tvb_format_text(tvb, offset+pathpos+2, opt_link_size) );
proto_item_append_text( port_item, ", Address: %s", tvb_format_text(tvb, offset+pathpos+2, opt_link_size) );
@@ -1322,7 +1322,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt
proto_item_append_text(epath_item, "%s", tvb_format_text(tvb, offset + pathpos + 2, seg_size ) );
- hidden_item = proto_tree_add_item( ds_tree, hf_cip_symbol, tvb, offset + pathpos + 2, seg_size, FALSE );
+ hidden_item = proto_tree_add_item( ds_tree, hf_cip_symbol, tvb, offset + pathpos + 2, seg_size, ENC_ASCII|ENC_NA );
PROTO_ITEM_SET_HIDDEN(hidden_item);
if( seg_size %2 )
diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index 010709dd71..712c8fa8a6 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -449,7 +449,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(att_tree, classicstun_att_error_number, tvb, offset+3, 1, ENC_BIG_ENDIAN);
if (att_length < 5)
break;
- proto_tree_add_item(att_tree, classicstun_att_error_reason, tvb, offset+4, (att_length-4), FALSE);
+ proto_tree_add_item(att_tree, classicstun_att_error_reason, tvb, offset+4, (att_length-4), ENC_ASCII|ENC_NA);
break;
case LIFETIME:
@@ -482,7 +482,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case SERVER:
- proto_tree_add_item(att_tree, classicstun_att_server_string, tvb, offset, att_length, FALSE);
+ proto_tree_add_item(att_tree, classicstun_att_server_string, tvb, offset, att_length, ENC_ASCII|ENC_NA);
break;
case XOR_MAPPED_ADDRESS:
@@ -533,7 +533,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case CONNECTION_REQUEST_BINDING:
- proto_tree_add_item(att_tree, classicstun_att_connection_request_binding, tvb, offset, att_length, FALSE);
+ proto_tree_add_item(att_tree, classicstun_att_connection_request_binding, tvb, offset, att_length, ENC_ASCII|ENC_NA);
break;
default:
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index 29768da3ef..02514c2149 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -704,7 +704,7 @@ dissect_collectd_signature (tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2,
length);
proto_tree_add_item (pt, hf_collectd_data_sighash, tvb, offset + 4, 32, ENC_NA);
- proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 36, length - 36, FALSE);
+ proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 36, length - 36, ENC_ASCII|ENC_NA);
return (0);
} /* int dissect_collectd_signature */
@@ -793,7 +793,7 @@ dissect_collectd_encrypted (tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_uint (pt, hf_collectd_type, tvb, offset, 2, type);
proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2, length);
proto_tree_add_uint (pt, hf_collectd_data_username_len, tvb, offset + 4, 2, username_length);
- proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 6, username_length, FALSE);
+ proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 6, username_length, ENC_ASCII|ENC_NA);
proto_tree_add_item (pt, hf_collectd_data_initvec, tvb,
offset + (6 + username_length), 16, ENC_NA);
proto_tree_add_item (pt, hf_collectd_data_encrypted, tvb,
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c
index db4a1ee216..0fa20d4f1f 100644
--- a/epan/dissectors/packet-componentstatus.c
+++ b/epan/dissectors/packet-componentstatus.c
@@ -158,8 +158,8 @@ dissect_componentstatusprotocol_componentstatusreport_message(tvbuff_t *message_
gint offset;
proto_tree_add_item(message_tree, hf_componentstatusreport_reportinterval, message_tvb, COMPONENTSTATUSREPORT_REPORTINTERVAL_OFFSET, COMPONENTSTATUSREPORT_REPORTINTERVAL_LENGTH, ENC_BIG_ENDIAN);
- proto_tree_add_item(message_tree, hf_componentstatusreport_location, message_tvb, COMPONENTSTATUSREPORT_LOCATION_OFFSET, COMPONENTSTATUSREPORT_LOCATION_LENGTH, ENC_BIG_ENDIAN);
- proto_tree_add_item(message_tree, hf_componentstatusreport_status, message_tvb, COMPONENTSTATUSREPORT_STATUS_OFFSET, COMPONENTSTATUSREPORT_STATUS_LENGTH, ENC_BIG_ENDIAN);
+ proto_tree_add_item(message_tree, hf_componentstatusreport_location, message_tvb, COMPONENTSTATUSREPORT_LOCATION_OFFSET, COMPONENTSTATUSREPORT_LOCATION_LENGTH, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(message_tree, hf_componentstatusreport_status, message_tvb, COMPONENTSTATUSREPORT_STATUS_OFFSET, COMPONENTSTATUSREPORT_STATUS_LENGTH, ENC_ASCII|ENC_NA);
proto_tree_add_item(message_tree, hf_componentstatusreport_workload, message_tvb, COMPONENTSTATUSREPORT_WORKLOAD_OFFSET, COMPONENTSTATUSREPORT_WORKLOAD_LENGTH, ENC_BIG_ENDIAN);
proto_tree_add_item(message_tree, hf_componentstatusreport_associations, message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET, COMPONENTSTATUSREPORT_ASSOCIATIONS_LENGTH, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 566f1ad6ef..7ff0366436 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -1281,7 +1281,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32
}
else
proto_tree_add_item(tree, hf_cops_pepid, tvb, offset,
- tvb_strnlen(tvb, offset, len) + 1, FALSE);
+ tvb_strnlen(tvb, offset, len) + 1, ENC_ASCII|ENC_NA);
break;
case COPS_OBJ_REPORT_TYPE:
@@ -3538,7 +3538,7 @@ cops_docsis_service_class_name(tvbuff_t *tvb, proto_tree *st, guint object_len,
offset += 3;
if (object_len >= 12) {
- proto_tree_add_item(stt, hf_cops_pcmm_docsis_scn, tvb, offset, object_len - 8, FALSE);
+ proto_tree_add_item(stt, hf_cops_pcmm_docsis_scn, tvb, offset, object_len - 8, ENC_ASCII|ENC_NA);
offset += object_len - 8;
} else {
proto_tree_add_text(stt, tvb, offset - 8, 2, "Invalid object length: %u", object_len);
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index 5005a5cb4f..63b0e3b387 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -451,7 +451,7 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb)
tagsize,
plurality(tagsize, ' ', 's'));
- ti2 = proto_tree_add_item(tree, hf_daap_name, tvb, offset, 4, ENC_BIG_ENDIAN);
+ ti2 = proto_tree_add_item(tree, hf_daap_name, tvb, offset, 4, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(ti2);
ti2 = proto_tree_add_item(tree, hf_daap_size, tvb, offset+4, 4, ENC_BIG_ENDIAN);
PROTO_ITEM_SET_HIDDEN(ti2);
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index 233043e2e5..4ca278333e 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -79,7 +79,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
proto_tree_add_item(data_tree, hf_data_data, data_tvb, 0, bytes, ENC_NA);
if (show_as_text) {
- proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, FALSE);
+ proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, ENC_ASCII|ENC_NA);
}
if(generate_md5_hash) {
diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c
index 6bd8e78650..4522b2f6d0 100644
--- a/epan/dissectors/packet-daytime.c
+++ b/epan/dissectors/packet-daytime.c
@@ -58,7 +58,7 @@ dissect_daytime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_text(daytime_tree, tvb, 0, 0,
pinfo->srcport==DAYTIME_PORT ? "Type: Response":"Type: Request");
if (pinfo->srcport == DAYTIME_PORT) {
- proto_tree_add_item(daytime_tree, hf_daytime_string, tvb, 0, -1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(daytime_tree, hf_daytime_string, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index 3905f7431b..3319ca55af 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -171,7 +171,7 @@ dissect_db_lsp_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
db_lsp_item = proto_tree_add_item (tree, proto_db_lsp_disc, tvb, offset, -1, ENC_BIG_ENDIAN);
db_lsp_tree = proto_item_add_subtree (db_lsp_item, ett_db_lsp);
- proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (db_lsp_tree, hf_text, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
void
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index 476c609e5b..992274029f 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -399,7 +399,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
proto_tree_add_item(dcc_optree, hf_dcc_brand, tvb,
- offset, sizeof(DCC_BRAND), FALSE);
+ offset, sizeof(DCC_BRAND), ENC_ASCII|ENC_NA);
offset += sizeof(DCC_BRAND);
D_SIGNATURE();
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index ac2f7b2b05..d1c551f54a 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -187,7 +187,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset,
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
hf_epm_ann_len, &len);
str=tvb_get_ephemeral_string(tvb, offset, len);
- proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, TRUE);
+ proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
if(str&&str[0]){
@@ -437,17 +437,17 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset,
break;
case PROTO_ID_NAMED_PIPES: /* \\PIPE\xxx named pipe */
- proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE);
+ proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA);
proto_item_append_text(tr, "NamedPipe:%s", tvb_get_ephemeral_string(tvb, offset, len));
break;
case PROTO_ID_NAMED_PIPES_2: /* PIPENAME named pipe */
- proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE);
+ proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA);
proto_item_append_text(tr, "PIPE:%s", tvb_get_ephemeral_string(tvb, offset, len));
break;
case PROTO_ID_NETBIOS: /* \\NETBIOS netbios name */
- proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, TRUE);
+ proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, ENC_ASCII|ENC_NA);
proto_item_append_text(tr, "NetBIOS:%s", tvb_get_ephemeral_string(tvb, offset, len));
break;
case PROTO_ID_HTTP: /* RPC over HTTP */
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index ee9db67235..1afe740ce6 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -594,7 +594,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX];
col_append_fstr (pinfo->cinfo, COL_INFO, " String_size:%u", string_size);
if (string_size < AFS_NAMEMAX)
{
- proto_tree_add_item (tree, hf_fileexp_afsNameString_t_principalName_string, tvb, offset, string_size, ENC_NA);
+ proto_tree_add_item (tree, hf_fileexp_afsNameString_t_principalName_string, tvb, offset, string_size, ENC_ASCII|ENC_NA);
namestring = tvb_get_ephemeral_string (tvb, offset, string_size);
offset += string_size;
if (check_col (pinfo->cinfo, COL_INFO))
@@ -783,7 +783,7 @@ dissect_afsTaggedPath (tvbuff_t * tvb, int offset,
dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
hf_fileexp_afsTaggedPath_tp_length, &tp_length);
proto_tree_add_item (tree, hf_fileexp_afsTaggedPath_tp_chars, tvb, offset,
- tp_length, ENC_NA);
+ tp_length, ENC_ASCII|ENC_NA);
tp_chars = tvb_get_ephemeral_string (tvb, offset, 1025);
offset += 1025;
if (check_col (pinfo->cinfo, COL_INFO))
@@ -1363,7 +1363,7 @@ dissect_afstaggedname (tvbuff_t * tvb, int offset,
if (tn_length < 254)
{
proto_tree_add_item (tree, hf_fileexp_tn_string, tvb, offset,
- tn_length, ENC_NA);
+ tn_length, ENC_ASCII|ENC_NA);
tn_string = tvb_get_ephemeral_string (tvb, offset, 257);
offset += 257;
if (check_col (pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index 94a7870adc..248c2cf078 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -342,7 +342,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset,
}
/* byte name[MAXVLCELLCHARS]; Cell name */
- proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_NA);
+ proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_ASCII|ENC_NA);
name = tvb_get_ephemeral_string (tvb, offset, MAXVLCELLCHARS); /* XXX why 114 above and 128 here?? */
offset += MAXVLCELLCHARS; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
if (check_col (pinfo->cinfo, COL_INFO))
@@ -381,7 +381,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset,
for (i = 0; i < MAXVLHOSTSPERCELL; i++)
{
proto_tree_add_item (tree, hf_fldb_vlconf_cell_hostname, tvb, offset,
- 64, ENC_NA);
+ 64, ENC_ASCII|ENC_NA);
hostname = tvb_get_ephemeral_string (tvb, offset, 64);
offset += 64; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
if (check_col (pinfo->cinfo, COL_INFO))
@@ -473,7 +473,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX];
/* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */
proto_tree_add_item (tree,
hf_fldb_afsNameString_t_principalName_string,
- tvb, offset, string_size, ENC_NA);
+ tvb, offset, string_size, ENC_ASCII|ENC_NA);
namestring = tvb_get_ephemeral_string (tvb, offset, string_size);
offset += string_size;
if (check_col (pinfo->cinfo, COL_INFO))
@@ -699,7 +699,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
/* byte name[114]; Volume name */
proto_tree_add_item (tree, hf_fldb_vldbentry_volumename, tvb, offset, 114,
- ENC_NA);
+ ENC_ASCII|ENC_NA);
volumename = tvb_get_ephemeral_string (tvb, offset, 114);
offset += 110; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
if (check_col (pinfo->cinfo, COL_INFO))
@@ -767,7 +767,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
for (i = 0; i < MAXNSERVERS; i++)
{
proto_tree_add_item (tree, hf_fldb_vldbentry_siteprincipal, tvb,
- offset, 64, ENC_NA);
+ offset, 64, ENC_ASCII|ENC_NA);
siteprincipal = tvb_get_ephemeral_string (tvb, offset, 64);
offset += 64;
if (check_col (pinfo->cinfo, COL_INFO))
@@ -945,7 +945,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
/* byte LockerName[MAXLOCKNAMELEN]; */
proto_tree_add_item (tree, hf_fldb_vldbentry_lockername, tvb, offset,
- MAXLOCKNAMELEN, ENC_NA);
+ MAXLOCKNAMELEN, ENC_ASCII|ENC_NA);
lockername = tvb_get_ephemeral_string (tvb, offset, MAXLOCKNAMELEN);
offset += MAXLOCKNAMELEN; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
if (check_col (pinfo->cinfo, COL_INFO))
@@ -953,7 +953,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
/* byte charSpares[50]; */
proto_tree_add_item (tree, hf_fldb_vldbentry_charspares, tvb, offset, 50,
- ENC_NA);
+ ENC_ASCII|ENC_NA);
charspares = tvb_get_ephemeral_string (tvb, offset, 50);
offset += 50; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
if (check_col (pinfo->cinfo, COL_INFO))
@@ -1111,7 +1111,7 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t * tvb, int offset,
offset += 48; /* part of kerbprin before name... */
- proto_tree_add_item (tree, hf_fldb_namestring, tvb, offset, 64, ENC_NA);
+ proto_tree_add_item (tree, hf_fldb_namestring, tvb, offset, 64, ENC_ASCII|ENC_NA);
namestring = tvb_get_ephemeral_string (tvb, offset, 64);
offset += 64;
if (check_col (pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 89f58a1075..bf2cc5bd45 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -4464,7 +4464,7 @@ netlogon_dissect_UAS_INFO_0(tvbuff_t *tvb, int offset,
return offset;
}
- proto_tree_add_item(tree, hf_netlogon_computer_name, tvb, offset, 16, FALSE);
+ proto_tree_add_item(tree, hf_netlogon_computer_name, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
proto_tree_add_text(tree, tvb, offset, 4, "Time Created: unknown time format");
@@ -7674,14 +7674,14 @@ static int dissect_secchan_nl_auth_message(tvbuff_t *tvb, int offset,
/* netbios domain name */
if (messageflags&0x00000001) {
len = tvb_strsize(tvb, offset);
- proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_domain, tvb, offset, len, FALSE);
+ proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_domain, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
/* netbios host name */
if (messageflags&0x00000002) {
len = tvb_strsize(tvb, offset);
- proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_host, tvb, offset, len, FALSE);
+ proto_tree_add_item(subtree, hf_netlogon_secchan_nl_nb_host, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index b99339db80..d13c29005d 100644
--- a/epan/dissectors/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
@@ -82,13 +82,13 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset,
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rpriv_get_eptgt_rqst_key_size2, &key_size);
/* advance to get size of cell, and princ */
- proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, key_size, ENC_NA);
+ proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA);
key_t1 = tvb_get_ephemeral_string(tvb, offset, key_size);
offset += key_size;
offset += 8;
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rpriv_get_eptgt_rqst_key_size2, &key_size2);
- proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t2, tvb, offset, key_size2, ENC_NA);
+ proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t2, tvb, offset, key_size2, ENC_ASCII|ENC_NA);
key_t2 = tvb_get_ephemeral_string(tvb, offset, key_size2);
offset += key_size2;
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index 6774387e8e..82fd1489cf 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -71,7 +71,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset,
hf_rs_acct_lookup_rqst_key_size, &key_size);
if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
- proto_tree_add_item (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_NA);
+ proto_tree_add_item (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA);
keyx_t = tvb_get_ephemeral_string(tvb, offset, key_size);
offset += key_size;
@@ -102,7 +102,7 @@ rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset,
hf_rs_acct_get_projlist_rqst_key_size, &key_size);
proto_tree_add_item (tree, hf_rs_acct_get_projlist_rqst_key_t,
- tvb, offset, key_size, ENC_NA);
+ tvb, offset, key_size, ENC_ASCII|ENC_NA);
keyx_t = tvb_get_ephemeral_string(tvb, offset, key_size);
offset += key_size;
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index a42e97ad29..94e5c48e91 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -69,7 +69,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
- proto_tree_add_item (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, key_size, ENC_NA);
+ proto_tree_add_item (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA);
key_t1 = tvb_get_ephemeral_string(tvb, offset, key_size);
offset += key_size;
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 5bf79bbc83..a9049632bf 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -208,7 +208,7 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In
/* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */
proto_tree_add_item (tree, hf_sec_rgy_pname_t_principalName_string,
- tvb, offset, string_size, ENC_NA);
+ tvb, offset, string_size, ENC_ASCII|ENC_NA);
if (string_size > 1)
{
if (check_col (pinfo->cinfo, COL_INFO))
@@ -430,7 +430,7 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset,
/* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */
proto_tree_add_item (tree, hf_sec_rgy_name_t_principalName_string,
- tvb, offset, string_size, ENC_NA);
+ tvb, offset, string_size, ENC_ASCII|ENC_NA);
if (string_size > 1)
{
if (check_col (pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index f6673d9666..e27c54bc22 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -2995,7 +2995,7 @@ dissect_dcerpc_cn_bind_ack (tvbuff_t *tvb, gint offset, packet_info *pinfo,
if (sec_addr_len != 0) {
tvb_ensure_bytes_exist(tvb, offset, sec_addr_len);
proto_tree_add_item (dcerpc_tree, hf_dcerpc_cn_sec_addr, tvb, offset,
- sec_addr_len, FALSE);
+ sec_addr_len, ENC_ASCII|ENC_NA);
offset += sec_addr_len;
}
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 86ba3dde61..272b9a24e5 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -450,7 +450,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (tree) { /* we are being asked for details */
ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, ENC_BIG_ENDIAN);
pft_tree = proto_item_add_subtree (ti, ett_pft);
- proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item (pft_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA);
}
offset += 2;
seq = tvb_get_ntohs (tvb, offset);
@@ -552,7 +552,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (tree) { /* we are being asked for details */
ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, ENC_BIG_ENDIAN);
af_tree = proto_item_add_subtree (ti, ett_af);
- proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item (af_tree, hf_edcp_sync, tvb, offset, 2, ENC_ASCII|ENC_NA);
}
offset += 2;
payload_len = tvb_get_ntohl(tvb, offset);
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 764756288d..0d9624eeef 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -1171,7 +1171,7 @@ handle_connect_contents(
image_len = tvb_get_guint8(tvb, my_offset);
my_offset++;
proto_tree_add_item(contents_tree, hf_dec_sess_dst_name,
- tvb, my_offset, image_len, TRUE);
+ tvb, my_offset, image_len, ENC_ASCII|ENC_NA);
my_offset += image_len;
}
/* The source end user */
@@ -1196,7 +1196,7 @@ handle_connect_contents(
image_len = tvb_get_guint8(tvb, my_offset);
my_offset++;
proto_tree_add_item(contents_tree, hf_dec_sess_src_name,
- tvb, my_offset, image_len, TRUE);
+ tvb, my_offset, image_len, ENC_ASCII|ENC_NA);
my_offset += image_len;
}
/* Now the MENUVER field */
@@ -1211,17 +1211,17 @@ handle_connect_contents(
image_len = tvb_get_guint8(tvb, my_offset);
my_offset++;
proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id,
- tvb, my_offset, image_len, TRUE);
+ tvb, my_offset, image_len, ENC_ASCII|ENC_NA);
my_offset += image_len;
image_len = tvb_get_guint8(tvb, my_offset);
my_offset++;
proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id,
- tvb, my_offset, image_len, TRUE);
+ tvb, my_offset, image_len, ENC_ASCII|ENC_NA);
my_offset += image_len;
image_len = tvb_get_guint8(tvb, my_offset);
my_offset++;
proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id,
- tvb, my_offset, image_len, TRUE);
+ tvb, my_offset, image_len, ENC_ASCII|ENC_NA);
my_offset += image_len;
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index c4fdb31821..6968253011 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -600,7 +600,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case DHCP_FO_PD_FTDDNS:
proto_tree_add_item(option_tree, hf_dhcpfo_ftddns, tvb,
- offset, option_length, ENC_BIG_ENDIAN);
+ offset, option_length, ENC_ASCII|ENC_NA);
break;
case DHCP_FO_PD_REJECT_REASON:
@@ -624,7 +624,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case DHCP_FO_PD_MESSAGE:
proto_tree_add_item(option_tree, hf_dhcpfo_message, tvb,
- offset, option_length, ENC_BIG_ENDIAN);
+ offset, option_length, ENC_ASCII|ENC_NA);
break;
case DHCP_FO_PD_MCLT:
@@ -883,7 +883,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(option_tree,
hf_dhcpfo_message_digest, tvb, offset+1,
- option_length-1, ENC_BIG_ENDIAN);
+ option_length-1, ENC_ASCII|ENC_NA);
break;
case DHCP_FO_PD_PROTOCOL_VERSION:
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 0e35ed678e..af34d90078 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -142,7 +142,7 @@ dissect_diameter_3gpp_visited_nw_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto
if(!g_ascii_isprint(tvb_get_guint8(tvb, i)))
return length;
- item = proto_tree_add_item(tree, hf_diameter_3gpp_visited_nw_id, tvb, offset, length, ENC_BIG_ENDIAN);
+ item = proto_tree_add_item(tree, hf_diameter_3gpp_visited_nw_id, tvb, offset, length, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_GENERATED(item);
@@ -200,10 +200,10 @@ dissect_diameter_3gpp_path(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
while (offset < end_offset){
comma_offset = tvb_find_guint8(tvb, offset, -1, ',');
if(comma_offset == -1){
- proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA);
return end_offset;
}
- proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA);
offset = comma_offset+1;
}
@@ -224,7 +224,7 @@ dissect_diameter_3gpp_contact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
proto_item* item;
int offset = 0;
- item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_BIG_ENDIAN);
+ item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_GENERATED(item);
return tvb_length(tvb);
@@ -295,7 +295,7 @@ dissect_diameter_3gpp_service_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
if(!g_ascii_isprint(tvb_get_guint8(tvb, i)))
return length;
- item = proto_tree_add_item(tree, hf_diameter_3gpp_service_ind, tvb, offset, length, ENC_BIG_ENDIAN);
+ item = proto_tree_add_item(tree, hf_diameter_3gpp_service_ind, tvb, offset, length, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_GENERATED(item);
return length;
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index f067917624..2c2d2dc6f7 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -151,7 +151,7 @@ dissect_distcc_argv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
tvb_memcpy(tvb, argv, offset, argv_len);
argv[argv_len]=0;
- proto_tree_add_item(tree, hf_distcc_argv, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_distcc_argv, tvb, offset, len, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", argv);
@@ -180,7 +180,7 @@ dissect_distcc_serr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
tvb_memcpy(tvb, argv, offset, argv_len);
argv[argv_len]=0;
- proto_tree_add_item(tree, hf_distcc_serr, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_distcc_serr, tvb, offset, len, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, "SERR:%s ", argv);
@@ -209,7 +209,7 @@ dissect_distcc_sout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
tvb_memcpy(tvb, argv, offset, argv_len);
argv[argv_len]=0;
- proto_tree_add_item(tree, hf_distcc_sout, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_distcc_sout, tvb, offset, len, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, "SOUT:%s ", argv);
@@ -233,7 +233,7 @@ dissect_distcc_doti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
col_append_str(pinfo->cinfo, COL_INFO, "DOTI source ");
- proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_ASCII|ENC_NA);
if(len!=parameter){
proto_tree_add_text(tree, tvb, 0, 0, "[Short DOTI PDU]");
}
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 5dba9b69fa..6eaddc15bd 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -3098,12 +3098,12 @@ static void dissect_dmp_structured_id (tvbuff_t *tvb, proto_tree *body_tree,
case STRUCT_ID_STRING:
dmp.struct_id = tvb_get_ephemeral_string (tvb, offset, (gint) dmp_struct_length);
- proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb, offset, dmp_struct_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb, offset, dmp_struct_length, ENC_ASCII|ENC_NA);
break;
case STRUCT_ID_ZSTRING:
dmp.struct_id = tvb_get_ephemeral_stringz (tvb, offset, &length);
- proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb, offset, length, ENC_ASCII|ENC_NA);
break;
}
@@ -3131,7 +3131,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo,
if (dmp_subject_as_id) {
dmp.struct_id = tvb_get_ephemeral_string (tvb, offset, len);
}
- proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
@@ -3205,7 +3205,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo,
"Uncompressed User data, "
"Length: %d", zlen);
field_tree = proto_item_add_subtree (tf, ett_message_body_uncompr);
- proto_tree_add_item (field_tree, hf_message_body_uncompressed, next_tvb, 0, -1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (field_tree, hf_message_body_uncompressed, next_tvb, 0, -1, ENC_ASCII|ENC_NA);
} else {
tf = proto_tree_add_text (message_tree, tvb, offset, -1,
"Error: Unable to uncompress content");
@@ -3213,7 +3213,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo,
"Unable to uncompress content");
}
} else if (eit != EIT_BILATERAL) {
- proto_tree_add_item (field_tree, hf_message_body_plain, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (field_tree, hf_message_body_plain, tvb, offset, len, ENC_ASCII|ENC_NA);
}
}
offset += len;
@@ -3373,7 +3373,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo,
128 - (offset - boffset));
}
field_tree = proto_item_add_subtree (tf, ett_report_suppl_info);
- proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_ASCII|ENC_NA);
}
offset += len;
}
@@ -3446,7 +3446,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_,
128 - (offset - boffset));
}
field_tree = proto_item_add_subtree (tf, ett_notif_suppl_info);
- proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_ASCII|ENC_NA);
}
offset += len;
@@ -3462,7 +3462,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_item_append_text (tf, " (incorrect, must be less than 64)");
}
field_tree = proto_item_add_subtree (tf, ett_notif_acp127recip);
- proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_ASCII|ENC_NA);
}
offset += len;
}
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 8b2154ff2e..ca5c3600ec 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -726,7 +726,7 @@ static gint dissect_dplay_header(proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_uint(tree, hf_dplay_token, tvb, offset, 4, token);
offset += 4;
offset = dissect_sockaddr_in(tree, tvb, offset);
- proto_tree_add_item(tree, hf_dplay_play_str, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
+ proto_tree_add_item(tree, hf_dplay_play_str, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_command, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
proto_tree_add_item(tree, hf_dplay_proto_dialect, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
return offset;
@@ -885,7 +885,7 @@ static gint dissect_type15_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
enc_item = proto_tree_add_text(tree, tvb, offset, -1, "DirectPlay encapsulated packet");
enc_tree = proto_item_add_subtree(enc_item, ett_dplay_enc_packet);
- proto_tree_add_item(enc_tree, hf_dplay_play_str_2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
+ proto_tree_add_item(enc_tree, hf_dplay_play_str_2, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4;
proto_tree_add_item(enc_tree, hf_dplay_command_2, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
proto_tree_add_item(enc_tree, hf_dplay_proto_dialect_2, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index cb3735b781..1994b5a7df 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -936,7 +936,7 @@ dissect_dpnns_sup_str_par(tvbuff_t *tvb, proto_tree * tree, int par_type_num, in
case DPNSS_SIC:
*/
case DPNSS_A_B_PARTY_ADDR:
- proto_tree_add_item(tree, hf_dpnss_a_b_party_addr, tvb, par_start_offset, par_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_dpnss_a_b_party_addr, tvb, par_start_offset, par_len, ENC_ASCII|ENC_NA);
break;
/*
@@ -946,7 +946,7 @@ dissect_dpnns_sup_str_par(tvbuff_t *tvb, proto_tree * tree, int par_type_num, in
case DPNSS_TEXT:
*/
case DPNSS_CALL_INDEX:
- proto_tree_add_item(tree, hf_dpnss_call_idx, tvb, par_start_offset, par_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_dpnss_call_idx, tvb, par_start_offset, par_len, ENC_ASCII|ENC_NA);
break;
/*
@@ -1152,7 +1152,7 @@ dissect_dpnss_sup_info_str(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
str_no++;
}else{
last_string = TRUE;
- proto_tree_add_item(tree, hf_dpnss_dest_addr, tvb, offset, -1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_dpnss_dest_addr, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
return offset;
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 97d3547d12..6f45443c97 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -331,7 +331,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
proto_tree_add_item(sub_tree, hf_dsi_server_flag_ext_sleep , tvb, ofs, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_tree, hf_dsi_server_flag_fast_copy , tvb, ofs, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_ASCII|ENC_BIG_ENDIAN);
flag = tvb_get_ntohs(tvb, ofs);
if ((flag & AFPSRVRINFO_SRVSIGNATURE)) {
@@ -366,7 +366,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF);
if (ofs)
- proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF);
if (ofs) {
@@ -376,7 +376,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
sub_tree = proto_item_add_subtree(ti, ett_dsi_vers);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
@@ -389,7 +389,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
sub_tree = proto_item_add_subtree(ti, ett_dsi_uams);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
@@ -478,7 +478,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
sub_tree = proto_item_add_subtree(ti, ett_dsi_directory);
for (i = 0; i < nbe; i++) {
len = tvb_get_guint8(tvb, ofs);
- proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN);
ofs += len + 1;
}
}
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 47ad594d22..664c14c9f7 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -956,29 +956,29 @@ dissect_version_4_primary_header(packet_info *pinfo, proto_tree *primary_tree, t
* Destination info
*/
- proto_tree_add_item(dict_tree, hf_bundle_dest_scheme, tvb, offset + dest_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_dest_ssp, tvb, offset + dest_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_dest_scheme, tvb, offset + dest_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_dest_ssp, tvb, offset + dest_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Source info
*/
- proto_tree_add_item(dict_tree, hf_bundle_source_scheme, tvb, offset + source_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_source_ssp, tvb, offset + source_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_source_scheme, tvb, offset + source_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_source_ssp, tvb, offset + source_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Report to info
*/
- proto_tree_add_item(dict_tree, hf_bundle_report_scheme, tvb, offset + report_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_report_ssp, tvb, offset + report_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_report_scheme, tvb, offset + report_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_report_ssp, tvb, offset + report_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Custodian info
*/
- proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + cust_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + cust_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + cust_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + cust_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Add Source/Destination to INFO Field
@@ -1435,29 +1435,29 @@ dissect_version_5_and_6_primary_header(packet_info *pinfo,
* Destination info
*/
- proto_tree_add_item(dict_tree, hf_bundle_dest_scheme, tvb, offset + dest_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_dest_ssp, tvb, offset + dest_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_dest_scheme, tvb, offset + dest_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_dest_ssp, tvb, offset + dest_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Source info
*/
- proto_tree_add_item(dict_tree, hf_bundle_source_scheme, tvb, offset + source_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_source_ssp, tvb, offset + source_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_source_scheme, tvb, offset + source_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_source_ssp, tvb, offset + source_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Report to info
*/
- proto_tree_add_item(dict_tree, hf_bundle_report_scheme, tvb, offset + report_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_report_ssp, tvb, offset + report_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_report_scheme, tvb, offset + report_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_report_ssp, tvb, offset + report_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Custodian info
*/
- proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + cust_scheme_offset, -1, FALSE);
- proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + cust_ssp_offset, -1, FALSE);
+ proto_tree_add_item(dict_tree, hf_bundle_custodian_scheme, tvb, offset + cust_scheme_offset, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(dict_tree, hf_bundle_custodian_ssp, tvb, offset + cust_ssp_offset, -1, ENC_ASCII|ENC_NA);
/*
* Add Source/Destination to INFO Field
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 44d33f9795..6b6bc7caad 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -109,7 +109,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree
interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", interface_id_length,
tvb_get_ephemeral_string(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length));
}
@@ -122,7 +122,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
guint16 info_string_length;
info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 616638b765..f13303cb87 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -1430,7 +1430,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset,
/* everything from here to the descriptor's end is a hostname */
hostname_len = (offset_body+len_field)-offset;
proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_hostname,
- tvb, offset, hostname_len, ENC_ASCII|ENC_BIG_ENDIAN);
+ tvb, offset, hostname_len, ENC_ASCII|ENC_NA);
offset += hostname_len;
} else {
proto_tree_add_text(conn_desc_tree, tvb,
@@ -2266,11 +2266,11 @@ dissect_dvbci_payload_hlc(guint32 tag, gint len_field _U_,
if (tag==T_HOST_COUNTRY) {
proto_tree_add_item(tree, hf_dvbci_host_country,
- tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
}
else if (tag==T_HOST_LANGUAGE) {
proto_tree_add_item(tree, hf_dvbci_host_language,
- tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
+ tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
}
/* both apdus' body is only a country code, this can be shared */
@@ -2515,7 +2515,7 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
case T_CC_PIN_MMI_REQ:
proto_tree_add_item(tree, hf_dvbci_pincode, tvb, offset,
tvb_reported_length_remaining(tvb, offset),
- ENC_ASCII|ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
break;
default:
break;
@@ -2551,7 +2551,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
"Initial Object length %d", init_obj_len);
offset++;
proto_tree_add_item(tree, hf_dvbci_app_dom_id,
- tvb, offset, app_dom_id_len, ENC_BIG_ENDIAN);
+ tvb, offset, app_dom_id_len, ENC_ASCII|ENC_NA);
app_dom_id = tvb_get_ephemeral_string(tvb, offset, app_dom_id_len);
if (app_dom_id) {
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ",
@@ -2559,7 +2559,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
}
offset += app_dom_id_len;
proto_tree_add_item(tree, hf_dvbci_init_obj,
- tvb, offset, init_obj_len, ENC_BIG_ENDIAN);
+ tvb, offset, init_obj_len, ENC_ASCII|ENC_NA);
break;
case T_REQUEST_START_ACK:
ack_code = tvb_get_guint8(tvb, offset);
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 0e2e6ed388..c1c3ed077a 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -614,7 +614,7 @@ static proto_item* edonkey_tree_add_metatag_name(proto_tree *tree, tvbuff_t *tvb
const gchar *tag_name;
tag_name = match_strval(special_tagtype, edonkey_special_tags);
if (tag_name == NULL) {
- return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, FALSE);
+ return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, ENC_ASCII|ENC_NA);
}
else {
return proto_tree_add_uint_format(tree, hf_edonkey_metatag_id, tvb, start, length,
@@ -701,7 +701,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size);
edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype);
proto_tree_add_uint(metatag_tree, hf_edonkey_string_length, tvb, tag_offset, 2, string_length);
- proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, FALSE);
+ proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, ENC_ASCII|ENC_NA);
break;
case EDONKEY_MTAG_DWORD:
@@ -832,7 +832,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
if (real_tag_type==tag_type)
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size);
edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype);
- proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, FALSE);
+ proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, ENC_ASCII|ENC_NA);
} else {
/* Unknown tag type - actual tag length is also unknown */
@@ -1085,11 +1085,11 @@ static int dissect_kademlia_tag_string(tvbuff_t *tvb, packet_info *pinfo _U_,
hidden_item = proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, FALSE);
+ hidden_item = proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
*string_value = tvb_get_ephemeral_string(tvb, offset + 2, string_length);
- proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, FALSE);
+ proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA);
return offset + 2 + string_length;
}
@@ -1117,7 +1117,7 @@ static int dissect_edonkey_string(tvbuff_t *tvb, packet_info *pinfo _U_,
/* <String> ::= <String length (guint16)> DATA */
guint16 string_length = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length);
- proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, FALSE);
+ proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA);
return offset+2+string_length;
}
@@ -1128,7 +1128,7 @@ static int dissect_edonkey_directory(tvbuff_t *tvb, packet_info *pinfo _U_,
/* <Directory> ::= <String> */
guint16 string_length = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length);
- proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, FALSE);
+ proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, ENC_ASCII|ENC_NA);
return offset+2+string_length;
}
@@ -1657,7 +1657,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
/* Add query info */
proto_tree_add_text(search_tree, tvb, offset, 1, "Search by name (0x%02x)", search_type);
proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length);
- proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, FALSE);
+ proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA);
offset += search_length;
break;
@@ -1679,7 +1679,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
/* Add query info */
proto_tree_add_text(search_tree, tvb, offset, 1, "Search by metadata (0x%02x)", search_type);
proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length);
- proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, FALSE);
+ proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA);
proto_tree_add_uint(search_tree, hf_edonkey_metatag_namesize, tvb, tag_name_offset, 2, tag_name_size);
edonkey_tree_add_metatag_name(search_tree, tvb, tag_name_offset+2, tag_name_size, special_tagtype);
offset += search_length;
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index dd1e13923b..67364706ba 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -821,7 +821,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb,
/* Product Name */
proto_tree_add_item(item_tree, hf_enip_lir_name,
- tvb, offset+39, name_length, ENC_NA );
+ tvb, offset+39, name_length, ENC_ASCII|ENC_NA );
/* Append product name to info column */
if(check_col(pinfo->cinfo, COL_INFO))
@@ -891,7 +891,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb,
proto_tree_add_item( temp_tree, hf_enip_lsr_udp, tvb, offset+8, 2, ENC_LITTLE_ENDIAN );
/* Name of service */
- proto_tree_add_item( item_tree, hf_enip_lsr_servicename, tvb, offset+10, 16, ENC_NA );
+ proto_tree_add_item( item_tree, hf_enip_lsr_servicename, tvb, offset+10, 16, ENC_ASCII|ENC_NA );
/* Append service name to info column */
if(check_col(pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 499e58ef76..c500717a21 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -143,7 +143,7 @@ dissect_enttec_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 1;
proto_tree_add_item(tree, hf_enttec_poll_reply_name, tvb,
- offset, 10, FALSE);
+ offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
proto_tree_add_item(tree, hf_enttec_poll_reply_option, tvb,
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 2e859b2254..7f628455e4 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -1290,7 +1290,7 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
proto_tree_add_ipv4(epl_tree , hf_epl_asnd_identresponse_gtw, tvb, offset, 4, epl_asnd_identresponse_gtw);
offset += 4;
- proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_hn, tvb, offset, 32, TRUE);
+ proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_hn, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex2, tvb, offset, 48, ENC_NA);
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index ca6a68f681..6ca417d687 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -145,7 +145,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree
offset += 2;
name_length = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_NA);
+ proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA);
name = tvb_get_ephemeral_string(tvb, offset + 2, name_length);
offset += 2 + name_length;
if (tvb_length_remaining(tvb, offset) >= 2) {
@@ -161,7 +161,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree
case EPMD_PORT_REQ:
case EPMD_PORT2_REQ:
name_length = tvb_length_remaining(tvb, offset);
- proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_NA);
+ proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA);
name = tvb_get_ephemeral_string(tvb, offset, name_length);
break;
@@ -169,7 +169,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree
proto_tree_add_item(tree, hf_epmd_port_no, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
name_length = tvb_length_remaining(tvb, offset);
- proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_NA);
+ proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA);
name = tvb_get_ephemeral_string(tvb, offset, name_length);
break;
@@ -248,7 +248,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree
offset += 2;
name_length = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_NA);
+ proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA);
name = tvb_get_ephemeral_string(tvb, offset + 2, name_length);
offset += 2 + name_length;
if (tvb_length_remaining(tvb, offset) >= 2) {
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 9164edbc50..ae197c950e 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -392,7 +392,7 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre
proto_tree_add_item(tree, hf_erldp_length_2, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
tag = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(tree, hf_erldp_tag, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_erldp_tag, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset++;
switch (tag) {
@@ -414,7 +414,7 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre
}
str_len = tvb_length_remaining(tvb, offset);
str = tvb_get_ephemeral_string(tvb, offset, str_len);
- proto_tree_add_item(tree, hf_erldp_name, tvb, offset, str_len, ENC_NA);
+ proto_tree_add_item(tree, hf_erldp_name, tvb, offset, str_len, ENC_ASCII|ENC_NA);
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", (is_challenge) ? "SEND_CHALLENGE" : "SEND_NAME", str);
break;
@@ -435,7 +435,7 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre
case 's' :
str_len = tvb_length_remaining(tvb, offset);
str = tvb_get_ephemeral_string(tvb, offset, str_len);
- proto_tree_add_item(tree, hf_erldp_status, tvb, offset, str_len, ENC_NA);
+ proto_tree_add_item(tree, hf_erldp_status, tvb, offset, str_len, ENC_ASCII|ENC_NA);
col_add_fstr(pinfo->cinfo, COL_INFO, "SEND_STATUS %s", str);
break;
}
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index 69885ef972..b6fbf1d017 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -503,7 +503,7 @@ read_string(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree)
byteLength = read_length(offset, tvb, etch_tree);
proto_tree_add_item(etch_tree, hf_etch_string, tvb, *offset,
- byteLength, ENC_NA);
+ byteLength, ENC_ASCII|ENC_NA);
(*offset) += byteLength;
}
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index f9ca387b05..ec3da26486 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -459,7 +459,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
if (len) {
proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb,
- offset+13, len, 0);
+ offset+13, len, ENC_ASCII|ENC_NA);
}
if (tvb_offset_exists (tvb, 292)) {
@@ -473,7 +473,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
offset+276, 1, ENC_BIG_ENDIAN);
if (len) {
proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
- offset+277, len, 0);
+ offset+277, len, ENC_ASCII|ENC_NA);
}
}
if (tvb_offset_exists (tvb, 556)) {
@@ -586,7 +586,7 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen,
tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb,
- offset+1, len, ENC_NA);
+ offset+1, len, ENC_ASCII|ENC_NA);
}
}
}
@@ -789,7 +789,7 @@ dissect_fcdns_gsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb,
offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
- offset+1, len, 0);
+ offset+1, len, ENC_ASCII|ENC_NA);
}
}
}
@@ -1046,7 +1046,7 @@ dissect_fcdns_rspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
len = tvb_get_guint8 (tvb, offset+4);
proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
}
@@ -1083,7 +1083,7 @@ dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += 256;
len -= 256;
}
@@ -1128,7 +1128,7 @@ dissect_fcdns_rsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
}
@@ -1227,7 +1227,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb,
offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb,
- offset+1, len, 0);
+ offset+1, len, ENC_ASCII|ENC_NA);
offset += 256;
}
proto_tree_add_string (tree, hf_fcdns_rply_nname, tvb, offset, 8,
@@ -1238,7 +1238,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb,
offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb,
- offset+1, len, 0);
+ offset+1, len, ENC_ASCII|ENC_NA);
offset += 256;
}
proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA);
@@ -1396,7 +1396,7 @@ dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
proto_tree_add_text (req_tree, tvb, offset, 1, "Name Length: %d",
str_len);
proto_tree_add_item (req_tree, hf_fcdns_zonenm, tvb, offset+3,
- str_len, ENC_NA);
+ str_len, ENC_ASCII|ENC_NA);
}
}
else {
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 516e883295..78e96b9a9b 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -239,7 +239,7 @@ dissect_fcfcs_gieln (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
proto_tree_add_text (tree, tvb, offset, 1, "Name Length: %d",
tvb_get_guint8 (tvb, offset));
proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+1,
- tvb_get_guint8 (tvb, offset), 0);
+ tvb_get_guint8 (tvb, offset), ENC_ASCII|ENC_NA);
}
}
}
@@ -265,7 +265,7 @@ dissect_fcfcs_gmal (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
proto_tree_add_text (tree, tvb, offset, 1, "Name Length: %d",
tvb_get_guint8 (tvb, offset));
proto_tree_add_item (tree, hf_fcs_mgmtaddr, tvb, offset+1,
- tvb_get_guint8 (tvb, offset), 0);
+ tvb_get_guint8 (tvb, offset), ENC_ASCII|ENC_NA);
offset += 256;
}
}
@@ -291,17 +291,17 @@ dissect_fcfcs_gieil (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
prevlen = 0;
len = tvb_strsize(tvb, offset+4);
proto_tree_add_item (tree, hf_fcs_vendorname, tvb, offset+4,
- len, FALSE);
+ len, ENC_ASCII|ENC_NA);
prevlen += len;
len = tvb_strsize(tvb, offset+4+prevlen);
proto_tree_add_item (tree, hf_fcs_modelname, tvb, offset+4+prevlen,
- len, FALSE);
+ len, ENC_ASCII|ENC_NA);
prevlen += len;
len = tvb_strsize(tvb, offset+4+prevlen);
proto_tree_add_item (tree, hf_fcs_releasecode, tvb,
- offset+4+prevlen, len, FALSE);
+ offset+4+prevlen, len, ENC_ASCII|ENC_NA);
prevlen += len;
offset += (4+prevlen);
while (tot_len > prevlen) {
@@ -504,7 +504,7 @@ dissect_fcfcs_gplml (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
"Mgmt Address Length: %d",
len);
proto_tree_add_item (tree, hf_fcs_platformaddr, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += 256;
}
}
@@ -572,7 +572,7 @@ dissect_fcfcs_rieln (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
len = tvb_get_guint8 (tvb, offset+8);
proto_tree_add_text (tree, tvb, offset+8, 1,
"Logical Name Length: %d", len);
- proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+9, len, 0);
+ proto_tree_add_item (tree, hf_fcs_lname, tvb, offset+9, len, ENC_ASCII|ENC_NA);
}
}
}
@@ -601,7 +601,7 @@ dissect_fcfcs_rpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
proto_tree_add_text (tree, tvb, offset, 1,
"Mgmt. Addr Length: %d", len);
proto_tree_add_item (tree, hf_fcs_mgmtaddr, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += 256;
}
@@ -674,7 +674,7 @@ dissect_fcfcs_rplm (tvbuff_t *tvb, proto_tree *tree, gboolean isreq)
proto_tree_add_text (tree, tvb, offset+256, 1,
"Platform Mgmt. Address Length: %d", len);
proto_tree_add_item (tree, hf_fcs_platformaddr, tvb, offset+257,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 58995d65ed..91738fd34e 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -157,7 +157,7 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += 4 + len + (4-(len % 4));
@@ -172,7 +172,7 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += 4 + len + (4-(len % 4));
nummbrs = tvb_get_ntohl (tvb, offset);
@@ -348,7 +348,7 @@ dissect_fcfzs_gzsn (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += len + 1 + (len % 4);
proto_tree_add_item (tree, hf_fcfzs_numzones, tvb, offset,
4, ENC_BIG_ENDIAN);
@@ -370,7 +370,7 @@ dissect_fcfzs_gzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
else {
numrec = tvb_get_ntohl (tvb, offset);
@@ -384,7 +384,7 @@ dissect_fcfzs_gzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
offset += len + 1 + (len % 4);
proto_tree_add_item (tree, hf_fcfzs_nummbrs, tvb, offset,
4, ENC_BIG_ENDIAN);
@@ -406,7 +406,7 @@ dissect_fcfzs_gzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
else {
numrec = tvb_get_ntohl (tvb, offset);
@@ -471,7 +471,7 @@ dissect_fcfzs_gzs (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
else {
dissect_fcfzs_zoneset (tvb, tree, offset);
@@ -515,7 +515,7 @@ dissect_fcfzs_arzs (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
}
}
@@ -539,7 +539,7 @@ dissect_fcfzs_arzm (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+1,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
len += (len % 4);
plen = tvb_length (tvb) - offset - len;
@@ -592,14 +592,14 @@ dissect_fcfzs_arzd (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
proto_tree_add_item (tree, hf_fcfzs_zonesetnmlen, tvb, offset,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonesetname, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
len += (len % 4);
offset += len;
len = tvb_get_guint8 (tvb, offset);
proto_tree_add_item (tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_fcfzs_zonename, tvb, offset+4,
- len, 0);
+ len, ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 7c5c09b9ae..d7a8b79996 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -532,15 +532,15 @@ dissect_swils_interconnect_element_info (tvbuff_t *tvb, proto_tree *tree, int of
if (tree) {
proto_tree_add_item (tree, hf_swils_interconnect_list_len, tvb, offset+3, 1, ENC_BIG_ENDIAN);
len = tvb_strsize (tvb, offset+4);
- proto_tree_add_item (tree, hf_swils_ess_vendorname, tvb, offset+4, len, FALSE);
+ proto_tree_add_item (tree, hf_swils_ess_vendorname, tvb, offset+4, len, ENC_ASCII|ENC_NA);
offset += (4 + len);
max_len -= len;
len = tvb_strsize (tvb, offset);
- proto_tree_add_item (tree, hf_swils_ess_modelname, tvb, offset, len, FALSE);
+ proto_tree_add_item (tree, hf_swils_ess_modelname, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
max_len -= len;
len = tvb_strsize (tvb, offset);
- proto_tree_add_item (tree, hf_swils_ess_relcode, tvb, offset, len, FALSE);
+ proto_tree_add_item (tree, hf_swils_ess_relcode, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
max_len -= len;
while (max_len > 0) {
@@ -548,7 +548,7 @@ dissect_swils_interconnect_element_info (tvbuff_t *tvb, proto_tree *tree, int of
* strings
*/
len = tvb_strsize (tvb, offset);
- proto_tree_add_item (tree, hf_swils_ess_vendorspecific, tvb, offset, len, FALSE);
+ proto_tree_add_item (tree, hf_swils_ess_vendorspecific, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
max_len -= len;
}
@@ -680,7 +680,7 @@ dissect_swils_ess_capability_obj (tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_len, tvb, offset+3,
1, ENC_BIG_ENDIAN);
proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_t10, tvb, offset+4,
- 8, 0);
+ 8, ENC_ASCII|ENC_NA);
i -= 8; /* reduce length by t10 object size */
offset += 12;
len += 12;
@@ -1592,7 +1592,7 @@ dissect_swils_esc (tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq)
proto_tree_add_text (esc_tree, tvb, offset+2, 2,
"Payload Length: %d", plen);
proto_tree_add_item (esc_tree, hf_swils_esc_swvendorid, tvb,
- offset+4, 8, 0);
+ offset+4, 8, ENC_ASCII|ENC_NA);
numrec = (plen - 12)/12;
offset = 12;
@@ -1602,7 +1602,7 @@ dissect_swils_esc (tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq)
pdesc_tree = proto_item_add_subtree (subti,
ett_fcswils_esc_pdesc);
proto_tree_add_item (pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb,
- offset, 8, 0);
+ offset, 8, ENC_ASCII|ENC_NA);
proto_tree_add_item (pdesc_tree, hf_swils_esc_protocolid,
tvb, offset+10, 2, ENC_BIG_ENDIAN);
offset += 12;
@@ -1610,13 +1610,13 @@ dissect_swils_esc (tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq)
}
else {
proto_tree_add_item (esc_tree, hf_swils_esc_swvendorid, tvb,
- offset+4, 8, 0);
+ offset+4, 8, ENC_ASCII|ENC_NA);
subti = proto_tree_add_text (esc_tree, tvb, offset+12, 12,
"Accepted Protocol Descriptor");
pdesc_tree = proto_item_add_subtree (subti, ett_fcswils_esc_pdesc);
proto_tree_add_item (pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb,
- offset+12, 8, 0);
+ offset+12, 8, ENC_ASCII|ENC_NA);
proto_tree_add_item (pdesc_tree, hf_swils_esc_protocolid,
tvb, offset+22, 2, ENC_BIG_ENDIAN);
}
@@ -1698,12 +1698,12 @@ dissect_swils_mrra (tvbuff_t *tvb, proto_tree *tree, guint8 isreq)
if (isreq) {
proto_tree_add_item (tree, hf_swils_mrra_rev, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_swils_mrra_size, tvb, offset+8, 4, ENC_BIG_ENDIAN);
- proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, 0);
+ proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, ENC_ASCII|ENC_NA);
proto_tree_add_item (tree, hf_swils_mrra_vendorinfo, tvb, offset+20,
8, ENC_NA);
} else {
proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+4,
- 8, 0);
+ 8, ENC_ASCII|ENC_NA);
proto_tree_add_item (tree, hf_swils_mrra_reply, tvb, offset+12,
4, ENC_BIG_ENDIAN);
proto_tree_add_item (tree, hf_swils_mrra_reply_size, tvb, offset+16,
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 7a439888c1..cd21fad357 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -1853,7 +1853,7 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset,
length -= 4;
proto_tree_add_item(sub_tree,
- hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -1927,7 +1927,7 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset,
length -= 4;
proto_tree_add_item(sub_tree,
- hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -1988,7 +1988,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -2118,7 +2118,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -2172,12 +2172,12 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset,
length -= 4;
proto_tree_add_item(sub_tree,
- hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -2339,12 +2339,12 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset,
length -= 4;
proto_tree_add_item(sub_tree,
- hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -2853,12 +2853,12 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset,
length -= 16;
proto_tree_add_item(sub_tree,
- hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -2964,7 +2964,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_sm_id_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_sm_id_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -3004,12 +3004,12 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset,
}
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -3113,7 +3113,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -3262,12 +3262,12 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset,
}
proto_tree_add_item(sub_tree,
- hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -3426,7 +3426,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -3467,12 +3467,12 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset,
}
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -3570,7 +3570,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -4023,12 +4023,12 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset,
length -= 16;
proto_tree_add_item(sub_tree,
- hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, FALSE);
+ hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -4140,7 +4140,7 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_fms_init_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_fms_init_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -4244,7 +4244,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_fms_init_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_fms_init_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -4446,7 +4446,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree,
- hf_ff_fms_status_err_additional_desc, tvb, offset, 16, FALSE);
+ hf_ff_fms_status_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -4576,17 +4576,17 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset,
}
proto_tree_add_item(sub_tree,
- hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, FALSE);
+ hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_fms_id_rsp_model_name, tvb, offset, 32, FALSE);
+ hf_ff_fms_id_rsp_model_name, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
proto_tree_add_item(sub_tree,
- hf_ff_fms_id_rsp_revision, tvb, offset, 32, FALSE);
+ hf_ff_fms_id_rsp_revision, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
@@ -4646,7 +4646,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_id_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -4808,7 +4808,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_get_od_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -4948,7 +4948,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_init_put_od_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5084,7 +5084,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_put_od_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5221,7 +5221,7 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_terminate_put_od_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5364,7 +5364,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_gen_init_download_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5514,7 +5514,7 @@ dissect_ff_msg_fms_generic_download_segment_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_gen_download_seg_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5670,7 +5670,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_gen_terminate_download_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5812,7 +5812,7 @@ dissect_ff_msg_fms_init_download_sequence_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_init_download_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -5957,7 +5957,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_download_seg_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6111,7 +6111,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_terminate_download_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6249,7 +6249,7 @@ dissect_ff_msg_fms_init_upload_seq_err(
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_init_upload_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6394,7 +6394,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_upload_seg_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6536,7 +6536,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_terminate_upload_seq_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6584,7 +6584,7 @@ dissect_ff_msg_fms_req_dom_download_req(
if(length) {
proto_tree_add_item(sub_tree,
hf_ff_fms_req_dom_download_req_additional_info,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
}
return;
@@ -6678,7 +6678,7 @@ dissect_ff_msg_fms_req_dom_download_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_req_dom_download_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -6726,7 +6726,7 @@ dissect_ff_msg_fms_req_dom_upload_req(
if(length) {
proto_tree_add_item(sub_tree,
hf_ff_fms_req_dom_upload_req_additional_info,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
}
return;
@@ -6819,7 +6819,7 @@ dissect_ff_msg_fms_req_dom_upload_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_req_dom_upload_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7016,7 +7016,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_create_pi_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7155,7 +7155,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_del_pi_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7297,7 +7297,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_start_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7439,7 +7439,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_stop_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7581,7 +7581,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_resume_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7723,7 +7723,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_reset_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7856,7 +7856,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_kill_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -7986,7 +7986,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_read_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -8126,7 +8126,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_read_with_subidx_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -8259,7 +8259,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset,
length -= 2;
proto_tree_add_item(sub_tree, hf_ff_fms_write_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -8401,7 +8401,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_write_with_subidx_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -8584,7 +8584,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_def_variable_list_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -8721,7 +8721,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset,
proto_tree_add_item(sub_tree,
hf_ff_fms_del_variable_list_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -9099,7 +9099,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_alter_ev_condition_monitoring_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -9246,7 +9246,7 @@ dissect_ff_msg_fms_ack_ev_notification_err(
proto_tree_add_item(sub_tree,
hf_ff_fms_ack_ev_notification_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -9537,7 +9537,7 @@ dissect_ff_msg_lr_get_info_err(
proto_tree_add_item(sub_tree,
hf_ff_lr_get_info_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -9983,7 +9983,7 @@ dissect_ff_msg_lr_put_info_err(
proto_tree_add_item(sub_tree,
hf_ff_lr_put_info_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -10202,7 +10202,7 @@ dissect_ff_msg_lr_get_statistics_err(
proto_tree_add_item(sub_tree,
hf_ff_lr_get_statistics_err_additional_desc,
- tvb, offset, 16, FALSE);
+ tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
length -= 16;
@@ -10463,7 +10463,7 @@ dissect_ff_msg_diagnostic_msg_req(
length -= 4;
proto_tree_add_item(sub_tree,
- hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, FALSE);
+ hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset += 32;
length -= 32;
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index d9825f3652..cb2eaba2a3 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -385,7 +385,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(fix_tree, tvb, field_offset, tag->field_len, "%i: %s", tag_value, value);
field_tree = proto_item_add_subtree(ti, ett_unknow);
proto_tree_add_uint(field_tree, hf_fix_field_tag, tvb, field_offset, tag->tag_len, tag_value);
- proto_tree_add_item(field_tree, hf_fix_field_value, tvb, tag->value_offset, tag->value_len, FALSE);
+ proto_tree_add_item(field_tree, hf_fix_field_value, tvb, tag->value_offset, tag->value_len, ENC_ASCII|ENC_NA);
}
field_offset = tag->ctrla_offset + 1;
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 03da083712..89a8ce8b29 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -392,7 +392,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
proto_tree_add_item(reqresp_tree,
hf_ftp_request_command, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
}
if (strncmp(line, "PORT", tokenlen) == 0)
is_port_request = TRUE;
@@ -469,11 +469,11 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (is_request) {
proto_tree_add_item(reqresp_tree,
hf_ftp_request_arg, tvb, offset,
- linelen, FALSE);
+ linelen, ENC_ASCII|ENC_NA);
} else {
proto_tree_add_item(reqresp_tree,
hf_ftp_response_arg, tvb, offset,
- linelen, FALSE);
+ linelen, ENC_ASCII|ENC_NA);
}
}
offset = next_offset;
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index 2a820f1be3..8c8f5cbe8c 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -208,12 +208,12 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* create display subtree for the protocol */
fh_tree = proto_item_add_subtree(ti, ett_fw1);
- proto_tree_add_item(fh_tree, hf_fw1_direction, tvb, 0, 1, FALSE);
+ proto_tree_add_item(fh_tree, hf_fw1_direction, tvb, 0, 1, ENC_ASCII|ENC_NA);
if (fw1_iflist_with_chain)
- proto_tree_add_item(fh_tree, hf_fw1_chain, tvb, 1, 1, FALSE);
+ proto_tree_add_item(fh_tree, hf_fw1_chain, tvb, 1, 1, ENC_ASCII|ENC_NA);
- proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, FALSE);
+ proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, ENC_ASCII|ENC_NA);
if (fw1_with_uuid)
proto_tree_add_item(fh_tree, hf_fw1_uuid, tvb, 8, 4, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index 94b679966a..023dd31d37 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -439,7 +439,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(tree, hf_gdsdb_connect_filename, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 6;
proto_tree_add_item(tree, hf_gdsdb_connect_count, tvb,
@@ -447,7 +447,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
count = tvb_get_ntohl(tvb, offset);
offset += 4;
proto_tree_add_item(tree, hf_gdsdb_connect_userid, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 5;
for(i=0;i<count;i++){
@@ -546,7 +546,7 @@ gdsdb_attach(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(tree, hf_gdsdb_attach_filename, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 6;
proto_tree_add_uint_format_value(tree,
@@ -571,7 +571,7 @@ gdsdb_compile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(tree, hf_gdsdb_compile_blr, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
}
return tvb_length(tvb);
@@ -662,7 +662,7 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
offset, 8, ENC_BIG_ENDIAN);
offset += 8;
proto_tree_add_item(tree, hf_gdsdb_response_data, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 4;
proto_tree_add_item(tree, hf_gdsdb_response_status, tvb,
@@ -723,7 +723,7 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
if (tree) {
offset = 4;
proto_tree_add_item(tree, hf_gdsdb_openblob2_bpb, tvb, offset,
- 4, ENC_BIG_ENDIAN);
+ 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 6;
proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb,
@@ -827,7 +827,7 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
offset += 4;
if(opcode == op_service_info) {
proto_tree_add_item(tree, hf_gdsdb_info_items, tvb,
- offset, 4, ENC_BIG_ENDIAN);
+ offset, 4, ENC_ASCII|ENC_BIG_ENDIAN);
length = tvb_get_ntohl(tvb, offset);
offset += length + 6;
}
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index 5a919caf4c..953260e8f8 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -260,7 +260,7 @@ dissect_glbp_auth(tvbuff_t *tvb, int offset,
offset++;
switch(authtype) {
case 1:
- proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tlv_tree, hf_glbp_auth_plainpass, tvb, offset, authlength, ENC_ASCII|ENC_NA);
offset += authlength;
break;
case 2:
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index 04d4dc6e15..c74756840d 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -132,7 +132,7 @@ static void dissect_gnutella_query(tvbuff_t *tvb, guint offset, proto_tree *tree
tvb,
offset + GNUTELLA_QUERY_SEARCH_OFFSET,
size - GNUTELLA_SHORT_LENGTH,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
else {
proto_tree_add_text(tree,
@@ -251,7 +251,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t
tvb,
name_at_offset,
name_length,
- FALSE);
+ ENC_ASCII|ENC_NA);
if(extra_length) {
proto_tree_add_item(hit_tree,
diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c
index 7c5333a526..9cdc507898 100644
--- a/epan/dissectors/packet-gopher.c
+++ b/epan/dissectors/packet-gopher.c
@@ -182,20 +182,20 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
dir_tree = proto_item_add_subtree(ti, ett_dir_item);
proto_tree_add_item(dir_tree, hf_gopher_di_type, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(dir_tree, hf_gopher_di_name, tvb, offset + 1,
- sel_start - offset - 2, FALSE);
+ sel_start - offset - 2, ENC_ASCII|ENC_NA);
proto_tree_add_item(dir_tree, hf_gopher_di_selector, tvb, sel_start,
- host_start - sel_start - 1, FALSE);
+ host_start - sel_start - 1, ENC_ASCII|ENC_NA);
proto_tree_add_item(dir_tree, hf_gopher_di_host, tvb, host_start,
- port_start - host_start - 1, FALSE);
+ port_start - host_start - 1, ENC_ASCII|ENC_NA);
proto_tree_add_item(dir_tree, hf_gopher_di_port, tvb, port_start,
- line_len - (port_start - offset - 1), FALSE);
+ line_len - (port_start - offset - 1), ENC_ASCII|ENC_NA);
is_dir = TRUE;
offset = next_offset;
}
if (!is_dir) {
proto_item_append_text(ti, "[Unknown]");
- proto_tree_add_item(gopher_tree, hf_gopher_unknown, tvb, 0, -1, FALSE);
+ proto_tree_add_item(gopher_tree, hf_gopher_unknown, tvb, 0, -1, ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 42d4161933..ad0207fcdf 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -2445,7 +2445,7 @@ be_trace_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui
curr_offset = offset;
- proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_trigger_id, tvb, curr_offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_trigger_id, tvb, curr_offset, len, ENC_ASCII|ENC_NA);
curr_offset += len;
/* no length check possible */
@@ -2508,7 +2508,7 @@ be_trace_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32
curr_offset = offset;
- proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_omc_id, tvb, curr_offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_gsm_a_bssmap_trace_omc_id, tvb, curr_offset, len, ENC_ASCII|ENC_NA);
curr_offset += len;
/* no length check possible */
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index ddb11ccae7..bc95d7f909 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -156,7 +156,7 @@ dissect_ipa_attr(tvbuff_t *tvb, int base_offs, proto_tree *tree)
proto_tree_add_item(tree, hf_ipaccess_attr_tag,
tvb, offset+2, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_ipaccess_attr_string,
- tvb, offset+3, len-1, ENC_BIG_ENDIAN);
+ tvb, offset+3, len-1, ENC_ASCII|ENC_NA);
break;
case 0x01: /* a single-byte reqest for a certain attr */
len = 0;
@@ -234,7 +234,7 @@ dissect_osmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ipatree, proto_tree
/* Simply display the CTRL data as text */
} else if (osmo_proto == IPAC_PROTO_EXT_CTRL) {
if (tree) {
- proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_ASCII|ENC_NA);
}
return 1;
}
@@ -319,10 +319,10 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case HSL_DEBUG:
if (tree) {
proto_tree_add_item(ipa_tree, hf_ipa_hsl_debug,
- next_tvb, 0, len, ENC_BIG_ENDIAN);
+ next_tvb, 0, len, ENC_ASCII|ENC_NA);
if (global_ipa_in_root == TRUE)
proto_tree_add_item(tree, hf_ipa_hsl_debug,
- next_tvb, 0, len, ENC_BIG_ENDIAN);
+ next_tvb, 0, len, ENC_ASCII|ENC_NA);
}
if (global_ipa_in_info == TRUE)
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 403373a617..7d957c29e0 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -3987,7 +3987,7 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
- proto_tree_add_item(ext_tree_qos, hf_gtp_qos_version, tvb, offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(ext_tree_qos, hf_gtp_qos_version, tvb, offset, 2, ENC_ASCII|ENC_NA);
/* Hyphen handling */
hyphen = tvb_get_guint8(tvb, offset + 2);
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index a050a5c739..43a24e756c 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -144,7 +144,7 @@ dissect_params (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset, int params)
offset += 2;
/* length bytes = parameter type */
- proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
if (offset >= length && (!tvb_memeql(tvb, offset - length, "long", length) || !tvb_memeql(tvb, offset - length, "int", length) ||
@@ -171,7 +171,7 @@ dissect_params (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset, int params)
proto_tree_add_item(hdfs_tree, hf_hdfs_namelentwo, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
if (!tvb_memeql(tvb, offset - length, "org.apache.hadoop.fs.permission.FsPermission", length)) {
@@ -208,7 +208,7 @@ dissect_data (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset) {
offset += 2;
/* length bytes = method name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_strcall, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* we only want to parse the packet if it is not a heartbeat (random looking numbers are the decimal
@@ -242,7 +242,7 @@ dissect_resp_long (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 2;
/* length bytes = parameter type */
- proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_paramtype, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* the value */
@@ -270,7 +270,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 2;
/* file name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_filename, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_filename, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
@@ -311,7 +311,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* owner name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_ownername, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_ownername, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* get length */
@@ -322,7 +322,7 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* group name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_groupname, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_groupname, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
@@ -343,7 +343,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* identifier */
- proto_tree_add_item(hdfs_tree, hf_hdfs_identifier, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_identifier, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_guint8(tvb, offset);
@@ -353,7 +353,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* password */
- proto_tree_add_item(hdfs_tree, hf_hdfs_password, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_password, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_guint8(tvb, offset);
@@ -363,7 +363,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* kind */
- proto_tree_add_item(hdfs_tree, hf_hdfs_kind, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_kind, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_guint8(tvb, offset);
@@ -373,7 +373,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* service */
- proto_tree_add_item(hdfs_tree, hf_hdfs_service, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_service, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* corrupt */
@@ -414,7 +414,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 2;
/* datanode id */
- proto_tree_add_item(hdfs_tree, hf_hdfs_datanodeid, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_datanodeid, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_ntohs(tvb, offset);
@@ -424,7 +424,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 2;
/* storageid */
- proto_tree_add_item(hdfs_tree, hf_hdfs_storageid, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_storageid, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* info port */
@@ -464,7 +464,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* location rack */
- proto_tree_add_item(hdfs_tree, hf_hdfs_rackloc, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_rackloc, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_guint8(tvb, offset);
@@ -474,7 +474,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* hostname */
- proto_tree_add_item(hdfs_tree, hf_hdfs_hostname, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_hostname, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_guint8(tvb, offset);
@@ -484,7 +484,7 @@ dissect_block_info (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
offset += 1;
/* admin state */
- proto_tree_add_item(hdfs_tree, hf_hdfs_adminstate, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_adminstate, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
return offset;
@@ -566,7 +566,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
/* length bytes = method name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* get length that we just dissected */
@@ -577,7 +577,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
/* length bytes = object name */
- proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_objname, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* responses about block location info */
@@ -597,7 +597,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
/* the value of the parameter */
- proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
}
@@ -611,7 +611,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* first setup packet starts with "hrpc" */
if (!tvb_memeql(tvb, offset, REQUEST_STR, sizeof(REQUEST_STR) - 1)) {
- proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_sequenceno, tvb, offset, sizeof(REQUEST_STR) - 1, ENC_ASCII|ENC_NA);
offset += sizeof(REQUEST_STR) - 1;
proto_tree_add_item(hdfs_tree, hf_hdfs_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -626,11 +626,11 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* authentication length (read out of first 4 bytes) */
length = tvb_get_ntohl(tvb, offset);
- proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_authlen, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
/* authentication (length the number we just got) */
- proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfs_tree, hf_hdfs_auth, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c
index b940caac72..9debc7ee33 100644
--- a/epan/dissectors/packet-hdfsdata.c
+++ b/epan/dissectors/packet-hdfsdata.c
@@ -162,7 +162,7 @@ dissect_variable_int_string(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offse
int len = dissect_variable_length_long (tvb, hdfsdata_tree, offset);
/* client id = amount of bytes in previous */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_clientid, tvb, *offset, len, ENC_ASCII|ENC_NA);
*offset += len;
}
@@ -178,7 +178,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset)
*offset += 1;
/* token id = amount of bytes in previous */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenid, tvb, *offset, len, ENC_ASCII|ENC_NA);
*offset += len;
len = tvb_get_guint8(tvb, *offset);
@@ -186,7 +186,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset)
*offset += 1;
/* token password = amount of bytes in previous */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenpassword, tvb, *offset, len, ENC_ASCII|ENC_NA);
*offset += len;
len = tvb_get_guint8(tvb, *offset);
@@ -194,7 +194,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset)
*offset += 1;
/* token type = amount of bytes in previous */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokentype, tvb, *offset, len, ENC_ASCII|ENC_NA);
*offset += len;
len = tvb_get_guint8(tvb, *offset);
@@ -202,7 +202,7 @@ dissect_access_tokens(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int *offset)
*offset += 1;
/* token service = amount of bytes in previous; */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_tokenservice, tvb, *offset, len, ENC_ASCII|ENC_NA);
*offset += len;
}
@@ -369,7 +369,7 @@ dissect_write_response(tvbuff_t *tvb, proto_tree *hdfsdata_tree, int offset)
offset += 8;
/* add the rest -> RESPONSE_DATA */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA);
/* offset += (tvb_reported_length(tvb)); */
}
@@ -436,7 +436,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* This message just contains data so we can display it all as one block */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)) - offset, ENC_ASCII|ENC_NA);
} else {
@@ -474,7 +474,7 @@ dissect_hdfsdata_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} else {
/* This message contains some form of data that we have not successfully been able to
pattern match and catagorize. Display all of it as data. */
- proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_BIG_ENDIAN);
+ proto_tree_add_item(hdfsdata_tree, hf_hdfsdata_rest, tvb, offset, (tvb_reported_length(tvb)), ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index cef874a964..2b3d851fc6 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -1309,7 +1309,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset,
if (tokenlen == 0)
return;
proto_tree_add_item(tree, hf_http_request_method, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
if ((next_token - line) > 2 && next_token[-1] == ' ' && next_token[-2] == ' ') {
/* Two spaces in a now indicates empty URI, so roll back one here */
next_token--;
@@ -1333,7 +1333,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset,
/* Everything to the end of the line is the version. */
tokenlen = (int) (lineend - line);
proto_tree_add_item(tree, hf_http_version, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
static void
@@ -1352,7 +1352,7 @@ basic_response_dissector(tvbuff_t *tvb, proto_tree *tree, int offset,
if (tokenlen == 0)
return;
proto_tree_add_item(tree, hf_http_version, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
/* Advance to the start of the next token. */
offset += (int) (next_token - line);
line = next_token;
@@ -1387,7 +1387,7 @@ basic_response_dissector(tvbuff_t *tvb, proto_tree *tree, int offset,
if (tokenlen < 1)
return;
proto_tree_add_item(tree, hf_http_response_phrase, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
}
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index e8b42d1cdd..1439032cf7 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -1589,7 +1589,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
case AST_FRAME_DTMF_BEGIN:
case AST_FRAME_DTMF_END:
- proto_tree_add_item (packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, FALSE);
+ proto_tree_add_item (packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, ENC_ASCII|ENC_NA);
offset += 10;
if (check_col (pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 04adadd24d..74764c5de8 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -1587,7 +1587,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
break;
case 2:
/* FQDN */
- proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_fqdn, tvb, opt_offset, par_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_fqdn, tvb, opt_offset, par_len, ENC_ASCII|ENC_NA);
break;
default:
break;
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c
index 2ef51788b2..2b7a682092 100644
--- a/epan/dissectors/packet-ieee80211-prism.c
+++ b/epan/dissectors/packet-ieee80211-prism.c
@@ -252,7 +252,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Device Name */
if(tree) {
- proto_tree_add_item(prism_tree, hf_ieee80211_prism_devname, tvb, offset, 16, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(prism_tree, hf_ieee80211_prism_devname, tvb, offset, 16, ENC_ASCII|ENC_NA);
}
devname = tvb_get_ephemeral_string(tvb, offset, 16);
offset += 16;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index be06e81307..20a30ad5da 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -3588,9 +3588,9 @@ dissect_venue_name_info(proto_tree *tree, tvbuff_t *tvb, int offset, int end)
break;
}
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_language,
- tvb, offset, 3, ENC_BIG_ENDIAN);
+ tvb, offset, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_venue_name,
- tvb, offset + 3, vlen - 3, ENC_BIG_ENDIAN);
+ tvb, offset + 3, vlen - 3, ENC_ASCII|ENC_NA);
offset += vlen;
}
}
@@ -3617,7 +3617,7 @@ dissect_network_auth_type(proto_tree *tree, tvbuff_t *tvb, int offset, int end)
offset += 2;
if (len)
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_nw_auth_type_url,
- tvb, offset, len, ENC_BIG_ENDIAN);
+ tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
}
@@ -3746,7 +3746,7 @@ dissect_nai_realm_list(proto_tree *tree, tvbuff_t *tvb, int offset, int end)
break;
}
proto_tree_add_item(realm_tree, hf_ieee80211_ff_anqp_nai_realm,
- tvb, offset, nai_len, ENC_NA);
+ tvb, offset, nai_len, ENC_ASCII|ENC_NA);
realm = tvb_get_string(tvb, offset, nai_len);
if (realm) {
proto_item_append_text(r_item, " (%s)", realm);
@@ -3875,7 +3875,7 @@ dissect_domain_name_list(proto_tree *tree, tvbuff_t *tvb, int offset, int end)
tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_ieee80211_ff_anqp_domain_name,
- tvb, offset, len, ENC_BIG_ENDIAN);
+ tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
}
@@ -5048,7 +5048,7 @@ wnm_bss_trans_mgmt_req(proto_tree *tree, tvbuff_t *tvb, int offset)
ENC_LITTLE_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_ieee80211_ff_url, tvb, offset, url_len,
- ENC_NA);
+ ENC_ASCII|ENC_NA);
offset += url_len;
}
@@ -6567,7 +6567,7 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset,
break;
case 3:
proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_r0kh_id,
- tvb, offset, len, ENC_BIG_ENDIAN);
+ tvb, offset, len, ENC_ASCII|ENC_NA);
break;
case 4:
proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key_id,
@@ -6980,7 +6980,7 @@ static int dissect_time_zone(proto_tree *tree, tvbuff_t *tvb, int offset,
guint32 tag_len)
{
proto_tree_add_item(tree, hf_ieee80211_tag_time_zone, tvb, offset, tag_len,
- ENC_NA);
+ ENC_ASCII|ENC_NA);
return offset + tag_len;
}
@@ -7598,7 +7598,7 @@ static int ieee80211_tag_ssid(packet_info *pinfo, proto_tree *tree,
ssid = tvb_get_ephemeral_string(tvb, offset + 2, tag_len);
AirPDcapSetLastSSID(&airpdcap_ctx, (CHAR *) ssid, tag_len);
proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset + 2, tag_len,
- ENC_BIG_ENDIAN);
+ ENC_ASCII|ENC_NA);
if (tag_len > 0) {
proto_item_append_text(ti, ": %s", ssid);
@@ -7836,7 +7836,7 @@ static int ieee80211_tag_country_info(packet_info *pinfo, proto_tree *tree,
offset += 2;
proto_tree_add_item(tree, hf_ieee80211_tag_country_info_code,
- tvb, offset, 2, ENC_BIG_ENDIAN);
+ tvb, offset, 2, ENC_ASCII|ENC_NA);
proto_item_append_text(ti, ": Country Code %s",
tvb_get_ephemeral_string(tvb, offset, 2));
offset += 2;
@@ -8463,7 +8463,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off
switch(sub_id){
case MEASURE_REQ_BEACON_SUB_SSID: /* SSID (0) */
- proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_ssid, tvb, offset, sub_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_beacon_sub_ssid, tvb, offset, sub_length, ENC_ASCII|ENC_NA);
offset += sub_length;
break;
case MEASURE_REQ_BEACON_SUB_BRI: /* Beacon Reporting Information (1) */
@@ -9043,7 +9043,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off
/* The Name of the sending device starts at offset 10 and is up to
15 or 16 bytes in length, \0 padded */
- proto_tree_add_item(tree, hf_ieee80211_tag_cisco_ccx1_name, tvb, offset, 16, ENC_NA);
+ proto_tree_add_item(tree, hf_ieee80211_tag_cisco_ccx1_name, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
/* Total number off associated clients and repeater access points */
@@ -9219,7 +9219,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off
{
offset += 2;
- proto_tree_add_item(tree, hf_ieee80211_mesh_id, tvb, offset, tag_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_ieee80211_mesh_id, tvb, offset, tag_len, ENC_ASCII|ENC_NA);
if (tag_len > 0) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", MESHID=%s", tvb_get_ephemeral_string(tvb, offset, tag_len));
proto_item_append_text(ti, ": %s", tvb_get_ephemeral_string(tvb, offset, tag_len));
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c
index ad61f44b47..781b86dc80 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/packet-image-png.c
@@ -137,10 +137,10 @@ dissect_png_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
offset++;
}
- proto_tree_add_item(tree, hf_png_text_keyword, tvb, 0, offset, FALSE);
+ proto_tree_add_item(tree, hf_png_text_keyword, tvb, 0, offset, ENC_ASCII|ENC_NA);
offset++;
- proto_tree_add_item(tree, hf_png_text_string, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
+ proto_tree_add_item(tree, hf_png_text_string, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
}
@@ -267,7 +267,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
offset+=4;
- it=proto_tree_add_item(chunk_tree, hf_png_chunk_type, tvb, offset, 4, FALSE);
+ it=proto_tree_add_item(chunk_tree, hf_png_chunk_type, tvb, offset, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(chunk_tree, hf_png_chunk_flag_anc, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(chunk_tree, hf_png_chunk_flag_priv, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(chunk_tree, hf_png_chunk_flag_stc, tvb, offset, 4, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 52dd99f9ba..0ee922b153 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -344,7 +344,7 @@ dissect_imf_address(tvbuff_t *tvb, int offset, int length, proto_item *item, pac
group_tree = proto_item_add_subtree(item, ett_imf_group);
/* the display-name is mandatory */
- group_item = proto_tree_add_item(group_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, FALSE);
+ group_item = proto_tree_add_item(group_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII|ENC_NA);
/* consume any whitespace */
for(addr_pos++ ;addr_pos < (offset + length); addr_pos++) {
@@ -381,7 +381,7 @@ dissect_imf_mailbox(tvbuff_t *tvb, int offset, int length, proto_item *item, pac
if((addr_pos = tvb_find_guint8(tvb, offset, length, '<')) == -1) {
/* we can't find an angle bracket - the whole field is therefore the address */
- (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, offset, length, FALSE);
+ (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, offset, length, ENC_ASCII|ENC_NA);
} else {
/* we can find an angle bracket - let's see if we can find a display name */
@@ -394,12 +394,12 @@ dissect_imf_mailbox(tvbuff_t *tvb, int offset, int length, proto_item *item, pac
}
if(offset != addr_pos) { /* there is a display name */
- (void) proto_tree_add_item(mbox_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, FALSE);
+ (void) proto_tree_add_item(mbox_tree, hf_imf_display_name, tvb, offset, addr_pos - offset - 1, ENC_ASCII|ENC_NA);
}
end_pos = tvb_find_guint8(tvb, addr_pos + 1, length - (addr_pos + 1 - offset), '>');
if(end_pos != -1) {
- (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, addr_pos + 1, end_pos - addr_pos - 1, FALSE);
+ (void) proto_tree_add_item(mbox_tree, hf_imf_address, tvb, addr_pos + 1, end_pos - addr_pos - 1, ENC_ASCII|ENC_NA);
}
}
}
@@ -431,7 +431,7 @@ dissect_imf_address_list(tvbuff_t *tvb, int offset, int length, proto_item *item
} else {
item_length = end_offset - item_offset;
}
- addr_item = proto_tree_add_item(tree, hf_imf_address_list_item, tvb, item_offset, item_length, FALSE);
+ addr_item = proto_tree_add_item(tree, hf_imf_address_list_item, tvb, item_offset, item_length, ENC_ASCII|ENC_NA);
dissect_imf_address(tvb, item_offset, item_length, addr_item, pinfo);
if(end_offset != -1) {
@@ -470,7 +470,7 @@ dissect_imf_mailbox_list(tvbuff_t *tvb, int offset, int length, proto_item *item
} else {
item_length = end_offset - item_offset;
}
- mbox_item = proto_tree_add_item(tree, hf_imf_mailbox_list_item, tvb, item_offset, item_length, FALSE);
+ mbox_item = proto_tree_add_item(tree, hf_imf_mailbox_list_item, tvb, item_offset, item_length, ENC_ASCII|ENC_NA);
dissect_imf_mailbox(tvb, item_offset, item_length, mbox_item, pinfo);
if(end_offset != -1) {
@@ -525,17 +525,17 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa
if (tvb_strneql(tvb, item_offset, "marking", 7) == 0) {
proto_item_append_text(item, ": %s", tvb_get_ephemeral_string(tvb, value_offset, value_length));
- proto_tree_add_item(tree, hf_imf_siolabel_marking, tvb, value_offset, value_length, FALSE);
+ proto_tree_add_item(tree, hf_imf_siolabel_marking, tvb, value_offset, value_length, ENC_ASCII|ENC_NA);
} else if (tvb_strneql(tvb, item_offset, "fgcolor", 7) == 0) {
- proto_tree_add_item(tree, hf_imf_siolabel_fgcolor, tvb, value_offset, value_length, FALSE);
+ proto_tree_add_item(tree, hf_imf_siolabel_fgcolor, tvb, value_offset, value_length, ENC_ASCII|ENC_NA);
} else if (tvb_strneql(tvb, item_offset, "bgcolor", 7) == 0) {
- proto_tree_add_item(tree, hf_imf_siolabel_bgcolor, tvb, value_offset, value_length, FALSE);
+ proto_tree_add_item(tree, hf_imf_siolabel_bgcolor, tvb, value_offset, value_length, ENC_ASCII|ENC_NA);
} else if (tvb_strneql(tvb, item_offset, "type", 4) == 0) {
type = tvb_get_ephemeral_string(tvb, value_offset + 1, value_length - 2); /* quoted */
- proto_tree_add_item(tree, hf_imf_siolabel_type, tvb, value_offset, value_length, FALSE);
+ proto_tree_add_item(tree, hf_imf_siolabel_type, tvb, value_offset, value_length, ENC_ASCII|ENC_NA);
} else if (tvb_strneql(tvb, item_offset, "label", 5) == 0) {
gchar *label = tvb_get_ephemeral_string(tvb, value_offset + 1, value_length - 2); /* quoted */
@@ -546,11 +546,11 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa
proto_tree_add_string_format(tree, hf_imf_siolabel_label, tvb, value_offset, value_length,
label, "Label[%d]: \"%s\"", num, label);
} else {
- proto_tree_add_item(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, FALSE);
+ proto_tree_add_item(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, ENC_ASCII|ENC_NA);
}
} else {
- sub_item = proto_tree_add_item(tree, hf_imf_siolabel_unknown, tvb, item_offset, item_length, FALSE);
+ sub_item = proto_tree_add_item(tree, hf_imf_siolabel_unknown, tvb, item_offset, item_length, ENC_ASCII|ENC_NA);
expert_add_info_format(pinfo, sub_item, PI_PROTOCOL, PI_WARN, "Unknown parameter");
}
@@ -598,13 +598,13 @@ dissect_imf_content_type(tvbuff_t *tvb, int offset, int length, proto_item *item
ct_tree = proto_item_add_subtree(item, ett_imf_content_type);
len = first_colon - offset;
- proto_tree_add_item(ct_tree, hf_imf_content_type_type, tvb, offset, len, FALSE);
+ proto_tree_add_item(ct_tree, hf_imf_content_type_type, tvb, offset, len, ENC_ASCII|ENC_NA);
if(type) {
/* This string will be automatically freed */
(*type) = tvb_get_ephemeral_string(tvb, offset, len);
}
len = length - (first_colon + 1 - offset);
- proto_tree_add_item(ct_tree, hf_imf_content_type_parameters, tvb, first_colon + 1, len, FALSE);
+ proto_tree_add_item(ct_tree, hf_imf_content_type_parameters, tvb, first_colon + 1, len, ENC_ASCII|ENC_NA);
if(parameters) {
/* This string will be automatically freed */
(*parameters) = tvb_get_ephemeral_string(tvb, first_colon + 1, len);
@@ -743,16 +743,16 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(hf_id == hf_imf_extension_type) {
/* remove 2 bytes to take off the final CRLF to make things a little prettier */
- item = proto_tree_add_item(tree, hf_imf_extension, tvb, unknown_offset, end_offset - unknown_offset - 2, FALSE);
+ item = proto_tree_add_item(tree, hf_imf_extension, tvb, unknown_offset, end_offset - unknown_offset - 2, ENC_ASCII|ENC_NA);
proto_item_append_text(item, " (Contact Wireshark developers if you want this supported.)");
unknown_tree = proto_item_add_subtree(item, ett_imf_extension);
- proto_tree_add_item(unknown_tree, hf_imf_extension_type, tvb, unknown_offset, start_offset - 1 - unknown_offset, FALSE);
+ proto_tree_add_item(unknown_tree, hf_imf_extension_type, tvb, unknown_offset, start_offset - 1 - unknown_offset, ENC_ASCII|ENC_NA);
/* remove 2 bytes to take off the final CRLF to make things a little prettier */
- item = proto_tree_add_item(unknown_tree, hf_imf_extension_value, tvb, start_offset, end_offset - start_offset - 2, FALSE);
+ item = proto_tree_add_item(unknown_tree, hf_imf_extension_value, tvb, start_offset, end_offset - start_offset - 2, ENC_ASCII|ENC_NA);
} else {
/* remove 2 bytes to take off the final CRLF to make things a little prettier */
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index a1a6dbaa6d..4a6f60c442 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -3864,7 +3864,7 @@ static void parse_NodeDescription(proto_tree* parentTree, tvbuff_t* tvb, gint *o
return;
NodeDescription_header_tree = parentTree;
- proto_tree_add_item(NodeDescription_header_tree, hf_infiniband_NodeDescription_NodeString, tvb, local_offset, 64, FALSE);
+ proto_tree_add_item(NodeDescription_header_tree, hf_infiniband_NodeDescription_NodeString, tvb, local_offset, 64, ENC_ASCII|ENC_NA);
}
/* Parse NodeInfo Attribute
@@ -4856,7 +4856,7 @@ static void parse_ServiceAssociationRecord(proto_tree* parentTree, tvbuff_t* tvb
ServiceAssociationRecord_header_tree = proto_item_add_subtree(ServiceAssociationRecord_header_item, ett_serviceassocrecord);
proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceKey, tvb, local_offset, 16, ENC_NA); local_offset +=16;
- proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName, tvb, local_offset, 64, FALSE); local_offset +=64;
+ proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName, tvb, local_offset, 64, ENC_ASCII|ENC_NA); local_offset +=64;
}
/* Parse PortCounters MAD from the Performance management class.
diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index cfbc68419f..bb1e4a8761 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -99,7 +99,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (ilh_tree) {
- proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, FALSE);
+ proto_tree_add_item(ilh_tree, hf_interlink_id, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_item(ilh_tree, hf_interlink_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c
index db8ab9269e..c575090ea8 100644
--- a/epan/dissectors/packet-ipmi-app.c
+++ b/epan/dissectors/packet-ipmi-app.c
@@ -769,7 +769,7 @@ rq39(tvbuff_t *tvb, proto_tree *tree)
proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL,
ett_ipmi_app_39_byte1, byte1, TRUE, 0);
- proto_tree_add_item(tree, hf_ipmi_app_39_user, tvb, 1, 16, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_app_39_user, tvb, 1, 16, ENC_ASCII|ENC_NA);
}
static void
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index b7b39d6086..b0abb4b9d7 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -1331,7 +1331,7 @@ prop_02(tvbuff_t *tvb, proto_tree *tree)
if (len > 12) {
len = 12;
}
- proto_tree_add_item(tree, hf_ipmi_picmg_prop02_desc, tvb, 0, len, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_picmg_prop02_desc, tvb, 0, len, ENC_ASCII|ENC_NA);
}
static const struct {
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c
index e364e49c74..605229a1ea 100644
--- a/epan/dissectors/packet-ipmi-se.c
+++ b/epan/dissectors/packet-ipmi-se.c
@@ -2036,7 +2036,7 @@ cfgparam_13(tvbuff_t *tvb, proto_tree *tree)
proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp13_byte1, byte1, TRUE, 0);
proto_tree_add_item(tree, hf_ipmi_se_cp13_blocksel, tvb, 1, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, tvb_length(tvb) - 2, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_se_cp13_string, tvb, 2, tvb_length(tvb) - 2, ENC_ASCII|ENC_NA);
}
static void
diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c
index 8cc5c842d2..c480b976c2 100644
--- a/epan/dissectors/packet-ipmi-storage.c
+++ b/epan/dissectors/packet-ipmi-storage.c
@@ -422,7 +422,7 @@ static void
rq27(tvbuff_t *tvb, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ipmi_stor_27_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_stor_27_clr, tvb, 2, 3, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_stor_27_clr, tvb, 2, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_ipmi_stor_27_action, tvb, 5, 1, ENC_LITTLE_ENDIAN);
}
@@ -619,7 +619,7 @@ static void
rq47(tvbuff_t *tvb, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ipmi_stor_47_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_stor_47_clr, tvb, 2, 3, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_stor_47_clr, tvb, 2, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_ipmi_stor_47_action, tvb, 5, 1, ENC_LITTLE_ENDIAN);
}
diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c
index cc6b512d2e..1d7c20240a 100644
--- a/epan/dissectors/packet-ipmi-transport.c
+++ b/epan/dissectors/packet-ipmi-transport.c
@@ -833,7 +833,7 @@ lan_15(tvbuff_t *tvb, proto_tree *tree)
static void
lan_16(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_lan16_comm_string, tvb, 0, 18, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_lan16_comm_string, tvb, 0, 18, ENC_ASCII|ENC_NA);
}
static void
@@ -1279,25 +1279,25 @@ static void
serial_10(tvbuff_t *tvb, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ipmi_trn_serial10_set_sel, tvb, 0, 1, TRUE);
- proto_tree_add_item(tree, hf_ipmi_trn_serial10_init_str, tvb, 1, tvb_length(tvb) - 1, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial10_init_str, tvb, 1, tvb_length(tvb) - 1, ENC_ASCII|ENC_NA);
}
static void
serial_11(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial11_esc_seq, tvb, 0, 5, ENC_ASCII|ENC_NA);
}
static void
serial_12(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_serial12_hangup_seq, tvb, 0, 8, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial12_hangup_seq, tvb, 0, 8, ENC_ASCII|ENC_NA);
}
static void
serial_13(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_serial13_dial_cmd, tvb, 0, 8, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial13_dial_cmd, tvb, 0, 8, ENC_ASCII|ENC_NA);
}
static void
@@ -1309,7 +1309,7 @@ serial_14(tvbuff_t *tvb, proto_tree *tree)
static void
serial_15(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_serial15_comm_string, tvb, 0, 18, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial15_comm_string, tvb, 0, 18, ENC_ASCII|ENC_NA);
}
static void
@@ -1399,7 +1399,7 @@ serial_21(tvbuff_t *tvb, proto_tree *tree)
proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL,
ett_ipmi_trn_serial21_byte1, byte1, TRUE, 0);
proto_tree_add_item(tree, hf_ipmi_trn_serial21_blockno, tvb, 1, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial21_dialstr, tvb, 2, 1, ENC_ASCII|ENC_NA);
}
static void
@@ -1444,14 +1444,14 @@ static void
serial_26(tvbuff_t *tvb, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_passwd, tvb, 1, 6, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial26_tap_passwd, tvb, 1, 6, ENC_ASCII|ENC_NA);
}
static void
serial_27(tvbuff_t *tvb, proto_tree *tree)
{
proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_pager_id, tvb, 1, 16, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial27_tap_pager_id, tvb, 1, 16, ENC_ASCII|ENC_NA);
}
static void
@@ -1469,7 +1469,7 @@ serial_28(tvbuff_t *tvb, proto_tree *tree)
ett_ipmi_trn_serial28_byte1, byte1, TRUE, 0);
proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL,
ett_ipmi_trn_serial28_byte2, byte2, TRUE, 0);
- proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial28_srvtype, tvb, 2, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_ipmi_trn_serial28_ctrl_esc, tvb, 5, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask_text(tree, tvb, 9, 1, NULL, NULL,
ett_ipmi_trn_serial28_byte10, byte10, TRUE, 0);
@@ -1537,7 +1537,7 @@ serial_33(tvbuff_t *tvb, proto_tree *tree)
static void
serial_34(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_serial34_chap_name, tvb, 0, 16, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial34_chap_name, tvb, 0, 16, ENC_ASCII|ENC_NA);
}
static void
@@ -1586,7 +1586,7 @@ serial_40(tvbuff_t *tvb, proto_tree *tree)
if (slen > 16) {
slen = 16;
}
- proto_tree_add_item(tree, hf_ipmi_trn_serial40_username, tvb, 1, slen, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial40_username, tvb, 1, slen, ENC_ASCII|ENC_NA);
}
static void
@@ -1599,7 +1599,7 @@ serial_41(tvbuff_t *tvb, proto_tree *tree)
if (slen > 16) {
slen = 16;
}
- proto_tree_add_item(tree, hf_ipmi_trn_serial41_userdomain, tvb, 1, slen, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial41_userdomain, tvb, 1, slen, ENC_ASCII|ENC_NA);
}
static void
@@ -1612,7 +1612,7 @@ serial_42(tvbuff_t *tvb, proto_tree *tree)
if (slen > 16) {
slen = 16;
}
- proto_tree_add_item(tree, hf_ipmi_trn_serial42_userpass, tvb, 1, slen, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial42_userpass, tvb, 1, slen, ENC_ASCII|ENC_NA);
}
static void
@@ -1667,7 +1667,7 @@ serial_49(tvbuff_t *tvb, proto_tree *tree)
if (slen > 16) {
slen = 16;
}
- proto_tree_add_item(tree, hf_ipmi_trn_serial49_dialstr, tvb, 1, slen, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_serial49_dialstr, tvb, 1, slen, ENC_ASCII|ENC_NA);
}
static void
@@ -1934,11 +1934,11 @@ rq13(tvbuff_t *tvb, proto_tree *tree)
static void
rs13(tvbuff_t *tvb, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_ipmi_trn_13_code1, tvb, 0, 3, TRUE);
- proto_tree_add_item(tree, hf_ipmi_trn_13_code2, tvb, 3, 3, TRUE);
- proto_tree_add_item(tree, hf_ipmi_trn_13_code3, tvb, 6, 3, TRUE);
- proto_tree_add_item(tree, hf_ipmi_trn_13_code4, tvb, 9, 3, TRUE);
- proto_tree_add_item(tree, hf_ipmi_trn_13_code5, tvb, 12, 3, TRUE);
+ proto_tree_add_item(tree, hf_ipmi_trn_13_code1, tvb, 0, 3, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_ipmi_trn_13_code2, tvb, 3, 3, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_ipmi_trn_13_code3, tvb, 6, 3, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_ipmi_trn_13_code4, tvb, 9, 3, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_ipmi_trn_13_code5, tvb, 12, 3, ENC_ASCII|ENC_NA);
}
/* Set PPP UDP Proxy Transmit Data
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index cf5bccb389..f847f596fe 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -144,7 +144,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
proto_tree_add_item(ipxwan_tree, hf_ipxwan_identifier, tvb,
- offset, 4, FALSE);
+ offset, 4, ENC_ASCII|ENC_NA);
}
offset += 4;
packet_type = tvb_get_guint8(tvb, offset);
@@ -222,7 +222,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset+2, 4, ENC_NA);
proto_tree_add_item(option_tree,
hf_ipxwan_router_name, tvb,
- offset+6, 48, FALSE);
+ offset+6, 48, ENC_ASCII|ENC_NA);
}
break;
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index 841c77860b..30185a451d 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -60,13 +60,13 @@ static gint ett_irc = -1;
static void
dissect_irc_request(proto_tree *tree, tvbuff_t *tvb, int offset, int linelen)
{
- proto_tree_add_item(tree, hf_irc_request, tvb, offset, linelen, TRUE);
+ proto_tree_add_item(tree, hf_irc_request, tvb, offset, linelen, ENC_ASCII|ENC_NA);
}
static void
dissect_irc_response(proto_tree *tree, tvbuff_t *tvb, int offset, int linelen)
{
- proto_tree_add_item(tree, hf_irc_response, tvb, offset, linelen, TRUE);
+ proto_tree_add_item(tree, hf_irc_response, tvb, offset, linelen, ENC_ASCII|ENC_NA);
}
static void
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 3c99793fce..e61197457b 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -3587,11 +3587,11 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v
proto_item_append_text(idit, "%s", tvb_ip_to_str(tvb, offset));
break;
case IKE_ID_FQDN:
- proto_tree_add_item(idtree, hf_isakmp_id_data_fqdn, tvb, offset, length, FALSE);
+ proto_tree_add_item(idtree, hf_isakmp_id_data_fqdn, tvb, offset, length, ENC_ASCII|ENC_NA);
proto_item_append_text(idit, "%s", tvb_get_ephemeral_string(tvb, offset,length));
break;
case IKE_ID_USER_FQDN:
- proto_tree_add_item(idtree, hf_isakmp_id_data_user_fqdn, tvb, offset, length, FALSE);
+ proto_tree_add_item(idtree, hf_isakmp_id_data_user_fqdn, tvb, offset, length, ENC_ASCII|ENC_NA);
proto_item_append_text(idit, "%s", tvb_get_ephemeral_string(tvb, offset,length));
break;
case IKE_ID_IPV4_ADDR_SUBNET:
@@ -3862,7 +3862,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm
proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6, tvb, offset+2, 16, ENC_NA);
break;
case 3:
- proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), FALSE);
+ proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_ASCII|ENC_NA);
break;
default :
proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_NA);
@@ -4023,7 +4023,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree)
if (length >= 19 && memcmp(pVID, VID_ARUBA_VIA_AUTH_PROFILE, 19) == 0)
{
offset += 19;
- proto_tree_add_item(tree, hf_isakmp_vid_aruba_via_auth_profile, tvb, offset, length-19, FALSE);
+ proto_tree_add_item(tree, hf_isakmp_vid_aruba_via_auth_profile, tvb, offset, length-19, ENC_ASCII|ENC_NA);
offset += 4;
}
}
@@ -4130,7 +4130,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs
}
break;
case APPLICATION_VERSION: /* 7 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_application_version, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_application_version, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case INTERNAL_IP6_ADDRESS: /* 8 */
@@ -4256,27 +4256,27 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs
proto_item_append_text(cfg_attr_type_item," : %s", rval_to_str(tvb_get_ntohs(tvb, offset), cfgattr_xauth_type, "Unknown %d"));
break;
case XAUTH_USER_NAME: /* 16521 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_name, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_name, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_USER_PASSWORD: /* 16522 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_password, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_password, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_PASSCODE: /* 16523 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_passcode, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_passcode, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_MESSAGE: /* 16524 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_message, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_message, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_CHALLENGE: /* 16525 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_challenge, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_challenge, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_DOMAIN: /* 16526 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_domain, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_domain, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_STATUS: /* 16527 */
@@ -4284,20 +4284,20 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs
proto_item_append_text(cfg_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), cfgattr_xauth_status, "Unknown %d"));
break;
case XAUTH_NEXT_PIN: /* 16528 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_next_pin, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_next_pin, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case XAUTH_ANSWER: /* 16527 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_answer, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_answer, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case UNITY_BANNER: /* 28672 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_banner, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_banner, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
case UNITY_DEF_DOMAIN: /* 28674 */
- proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_def_domain, tvb, offset, optlen, FALSE);
+ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_def_domain, tvb, offset, optlen, ENC_ASCII|ENC_NA);
proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_ephemeral_string(tvb, offset,optlen));
break;
/* TODO: Support other UNITY Attributes ! */
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index f82d524f7c..7718851fb9 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -625,7 +625,7 @@ addTextKeys(packet_info *pinfo, proto_tree *tt, tvbuff_t *tvb, gint offset, guin
iscsi_dissect_TargetAddress(pinfo, tt, value);
}
- proto_tree_add_item(tt, hf_iscsi_KeyValue, tvb, offset, len, FALSE);
+ proto_tree_add_item(tt, hf_iscsi_KeyValue, tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
}
return offset;
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 5f6905041d..bf27ad147e 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -130,7 +130,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree
interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", interface_id_length,
tvb_get_ephemeral_string(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length));
}
@@ -143,7 +143,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
guint16 info_string_length;
info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 0e67fd8dd0..82a9c79346 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -477,7 +477,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr
gchar *content_type = NULL;
tvbuff_t *jxta_message_tvb;
- proto_tree_add_item(jxta_udp_tree, hf_jxta_udpsig, tvb, tree_offset, sizeof(JXTA_UDP_SIG), FALSE);
+ proto_tree_add_item(jxta_udp_tree, hf_jxta_udpsig, tvb, tree_offset, sizeof(JXTA_UDP_SIG), ENC_ASCII|ENC_NA);
tree_offset += sizeof(JXTA_UDP_SIG);
jxta_message_framing_tvb = tvb_new_subset_remaining(tvb, tree_offset);
@@ -833,7 +833,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
if (NULL != *current_token) {
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_sig, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_sig, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
@@ -847,7 +847,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
if (NULL != *current_token) {
if (jxta_welcome_tree) {
proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_destAddr, tvb, token_offset, (gint) strlen(*current_token),
- FALSE);
+ ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
@@ -860,7 +860,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
if (NULL != *current_token) {
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_pubAddr, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_pubAddr, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
@@ -873,7 +873,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
if (NULL != *current_token) {
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_peerid, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_peerid, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -912,32 +912,32 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree
if( (2 == variable_tokens) && (0 == strcmp(JXTA_WELCOME_MSG_VERSION_1_1, current_token[variable_tokens -1])) ) {
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
current_token++;
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
} else if( (3 == variable_tokens) && (0 == strcmp(JXTA_WELCOME_MSG_VERSION_3_0, current_token[variable_tokens -1])) ) {
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_noProp, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
current_token++;
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_msgVers, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_msgVers, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
token_offset += (guint) strlen(*current_token) + 1;
current_token++;
if (jxta_welcome_tree) {
- proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), FALSE);
+ proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_version, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA);
}
} else {
/* Unrecognized Welcome Version */
@@ -1080,7 +1080,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro
/*
* Put header name into the protocol tree
*/
- proto_tree_add_item(framing_header_tree, hf_jxta_framing_header_name, tvb, tree_offset, sizeof(gint8), ENC_BIG_ENDIAN);
+ proto_tree_add_item(framing_header_tree, hf_jxta_framing_header_name, tvb, tree_offset, sizeof(gint8), ENC_ASCII|ENC_BIG_ENDIAN);
/*
* Append header name into the header protocol item. It's a nice hint so you don't have to reveal all headers.
@@ -1328,7 +1328,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
jxta_msg_tree = proto_item_add_subtree(jxta_msg_tree_item, ett_jxta_msg);
- proto_tree_add_item(jxta_msg_tree, hf_jxta_message_sig, tvb, tree_offset, sizeof(JXTA_MSG_SIG), FALSE);
+ proto_tree_add_item(jxta_msg_tree, hf_jxta_message_sig, tvb, tree_offset, sizeof(JXTA_MSG_SIG), ENC_ASCII|ENC_NA);
tree_offset += sizeof(JXTA_MSG_SIG);
tree_item = proto_tree_add_string(jxta_msg_tree, hf_jxta_message_src, tvb, 0, 0, src_addr->str);
@@ -1389,7 +1389,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
guint16 name_len = tvb_get_ntohs(tvb, tree_offset);
names_table[2 + each_name] = tvb_get_ephemeral_string(tvb, tree_offset + sizeof(name_len), name_len);
- proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, sizeof(name_len), ENC_BIG_ENDIAN);
+ proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, sizeof(name_len), ENC_ASCII|ENC_BIG_ENDIAN);
tree_offset += sizeof(name_len) + name_len;
}
@@ -1607,7 +1607,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
gchar *mediatype = NULL;
tvbuff_t *element_content_tvb;
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, sizeof(JXTA_MSGELEM_SIG), FALSE);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, sizeof(JXTA_MSGELEM_SIG), ENC_ASCII|ENC_NA);
tree_offset += sizeof(JXTA_MSGELEM_SIG);
namespaceID = tvb_get_guint8(tvb, tree_offset);
@@ -1630,13 +1630,13 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
name_len = tvb_get_ntohs(tvb, tree_offset);
proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + sizeof(guint16), name_len));
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
tree_offset += sizeof(guint16) + name_len;
/* process type */
if ((flags & JXTAMSG1_ELMFLAG_TYPE) != 0) {
guint16 type_len = tvb_get_ntohs(tvb, tree_offset);
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
tree_offset += sizeof(guint16);
mediatype = tvb_get_ephemeral_string(tvb, tree_offset, type_len);
@@ -1647,7 +1647,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p
/* process encoding */
if ((flags & JXTAMSG1_ELMFLAG_ENCODING) != 0) {
guint16 encoding_len = tvb_get_ntohs(tvb, tree_offset);
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_encoding, tvb, tree_offset, sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
tree_offset += sizeof(guint16) + encoding_len;
}
@@ -1865,7 +1865,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p
const gchar *mediatype = NULL;
tvbuff_t *element_content_tvb;
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, sizeof(JXTA_MSGELEM_SIG), FALSE);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_sig, tvb, tree_offset, sizeof(JXTA_MSGELEM_SIG), ENC_ASCII|ENC_NA);
tree_offset += sizeof(JXTA_MSGELEM_SIG);
flags = tvb_get_guint8(tvb, tree_offset);
@@ -1905,7 +1905,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p
/* literal name */
guint16 name_len = tvb_get_ntohs(tvb, tree_offset);
proto_item_append_text(jxta_elem_tree_item, " \"%s\"", tvb_format_text(tvb, tree_offset + sizeof(guint16), name_len));
- proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_BIG_ENDIAN);
+ proto_tree_add_item(jxta_elem_tree, hf_jxta_element_name, tvb, tree_offset, sizeof(guint16), ENC_ASCII|ENC_BIG_ENDIAN);
tree_offset += sizeof(guint16) + name_len;
}
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index 2941974de3..1d743dfb7d 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -107,7 +107,7 @@ static void dissect_kdp(tvbuff_t *tvb,
if (version != 2) {
/* Version other than 2 is really SDDP in UDP */
proto_tree_add_item(kdp_tree, hf_kdp_version, tvb, 0, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(kdp_tree, hf_kdp_xml_body, tvb, 0, -1, FALSE);
+ proto_tree_add_item(kdp_tree, hf_kdp_xml_body, tvb, 0, -1, ENC_ASCII|ENC_NA);
} else {
header_len = tvb_get_guint8(tvb, 1) * 4;
body_len = tvb_reported_length(tvb);
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 4dd8956a72..f81145c10b 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -153,7 +153,7 @@ dissect_kpasswd_user_data_reply(packet_info *pinfo, tvbuff_t *tvb, proto_tree *t
/* optional result string */
if(tvb_length_remaining(tvb, offset)){
- proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
+ proto_tree_add_item(tree, hf_kpasswd_result_string, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
}
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 0b28a59b93..ecd1afc931 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -107,7 +107,7 @@ dissect_laplink_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(laplink_tree, hf_laplink_udp_ident, tvb, offset, 4, udp_ident);
offset += 4;
- proto_tree_add_item(laplink_tree, hf_laplink_udp_name, tvb, offset, -1, FALSE);
+ proto_tree_add_item(laplink_tree, hf_laplink_udp_name, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
return tvb_length(tvb);
}
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index e87f02c61a..20f1d524c0 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -924,13 +924,13 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case RLNH_QUERY_NAME:
proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE);
+ proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += tvb_strnlen(linx_tcp_tvb, offset, -1);
break;
case RLNH_PUBLISH:
proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_src_linkaddr, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, FALSE);
+ proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_name, linx_tcp_tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += tvb_strnlen(linx_tcp_tvb, offset, -1);
break;
case RLNH_UNPUBLISH:
@@ -950,7 +950,7 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_status, linx_tcp_tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
if(rlnh_version > 1) {
- proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, linx_tcp_tvb, offset, -1, FALSE);
+ proto_tree_add_item(rlnh_header_tree, hf_linx_tcp_rlnh_feat_neg_str, linx_tcp_tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += tvb_strnlen(linx_tcp_tvb, offset, -1);
}
break;
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index 55c29cbb0f..6dc68b176b 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -285,7 +285,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree
tvb,
LWRES_LWPACKET_LENGTH + 8,
realnamelen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset=LWRES_LWPACKET_LENGTH + 8 + realnamelen;
@@ -311,7 +311,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree
tvb,
offset + 2,
aliaslen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset+=(2 + aliaslen + 1);
}
@@ -364,7 +364,7 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree
tvb,
LWRES_LWPACKET_LENGTH+10,
namelen,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
@@ -411,7 +411,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre
LWRES_LWPACKET_LENGTH + 8, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(adn_resp_tree, hf_adn_realname, tvb,
- LWRES_LWPACKET_LENGTH + 10, realnamelen, FALSE);
+ LWRES_LWPACKET_LENGTH + 10, realnamelen, ENC_ASCII|ENC_NA);
offset = LWRES_LWPACKET_LENGTH + 10 + realnamelen + 1;
@@ -429,7 +429,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre
offset, 2, aliaslen);
proto_tree_add_item(alias_tree, hf_adn_aliasname, tvb,
- offset + 2, aliaslen, FALSE);
+ offset + 2, aliaslen, ENC_ASCII|ENC_NA);
offset+=(2 + aliaslen + 1);
}
@@ -737,7 +737,7 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree)
tvb,
LWRES_LWPACKET_LENGTH+10,
namelen,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
@@ -817,7 +817,7 @@ static void dissect_rdata_response(tvbuff_t* tvb, proto_tree* lwres_tree)
tvb,
LWRES_LWPACKET_LENGTH+18,
realnamelen,
- FALSE);
+ ENC_ASCII|ENC_NA);
switch(rdtype)
{
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index adde5b394e..86665e7885 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -286,7 +286,7 @@ dissect_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree
interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", interface_id_length,
tvb_get_ephemeral_string(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length));
}
@@ -299,7 +299,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
guint16 info_string_length;
info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 366d18250f..f7a31b3b9a 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -410,7 +410,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
guint16 info_string_length;
info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index df014a2814..99a1965981 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -1221,7 +1221,7 @@ static gint dissect_rar_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* Create tree for this Body */
rar_body_ti = proto_tree_add_item(tree,
hf_mac_lte_rar_body,
- tvb, offset, 0, FALSE);
+ tvb, offset, 0, ENC_ASCII|ENC_NA);
rar_body_tree = proto_item_add_subtree(rar_body_ti, ett_mac_lte_rar_body);
/* Dissect an RAR entry */
@@ -1320,7 +1320,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro
/* Create headers tree */
rar_headers_ti = proto_tree_add_item(tree,
hf_mac_lte_rar_headers,
- tvb, offset, 0, FALSE);
+ tvb, offset, 0, ENC_ASCII|ENC_NA);
rar_headers_tree = proto_item_add_subtree(rar_headers_ti, ett_mac_lte_rar_headers);
@@ -1336,7 +1336,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro
/* Create tree for this header */
rar_header_ti = proto_tree_add_item(rar_headers_tree,
hf_mac_lte_rar_header,
- tvb, offset, 0, FALSE);
+ tvb, offset, 0, ENC_ASCII|ENC_NA);
rar_header_tree = proto_item_add_subtree(rar_header_ti, ett_mac_lte_rar_header);
/* Extension */
@@ -3248,7 +3248,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (p_mac_lte_info->oob_event) {
case ltemac_send_preamble:
preamble_ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_send_preamble,
- tvb, 0, 0, FALSE);
+ tvb, 0, 0, ENC_ASCII|ENC_NA);
preamble_tree = proto_item_add_subtree(preamble_ti, ett_mac_lte_oob);
PROTO_ITEM_SET_GENERATED(ti);
diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c
index 2d8df85510..ebc6e94457 100644
--- a/epan/dissectors/packet-mactelnet.c
+++ b/epan/dissectors/packet-mactelnet.c
@@ -246,11 +246,11 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 3: /* Username */
- proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_username, tvb, offset, datalength, ENC_NA);
+ proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_username, tvb, offset, datalength, ENC_ASCII|ENC_NA);
break;
case 4: /* Terminal type */
- proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_terminal, tvb, offset, datalength, ENC_NA);
+ proto_tree_add_item(mactelnet_control_tree, hf_mactelnet_control_terminal, tvb, offset, datalength, ENC_ASCII|ENC_NA);
break;
case 5: /* Terminal width */
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 52efd11cd9..d170374334 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -473,12 +473,12 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
message_tree = proto_item_add_subtree(ti, ett_megaco_message);
if (tree){
if(global_megaco_dissect_tree){
- proto_tree_add_item(message_tree, hf_megaco_version,tvb, ver_offset, ver_length, FALSE);
- proto_tree_add_item(message_tree, hf_megaco_mId,tvb, mId_offset, mId_length, FALSE);
+ proto_tree_add_item(message_tree, hf_megaco_version,tvb, ver_offset, ver_length, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(message_tree, hf_megaco_mId,tvb, mId_offset, mId_length, ENC_ASCII|ENC_NA);
}else{
- hidden_item = proto_tree_add_item(message_tree, hf_megaco_version,tvb, ver_offset, ver_length, FALSE);
+ hidden_item = proto_tree_add_item(message_tree, hf_megaco_version,tvb, ver_offset, ver_length, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
- hidden_item = proto_tree_add_item(message_tree, hf_megaco_mId,tvb, mId_offset, mId_length, FALSE);
+ hidden_item = proto_tree_add_item(message_tree, hf_megaco_mId,tvb, mId_offset, mId_length, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
}
@@ -874,7 +874,7 @@ nextcontext:
megaco_tree_command_line = proto_item_add_subtree(sub_ti, ett_megaco_command_line);
/* creation of the megaco_tree_command_line additionally Command and Transaction ID will be printed in this line */
/* Changed to use the lines above. this code is saved if there is complaints
- sub_ti = proto_tree_add_item(megaco_tree,hf_megaco_command_line,tvb,tvb_command_start_offset,tokenlen, FALSE);
+ sub_ti = proto_tree_add_item(megaco_tree,hf_megaco_command_line,tvb,tvb_command_start_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_tree_command_line = proto_item_add_subtree(sub_ti, ett_megaco_command_line);
*/
@@ -1932,7 +1932,7 @@ dissect_megaco_eventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
"%s", tvb_format_text(tvb, tvb_previous_offset, tokenlen));
/*
- megaco_eventsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_events_descriptor,tvb,tvb_previous_offset,tokenlen, FALSE);
+ megaco_eventsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_events_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_ASCII|ENC_NA);
*/
megaco_eventsdescriptor_tree = proto_item_add_subtree(megaco_eventsdescriptor_ti, ett_megaco_eventsdescriptor);
@@ -2011,7 +2011,7 @@ dissect_megaco_eventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
tokenlen = tvb_RBRKT+1 - tvb_previous_offset;
}
- megaco_requestedevent_ti = proto_tree_add_item(megaco_eventsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,tokenlen, FALSE);
+ megaco_requestedevent_ti = proto_tree_add_item(megaco_eventsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_requestedevent_tree = proto_item_add_subtree(megaco_requestedevent_ti, ett_megaco_requestedevent);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
@@ -2105,7 +2105,7 @@ dissect_megaco_signaldescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
"%s", tvb_format_text(tvb, tvb_signals_start_offset, tokenlen));
/*
- megaco_signalsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_signal_descriptor,tvb,tvb_previous_offset,tokenlen, FALSE);
+ megaco_signalsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_signal_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_signalsdescriptor_tree = proto_item_add_subtree(megaco_signalsdescriptor_ti, ett_megaco_signalsdescriptor);
*/
@@ -2181,7 +2181,7 @@ dissect_megaco_signaldescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
"%s", tvb_format_text(tvb, tvb_previous_offset, tokenlen));
megaco_requestedsignal_tree = proto_item_add_subtree(megaco_requestedsignal_ti, ett_megaco_requestedsignal);
- proto_tree_add_item(megaco_requestedsignal_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, FALSE);
+ proto_tree_add_item(megaco_requestedsignal_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_ASCII|ENC_NA);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
gchar *msg;
@@ -2516,7 +2516,7 @@ dissect_megaco_observedeventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = (tvb_next_offset+1) - tvb_previous_offset;
/*
- megaco_observedeventsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_observedevents_descriptor,tvb,tvb_previous_offset,tokenlen, FALSE);
+ megaco_observedeventsdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_observedevents_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_observedeventsdescriptor_tree = proto_item_add_subtree(megaco_observedeventsdescriptor_ti, ett_megaco_observedeventsdescriptor);
*/
@@ -2606,7 +2606,7 @@ dissect_megaco_observedeventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto
megaco_observedevent_tree = proto_item_add_subtree(megaco_observedevent_ti, ett_megaco_observedevent);
- proto_tree_add_item(megaco_observedevent_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, FALSE);
+ proto_tree_add_item(megaco_observedevent_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_ASCII|ENC_NA);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
@@ -2701,7 +2701,7 @@ dissect_megaco_Packagesdescriptor(tvbuff_t *tvb, proto_tree *megaco_tree_command
tokenlen = (tvb_RBRKT+1) - tvb_previous_offset;
- megaco_packagesdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_packages_descriptor,tvb,tvb_previous_offset,tokenlen, FALSE);
+ megaco_packagesdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_packages_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_packagesdescriptor_tree = proto_item_add_subtree(megaco_packagesdescriptor_ti, ett_megaco_packagesdescriptor);
@@ -2935,7 +2935,7 @@ dissect_megaco_TerminationStatedescriptor(tvbuff_t *tvb, proto_tree *megaco_medi
tokenlen = tvb_next_offset - tvb_current_offset;
/*
- megaco_TerminationState_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_TerminationState_descriptor,tvb,tvb_current_offset,tokenlen, FALSE);
+ megaco_TerminationState_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_TerminationState_descriptor,tvb,tvb_current_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_TerminationState_tree = proto_item_add_subtree(megaco_TerminationState_ti, ett_megaco_TerminationState);
*/
megaco_TerminationState_ti = proto_tree_add_text(megaco_mediadescriptor_tree, tvb, tvb_current_offset, tokenlen,
@@ -3043,7 +3043,7 @@ dissect_megaco_Localdescriptor(tvbuff_t *tvb, proto_tree *megaco_mediadescriptor
/*
- megaco_localdescriptor_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_Local_descriptor,tvb,tvb_current_offset,tokenlen, FALSE);
+ megaco_localdescriptor_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_Local_descriptor,tvb,tvb_current_offset,tokenlen, ENC_ASCII|ENC_NA);
*/
megaco_localdescriptor_ti = proto_tree_add_text(megaco_mediadescriptor_tree, tvb, tvb_current_offset, tokenlen,
"%s", tvb_format_text(tvb, tvb_current_offset, tokenlen));
@@ -3142,7 +3142,7 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades
tokenlen = tvb_next_offset - tvb_current_offset;
/*
- megaco_LocalControl_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_LocalControl_descriptor,tvb,tvb_current_offset,tokenlen, FALSE);
+ megaco_LocalControl_ti = proto_tree_add_item(megaco_mediadescriptor_tree,hf_megaco_LocalControl_descriptor,tvb,tvb_current_offset,tokenlen, ENC_ASCII|ENC_NA);
megaco_LocalControl_tree = proto_item_add_subtree(megaco_LocalControl_ti, ett_megaco_LocalControldescriptor);
*/
while ( tvb_offset < tvb_next_offset && tvb_offset != -1 ){
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 778c3a82a4..173db03793 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -389,7 +389,7 @@ dissect_key (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
gboolean missing = FALSE; /* Set when key is missing */
if (key_len) {
- ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, ENC_BIG_ENDIAN);
+ ti = proto_tree_add_item (tree, hf_key, tvb, offset, key_len, ENC_ASCII|ENC_NA);
offset += key_len;
}
@@ -449,7 +449,7 @@ dissect_value (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_WARN, "Illegal Value length, should be 8");
}
} else {
- ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, ENC_BIG_ENDIAN);
+ ti = proto_tree_add_item (tree, hf_value, tvb, offset, value_len, ENC_ASCII|ENC_NA);
}
offset += value_len;
}
@@ -597,7 +597,7 @@ dissect_memcache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_value (tvb, pinfo, memcache_tree, offset, value_len, opcode, request);
offset += value_len;
} else if (body_len) {
- proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (memcache_tree, hf_value, tvb, offset, body_len, ENC_ASCII|ENC_NA);
offset += body_len;
col_append_fstr (pinfo->cinfo, COL_INFO, " (%s)",
@@ -1076,7 +1076,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset)
tokenlen = get_token_len (line, lineend, &next_token);
if ((tokenlen == 4) && strncmp (line, "STAT", tokenlen) == 0) {
- proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
occurrences = find_stat_colon (line, lineend, &first_colon, &last_colon);
@@ -1093,7 +1093,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset)
case 2: /* stats items: 2 colons */
/* subcommand 'items' */
tokenlen = (int) (first_colon - line);
- proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += tokenlen + 1;
/* slabclass */
@@ -1139,7 +1139,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset)
return -1; /* invalid token */
}
- proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_name, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
@@ -1148,7 +1148,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset)
if (tokenlen == 0) {
return -1; /* invalid token */
}
- proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_name_value, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
@@ -1319,7 +1319,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
return -1;
}
- proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_version, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
@@ -1358,7 +1358,7 @@ memcache_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
(tokenlen == 2 && strncmp (line, "OK", tokenlen) == 0) ||
(tokenlen == 3 && strncmp (line, "END", tokenlen) == 0))
{
- proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_response, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
return offset;
@@ -1397,7 +1397,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tokenlen == 0) {
return -1;
}
- proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_command, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
@@ -1484,7 +1484,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tokenlen = get_token_len (line, lineend, &next_token);
if (tokenlen != 0) {
if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) {
- proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
}
offset += (int) (next_token - line);
line = next_token;
@@ -1514,7 +1514,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tokenlen == 0) {
return -1;
}
- proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_value, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
@@ -1524,7 +1524,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
return offset; /* reached CRLF */
}
if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) {
- proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
} else {
@@ -1560,7 +1560,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tokenlen <= 10) {
if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) {
/* noreply */
- proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
} else {
/* expiration */
memcpy (response_chars, line, tokenlen);
@@ -1607,7 +1607,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tokenlen == 0) { /* just the 'stats' command;*/
return offset;
} else { /* there is a sub command; record it*/
- proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_subcommand, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
}
@@ -1631,7 +1631,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tokenlen <= 10) {
if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) {
/* noreply */
- proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
} else {
/* expiration */
memcpy (response_chars, line, tokenlen);
@@ -1653,7 +1653,7 @@ memcache_request_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
if (tokenlen == 7 && strncmp (line, "noreply", 7) == 0) {
/* noreply */
- proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_noreply, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset += (int) (next_token - line);
line = next_token;
} else {
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 13d04526d9..23b1d2d1b8 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -1843,7 +1843,7 @@ dissect_mgcp_connectionparams(proto_tree *parent_tree, tvbuff_t *tvb, gint offse
if (parent_tree)
{
- item = proto_tree_add_item(parent_tree, hf_mgcp_param_connectionparam, tvb, offset, param_type_len+param_val_len, FALSE);
+ item = proto_tree_add_item(parent_tree, hf_mgcp_param_connectionparam, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA);
tree = proto_item_add_subtree(item, ett_mgcp_param_connectionparam);
}
@@ -1955,7 +1955,7 @@ dissect_mgcp_localconnectionoptions(proto_tree *parent_tree, tvbuff_t *tvb, gint
if (parent_tree)
{
- item = proto_tree_add_item(parent_tree, hf_mgcp_param_localconnoptions, tvb, offset, param_type_len+param_val_len, FALSE);
+ item = proto_tree_add_item(parent_tree, hf_mgcp_param_localconnoptions, tvb, offset, param_type_len+param_val_len, ENC_ASCII|ENC_NA);
tree = proto_item_add_subtree(item, ett_mgcp_param_localconnectionoptions);
}
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index a83e9a7b4d..8ad4186527 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -194,7 +194,7 @@ static void dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree
miop_tree = proto_item_add_subtree (ti, ett_miop);
/* XXX - Should we bail out if we don't have the right magic number? */
- proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, FALSE);
+ proto_tree_add_item(miop_tree, hf_miop_magic, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
proto_tree_add_uint_format(miop_tree, hf_miop_hdr_version, tvb, offset, 1, hdr_version,
"Version: %u.%u", version_major, version_minor);
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 09d0e41fa2..25f4f2f73c 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -479,7 +479,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree)
break;
case MN_NAI_EXT:
proto_tree_add_item(ext_tree, hf_mip_next_nai, tvb, offset,
- ext_len, FALSE);
+ ext_len, ENC_ASCII|ENC_NA);
break;
case GEN_AUTH_EXT: /* RFC 3012 */
@@ -521,7 +521,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree)
proto_tree_add_item(ext_tree, hf_mip_mstrext_stype, tvb, offset, 1, ENC_BIG_ENDIAN);
/* text */
- proto_tree_add_item(ext_tree, hf_mip_mstrext_text, tvb, offset + 1, ext_len-1, FALSE);
+ proto_tree_add_item(ext_tree, hf_mip_mstrext_text, tvb, offset + 1, ext_len-1, ENC_ASCII|ENC_NA);
break;
case UDP_TUN_REQ_EXT: /* RFC 3519 */
/* sub-type */
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index 70f788f2b3..0ec06528ba 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -139,9 +139,9 @@ dissect_fullcollectionname(tvbuff_t *tvb, guint offset, proto_tree *tree)
fcn_tree = proto_item_add_subtree(ti, ett_mongo_fcn);
- proto_tree_add_item(fcn_tree, hf_mongo_database_name, tvb, offset, dbn_length, ENC_NA);
+ proto_tree_add_item(fcn_tree, hf_mongo_database_name, tvb, offset, dbn_length, ENC_ASCII|ENC_NA);
- proto_tree_add_item(fcn_tree, hf_mongo_collection_name, tvb, offset + 1 + dbn_length, fcn_length - dbn_length - 2, ENC_NA);
+ proto_tree_add_item(fcn_tree, hf_mongo_collection_name, tvb, offset + 1 + dbn_length, fcn_length - dbn_length - 2, ENC_ASCII|ENC_NA);
return fcn_length;
}
@@ -199,7 +199,7 @@ dissect_mongo_msg(tvbuff_t *tvb, guint offset, proto_tree *tree)
proto_item *ti;
- ti = proto_tree_add_item(tree, hf_mongo_message, tvb, offset, -1, ENC_NA);
+ ti = proto_tree_add_item(tree, hf_mongo_message, tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
return offset;
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 7ed3d368e2..86bb717284 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -394,7 +394,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree
col_set_str(pinfo->cinfo, COL_INFO, "Command: ");
/* Add hidden filter for "msmms.command" */
- ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, FALSE);
+ ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(ti);
/* Create MSMMS control protocol tree */
@@ -443,7 +443,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree
{
return 0;
}
- proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_protocol_type, tvb, offset, 4, TRUE);
+ proto_tree_add_item(msmms_common_command_tree, hf_msmms_command_protocol_type, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
/* Remaining length in multiples of 8 bytes */
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 6eedf9f94c..94f89727a2 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -567,17 +567,17 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
msrp_tree = proto_item_add_subtree(ti, ett_msrp);
if (is_msrp_response){
- th = proto_tree_add_item(msrp_tree,hf_msrp_response_line,tvb,0,linelen,ENC_BIG_ENDIAN);
+ th = proto_tree_add_item(msrp_tree,hf_msrp_response_line,tvb,0,linelen,ENC_ASCII|ENC_NA);
reqresp_tree = proto_item_add_subtree(th, ett_msrp_reqresp);
- proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_BIG_ENDIAN);
+ proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_ASCII|ENC_NA);
proto_tree_add_uint(reqresp_tree,hf_msrp_status_code,tvb,token_3_start,token_3_len,
atoi(tvb_get_ephemeral_string(tvb, token_3_start, token_3_len)));
}else{
- th = proto_tree_add_item(msrp_tree,hf_msrp_request_line,tvb,0,linelen,ENC_BIG_ENDIAN);
+ th = proto_tree_add_item(msrp_tree,hf_msrp_request_line,tvb,0,linelen,ENC_ASCII|ENC_NA);
reqresp_tree = proto_item_add_subtree(th, ett_msrp_reqresp);
- proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_BIG_ENDIAN);
- proto_tree_add_item(reqresp_tree,hf_msrp_method,tvb,token_3_start,token_3_len,ENC_BIG_ENDIAN);
+ proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_ASCII|ENC_NA);
+ proto_tree_add_item(reqresp_tree,hf_msrp_method,tvb,token_3_start,token_3_len,ENC_ASCII|ENC_NA);
}
/* Conversation setup info */
@@ -689,7 +689,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Create new tree & tvb for data */
next_tvb = tvb_new_subset_remaining(tvb, next_offset);
ti = proto_tree_add_item(msrp_tree, hf_msrp_data, tvb,
- next_offset, -1, ENC_BIG_ENDIAN);
+ next_offset, -1, ENC_ASCII|ENC_NA);
msrp_data_tree = proto_item_add_subtree(ti, ett_msrp_data);
/* give the content type parameters to sub dissectors */
@@ -721,12 +721,12 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* End line */
- ti = proto_tree_add_item(msrp_tree,hf_msrp_end_line,tvb,end_line_offset,end_line_len,ENC_BIG_ENDIAN);
+ ti = proto_tree_add_item(msrp_tree,hf_msrp_end_line,tvb,end_line_offset,end_line_len,ENC_ASCII|ENC_NA);
msrp_end_tree = proto_item_add_subtree(ti, ett_msrp_end_line);
- proto_tree_add_item(msrp_end_tree,hf_msrp_transactionID,tvb,end_line_offset + 7,token_2_len,ENC_BIG_ENDIAN);
+ proto_tree_add_item(msrp_end_tree,hf_msrp_transactionID,tvb,end_line_offset + 7,token_2_len,ENC_ASCII|ENC_NA);
/* continuation-flag */
- proto_tree_add_item(msrp_end_tree,hf_msrp_cnt_flg,tvb,end_line_offset+end_line_len-1,1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(msrp_end_tree,hf_msrp_cnt_flg,tvb,end_line_offset+end_line_len-1,1,ENC_ASCII|ENC_NA);
if (global_msrp_raw_text){
ti = proto_tree_add_text(tree, tvb, 0, -1,"Message Session Relay Protocol(as raw text)");
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 36740b7cbf..2283418ba3 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -601,7 +601,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
gboolean last_field = FALSE;
if (tree) {
- ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, ENC_BIG_ENDIAN);
+ ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, ENC_ASCII|ENC_NA);
subtree = proto_item_add_subtree(ti, ett_multipart_body);
}
/*
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index e4af8729f1..1c41552d88 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -786,7 +786,7 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset,
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, " version=%s", tvb_get_ephemeral_string(tvb, offset, strlen));
}
- proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, offset, strlen, ENC_ASCII|ENC_NA);
conn_data->major_version = 0;
for (ver_offset = 0; ver_offset < strlen; ver_offset++) {
guint8 ver_char = tvb_get_guint8(tvb, offset + ver_offset);
@@ -801,7 +801,7 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset,
/* salt string */
strlen = tvb_strsize(tvb,offset);
- proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
/* rest is optional */
@@ -819,13 +819,13 @@ mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset,
offset = mysql_dissect_server_status(tvb, offset, greeting_tree);
/* 13 bytes unused */
- proto_tree_add_item(greeting_tree, hf_mysql_unused, tvb, offset, 13, ENC_NA);
+ proto_tree_add_item(greeting_tree, hf_mysql_unused, tvb, offset, 13, ENC_ASCII|ENC_NA);
offset += 13;
/* 4.1+ server: rest of salt */
if (tvb_reported_length_remaining(tvb, offset)) {
strlen = tvb_strsize(tvb,offset);
- proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
}
@@ -874,7 +874,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset,
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, " user=%s", tvb_get_ephemeral_string(tvb, offset, strlen));
}
- proto_tree_add_item(login_tree, hf_mysql_user, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(login_tree, hf_mysql_user, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
/* rest is optional */
@@ -903,7 +903,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset,
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, " db=%s", tvb_get_ephemeral_string(tvb, offset, strlen));
}
- proto_tree_add_item(login_tree, hf_mysql_schema, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(login_tree, hf_mysql_schema, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
}
@@ -960,14 +960,14 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
case MYSQL_CREATE_DB:
case MYSQL_DROP_DB:
strlen = my_tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
conn_data->state = RESPONSE_OK;
break;
case MYSQL_QUERY:
strlen = my_tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, strlen, ENC_ASCII|ENC_NA);
if (mysql_showquery) {
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, " { %s } ", tvb_get_ephemeral_string(tvb, offset, strlen));
@@ -978,7 +978,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
case MYSQL_STMT_PREPARE:
strlen = my_tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_query, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
conn_data->state = RESPONSE_PREPARE;
break;
@@ -1001,7 +1001,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
case MYSQL_FIELD_LIST:
strlen = my_tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_table_name, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_table_name, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
conn_data->state = RESPONSE_SHOW_FIELDS;
break;
@@ -1014,7 +1014,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
case MYSQL_CHANGE_USER:
strlen = tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_user, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_user, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
strlen = tvb_strsize(tvb, offset);
@@ -1022,7 +1022,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
offset += strlen;
strlen = my_tvb_strsize(tvb, offset);
- proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_schema, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
conn_data->state= RESPONSE_OK;
@@ -1126,7 +1126,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset,
/* binlog file name ? */
strlen = tvb_reported_length_remaining(tvb, offset);
if (tree && strlen > 0) {
- proto_tree_add_item(req_tree, hf_mysql_binlog_file_name, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(req_tree, hf_mysql_binlog_file_name, tvb, offset, strlen, ENC_ASCII|ENC_NA);
}
offset += strlen;
@@ -1217,7 +1217,7 @@ mysql_dissect_response(tvbuff_t *tvb, packet_info *pinfo, int offset,
switch (conn_data->state) {
case RESPONSE_MESSAGE:
if ((strlen = tvb_reported_length_remaining(tvb, offset))) {
- proto_tree_add_item(tree, hf_mysql_message, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(tree, hf_mysql_message, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
}
conn_data->state = REQUEST;
@@ -1267,11 +1267,11 @@ mysql_dissect_error_packet(tvbuff_t *tvb, packet_info *pinfo,
if (tvb_get_guint8(tvb, offset) == '#')
{
offset += 1;
- proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_NA);
+ proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_ASCII|ENC_NA);
offset += 5;
}
- proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_NA);
+ proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += tvb_reported_length_remaining(tvb, offset);
return offset;
@@ -1312,7 +1312,7 @@ mysql_dissect_ok_packet(tvbuff_t *tvb, packet_info *pinfo, int offset,
/* optional: message string */
if (tvb_reported_length_remaining(tvb, offset) > 0) {
strlen = tvb_reported_length_remaining(tvb, offset);
- proto_tree_add_item(tree, hf_mysql_message, tvb, offset, strlen, ENC_NA);
+ proto_tree_add_item(tree, hf_mysql_message, tvb, offset, strlen, ENC_ASCII|ENC_NA);
offset += strlen;
}
diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c
index 0a260f8778..b0cb12b0e4 100644
--- a/epan/dissectors/packet-nasdaq-itch.c
+++ b/epan/dissectors/packet-nasdaq-itch.c
@@ -242,7 +242,7 @@ stock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offse
if (nasdaq_itch_tree || col_info) {
char *stock_p = tvb_get_ephemeral_string(tvb, offset, 6);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_stock, tvb, offset, 6, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_stock, tvb, offset, 6, ENC_ASCII|ENC_NA);
if (col_info) {
col_append_fstr(pinfo->cinfo, COL_INFO, "<%s> ", stock_p);
}
@@ -263,7 +263,7 @@ order(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offse
if (col_info) {
col_append_fstr(pinfo->cinfo, COL_INFO, "%c ", value);
}
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_buy_sell, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_buy_sell, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
offset = number_of_shares(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_shares, offset, big);
@@ -282,7 +282,7 @@ executed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int of
offset = number_of_shares(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_executed, offset, big);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA);
offset += 9;
return offset;
}
@@ -363,7 +363,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 1;
proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_financial_status, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lot_size, tvb, offset, 6, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lot_size, tvb, offset, 6, ENC_ASCII|ENC_NA);
offset += 6;
proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_round_lots_only, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -372,11 +372,11 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 'H': /* Stock trading action */
offset = stock(tvb, pinfo, nasdaq_itch_tree, offset);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_trading_state, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_trading_state, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reserved, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reserved, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reason, tvb, offset, 4, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_reason, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
break;
@@ -385,14 +385,14 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 'A': /* Add order, no MPID */
offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big);
if (version == 2) {
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
}
break;
case 'F': /* Add order, MPID */
offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_attribution, tvb, offset, 4, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_attribution, tvb, offset, 4, ENC_ASCII|ENC_NA);
offset += 4;
break;
@@ -404,7 +404,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 'C' : /* Order executed with price */
offset = executed(tvb, pinfo, nasdaq_itch_tree, offset, big);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_printable, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
offset = price(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_execution_price, offset, big);
@@ -426,7 +426,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
big = 1;
case 'P' : /* Trade identifier */
offset = order(tvb, pinfo, nasdaq_itch_tree, offset, big);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA);
offset += 9;
break;
@@ -437,27 +437,27 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset = price(tvb, pinfo, nasdaq_itch_tree, hf_nasdaq_itch_price, offset, big);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA);
offset += 9;
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
break;
case 'B' : /* Broken Trade */
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_match, tvb, offset, 9, ENC_ASCII|ENC_NA);
offset += 9;
break;
case 'I': /* NOII, FIXME */
offset = stock(tvb, pinfo, nasdaq_itch_tree, offset);
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_cross, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;
break;
default:
/* unknown */
- proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, FALSE);
+ proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += 5-1;
break;
}
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index 5d64996a5a..01310580ba 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -91,14 +91,14 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
switch (nasdaq_soup_type) {
case '+': /* debug msg */
- proto_tree_add_item(tree, hf_nasdaq_soup_text, tvb, offset, linelen -1, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_text, tvb, offset, linelen -1, ENC_ASCII|ENC_NA);
offset += linelen -1;
break;
case 'A': /* login accept */
- proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
- proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
break;
case 'J': /* login reject */
@@ -111,22 +111,22 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
if (linelen > 1 && nasdaq_itch_handle) {
new_tvb = tvb_new_subset(tvb, offset,linelen -1,linelen -1);
} else {
- proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII|ENC_NA);
}
offset += linelen -1;
break;
case 'L': /* login request */
- proto_tree_add_item(tree, hf_nasdaq_soup_username, tvb, offset, 6, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_username, tvb, offset, 6, ENC_ASCII|ENC_NA);
offset += 6;
- proto_tree_add_item(tree, hf_nasdaq_soup_password, tvb, offset, 10, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_password, tvb, offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
- proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_session, tvb, offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
- proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_seq_number, tvb, offset, 10, ENC_ASCII|ENC_NA);
offset += 10;
break;
@@ -137,12 +137,12 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
break;
default:
/* unknown */
- proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, ENC_ASCII|ENC_NA);
offset += linelen -1;
break;
}
- proto_tree_add_item(tree, hf_nasdaq_soup_packet_eol, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_nasdaq_soup_packet_eol, tvb, offset, 1, ENC_ASCII|ENC_NA);
if (new_tvb) {
call_dissector(nasdaq_itch_handle, new_tvb, pinfo, parent_tree);
}
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 5b94865f72..b869083c64 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -494,7 +494,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case NCP_LIP_ECHO: /* Lip Echo Packet */
- proto_tree_add_item(ncp_tree, hf_lip_echo, tvb, commhdr, 13, FALSE);
+ proto_tree_add_item(ncp_tree, hf_lip_echo, tvb, commhdr, 13, ENC_ASCII|ENC_NA);
break;
case NCP_BURST_MODE_XFER: /* Packet Burst Packet */
@@ -674,7 +674,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (length_remaining > 4) {
testvar = tvb_get_ntohl(tvb, commhdr+4);
if (testvar == 0x4c495020) {
- proto_tree_add_item(ncp_tree, hf_lip_echo, tvb, commhdr+4, 13, FALSE);
+ proto_tree_add_item(ncp_tree, hf_lip_echo, tvb, commhdr+4, 13, ENC_ASCII|ENC_NA);
break;
}
}
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 6091004497..32dfcaf534 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -3219,7 +3219,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 94: /* NBAR applicationDesc */
ti = proto_tree_add_item(pdutree, hf_cflow_nbar_appl_desc,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 95: /* NBAR applicationId */
@@ -3229,7 +3229,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 96: /* NBAR applicationName */
ti = proto_tree_add_item(pdutree, hf_cflow_nbar_appl_name,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 98: /* postIpDiffServCodePoint */
@@ -3383,7 +3383,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 147: /* wlanSSID */
ti = proto_tree_add_item(pdutree, hf_cflow_wlan_ssid,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 148: /* flowId */
@@ -3867,7 +3867,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 236: /* VRFname */
ti = proto_tree_add_item(pdutree, hf_cflow_vrfname,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 237: /* postMplsTopLabelExp */
@@ -3922,7 +3922,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 247: /* metroEvcId */
ti = proto_tree_add_item(pdutree, hf_cflow_metro_evc_id,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 248: /* metroEvcType */
@@ -4246,7 +4246,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 335: /* selectorName */
ti = proto_tree_add_item(pdutree, hf_cflow_selector_name,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 336: /* upperCILimit */
@@ -4271,12 +4271,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 340: /* informationElementDescription */
ti = proto_tree_add_item(pdutree, hf_cflow_information_element_description,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 341: /* informationElementName */
ti = proto_tree_add_item(pdutree, hf_cflow_information_element_name,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case 342: /* informationElementRangeBegin */
@@ -4430,7 +4430,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case 24629: /* natContextName */
ti = proto_tree_add_item(pdutree, hf_cflow_nat_context_name,
- tvb, offset, length, ENC_UTF_8);
+ tvb, offset, length, ENC_UTF_8|ENC_NA);
break;
case 24630: /* natAssignTime */
ts.secs = tvb_get_ntohl(tvb, offset);
@@ -4476,7 +4476,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case 40000: /* NF_F_USERNAME[_MAX] */
proto_tree_add_item(pdutree, hf_cflow_aaa_username,
- tvb, offset, length, ENC_NA);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
/* CACE Technologies */
@@ -4622,22 +4622,22 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case (NTOP_BASE + 101): /* SRC_IP_COUNTRY */
case ((VENDOR_NTOP << 16) | 101): /* SRC_IP_COUNTRY */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_country,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 102): /* SRC_IP_CITY */
case ((VENDOR_NTOP << 16) | 102): /* SRC_IP_CITY */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_src_ip_city,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 103): /* DST_IP_COUNTRY */
case ((VENDOR_NTOP << 16) | 103): /* DST_IP_COUNTRY */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_country,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 104): /* DST_IP_CITY */
case ((VENDOR_NTOP << 16) | 104): /* DST_IP_CITY */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_dst_ip_city,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 105): /* FLOW_PROTO_PORT */
case ((VENDOR_NTOP << 16) | 105): /* FLOW_PROTO_PORT */
@@ -4709,7 +4709,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case (NTOP_BASE + 120): /* DUMP_PATH */
case ((VENDOR_NTOP << 16) | 120): /* DUMP_PATH */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_dump_path,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 130): /* SIP_CALL_ID */
@@ -4844,7 +4844,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case (NTOP_BASE + 169): /* PROC_NAME */
case ((VENDOR_NTOP << 16) | 169): /* PROC_NAME */
ti = proto_tree_add_item(pdutree, hf_pie_ntop_proc_name,
- tvb, offset, length, FALSE);
+ tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case (NTOP_BASE + 180): /* HTTP_URL */
case ((VENDOR_NTOP << 16) | 180): /* HTTP_URL */
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 1a322ba065..ea3c1ef266 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -190,7 +190,7 @@ static gint dissect_netsync_cmd_error( tvbuff_t *tvb, gint offset, proto_tree *
offset += dissect_uleb128( tvb, offset, &len );
proto_tree_add_item(tree, hf_netsync_cmd_error_msg, tvb,
- offset, len, FALSE );
+ offset, len, ENC_ASCII|ENC_NA );
offset += len;
return offset;
@@ -209,7 +209,7 @@ static gint dissect_netsync_cmd_hello(tvbuff_t *tvb, gint offset, proto_tree *t
offset += dissect_uleb128( tvb, offset, &len );
proto_tree_add_item(tree, hf_netsync_cmd_hello_keyname, tvb,
- offset, len, FALSE );
+ offset, len, ENC_ASCII|ENC_NA );
offset += len;
@@ -238,7 +238,7 @@ static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb, gint offset, proto_tre
offset += dissect_uleb128( tvb, offset, &len );
proto_tree_add_item(tree, hf_netsync_cmd_anonymous_collection, tvb,
- offset, len, FALSE );
+ offset, len, ENC_ASCII|ENC_NA );
offset += len;
proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb,
@@ -261,7 +261,7 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb, gint offset, proto_tree *tr
offset += dissect_uleb128( tvb, offset, &len );
proto_tree_add_item(tree, hf_netsync_cmd_auth_collection, tvb,
- offset, len, FALSE );
+ offset, len, ENC_ASCII|ENC_NA );
offset += len;
proto_tree_add_item(tree, hf_netsync_cmd_auth_id, tvb,
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index eea05c276d..416df33ea3 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -249,7 +249,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(nsrp_tree, hf_nsrp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
@@ -299,7 +299,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(nsrp_tree, hf_nsrp_authchecksum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
@@ -344,7 +344,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 7cef993a09..782931f5b3 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -2155,7 +2155,7 @@ dissect_ntlmssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
TRY {
/* NTLMSSP constant */
proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_auth,
- tvb, offset, 8, FALSE);
+ tvb, offset, 8, ENC_ASCII|ENC_NA);
offset += 8;
/* NTLMSSP Message Type */
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index eac7e9953a..d8a67f5945 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -1144,7 +1144,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags)
}
break;
case NTPCTRL_OP_ASYNCMSG:
- proto_tree_add_item(data_tree, hf_ntpctrl_trapmsg, tvb, data_offset, datalen, TRUE);
+ proto_tree_add_item(data_tree, hf_ntpctrl_trapmsg, tvb, data_offset, datalen, ENC_ASCII|ENC_NA);
break;
/* these opcodes doesn't carry any data: NTPCTRL_OP_SETTRAP, NTPCTRL_OP_UNSETTRAP, NTPCTRL_OP_UNSPEC */
}
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index 50c0c1d4eb..d75f403549 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -153,7 +153,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(oicq_tree, hf_oicq_qqid, tvb, offset, 4, FALSE);
offset += 4;
- proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(oicq_tree, hf_oicq_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index e1d46452c8..5aec072119 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -523,7 +523,7 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_
NULL, "Not enough bytes for content of last nameservice entry");
return message_end;
}
- proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, FALSE);
+ proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, ENC_ASCII|ENC_NA);
offset += 4 + 16 + ((length - 1) | 3) + 1;
}
return message_end;
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index 0a5e667079..f853d207c9 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -1693,7 +1693,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(command_tree, hf_omron_protect_code, tvb, (offset+2), 1, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+3),4,ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_last_word, tvb, (offset+7),4,ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,FALSE);
+ proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,ENC_ASCII|ENC_NA);
offset = offset + 15;
}
}
@@ -1854,9 +1854,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 94)
{
proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, FALSE);
- proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, FALSE);
- proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII|ENC_NA);
/* add area data sub tree */
ti = proto_tree_add_text(command_tree, tvb, (offset+82), 12, "Area Data");
area_data_tree = proto_item_add_subtree(ti, ett_area_data);
@@ -1892,7 +1892,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+28), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+30), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+32), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+34), 32, FALSE);
+ proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+34), 32, ENC_ASCII|ENC_NA);
/* Remote IO Data tree */
ti = proto_tree_add_text(command_tree, tvb, (offset+66), 2, "Remote I/O data");
io_data_tree = proto_item_add_subtree(ti, ett_io_data);
@@ -1907,9 +1907,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
else if(reported_length_remaining == 161)
{
proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, FALSE);
- proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, FALSE);
- proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_controller_model, tvb, (offset+2), 20, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(command_tree, hf_omron_controller_version, tvb, (offset+22), 20, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(command_tree, hf_omron_for_system_use, tvb, (offset+42), 40, ENC_ASCII|ENC_NA);
/* add area data sub tree */
ti = proto_tree_add_text(command_tree, tvb, (offset+82), 12, "Area Data");
area_data_tree = proto_item_add_subtree(ti, ett_area_data);
@@ -1940,7 +1940,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_13, tvb, (offset+120), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_14, tvb, (offset+122), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_unit_15, tvb, (offset+124), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+126), 32, FALSE);
+ proto_tree_add_item(cpu_bus_tree, hf_omron_cpu_bus_reserved, tvb, (offset+126), 32, ENC_ASCII|ENC_NA);
/* Remote IO Data tree */
ti = proto_tree_add_text(command_tree, tvb, (offset+158), 2, "Remote I/O data");
io_data_tree = proto_item_add_subtree(ti, ett_io_data);
@@ -1983,7 +1983,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
while(reported_length_remaining >= 21)
{
proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_model_number, tvb, offset+1, 20, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_model_number, tvb, offset+1, 20, ENC_ASCII|ENC_NA);
offset = offset + 21;
reported_length_remaining = reported_length_remaining - 21;
}
@@ -2014,7 +2014,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ett_message_fields, message_fields, FALSE);
/* Add rest of fields */
proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+10), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+12), 16, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+12), 16, ENC_ASCII|ENC_NA);
offset = offset + 28;
}
}
@@ -2452,7 +2452,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_fals, tvb, (offset+2), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+4), 16, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_error_message, tvb, (offset+4), 16, ENC_ASCII|ENC_NA);
offset = offset + 20;
}
else if(reported_length_remaining >= 4)
@@ -2467,7 +2467,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
while (reported_length_remaining >= 32)
{
- proto_tree_add_item(command_tree, hf_omron_read_message, tvb, offset, 32, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_read_message, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset = offset + 32;
reported_length_remaining = reported_length_remaining - 32;
}
@@ -2657,7 +2657,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(command_tree, tvb, (offset+2), 26, "Disk data");
omron_disk_data_tree = proto_item_add_subtree(ti, ett_omron_disk_data);
- proto_tree_add_item(omron_disk_data_tree, hf_omron_volume_label, tvb, (offset+2), 12, FALSE);
+ proto_tree_add_item(omron_disk_data_tree, hf_omron_volume_label, tvb, (offset+2), 12, ENC_ASCII|ENC_NA);
omron_byte = tvb_get_guint8(tvb, (offset+14));
proto_tree_add_uint_format(omron_disk_data_tree, hf_omron_date_year, tvb, (offset+14), 1, omron_byte,
@@ -2685,7 +2685,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(command_tree, tvb, offset, 20, "File data");
omron_file_data_tree = proto_item_add_subtree(ti, ett_omron_file_data);
- proto_tree_add_item(omron_file_data_tree, hf_omron_filename, tvb, offset, 12, FALSE);
+ proto_tree_add_item(omron_file_data_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII|ENC_NA);
omron_byte = tvb_get_guint8(tvb, (offset+12));
proto_tree_add_uint_format(omron_file_data_tree, hf_omron_date_year, tvb, (offset+12), 1, omron_byte,
@@ -2717,7 +2717,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 20)
{
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA);
proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+14), 4, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+18), 2, ENC_BIG_ENDIAN);
offset = offset + 20;
@@ -2751,7 +2751,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_file_parameter_code, tvb, (offset+2), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+4), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+4), 12, ENC_ASCII|ENC_NA);
proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+16), 4, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+20), 2, ENC_BIG_ENDIAN);
if(reported_length_remaining > 22)
@@ -2807,7 +2807,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
while(reported_length_remaining >= 12)
{
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, offset, 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, offset, 12, ENC_ASCII|ENC_NA);
offset = offset + 12;
reported_length_remaining = reported_length_remaining - 12;
}
@@ -2837,7 +2837,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 16)
{
- proto_tree_add_item(command_tree, hf_omron_volume_label, tvb, (offset+4), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_volume_label, tvb, (offset+4), 12, ENC_ASCII|ENC_NA);
offset = offset + 12;
}
offset = offset + 4;
@@ -2862,9 +2862,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 28)
{
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA);
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+14), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+16), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+16), 12, ENC_ASCII|ENC_NA);
offset = offset + 28;
}
}
@@ -2887,8 +2887,8 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 26)
{
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII|ENC_NA);
offset = offset + 26;
}
}
@@ -2911,7 +2911,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(reported_length_remaining == 14)
{
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+2), 12, ENC_ASCII|ENC_NA);
offset = offset + 14;
}
}
@@ -2938,7 +2938,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+6), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII|ENC_NA);
offset = offset + 22;
}
}
@@ -2966,7 +2966,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+4), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+6), 2, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+8), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+10), 12, ENC_ASCII|ENC_NA);
offset = offset + 22;
}
}
@@ -2994,7 +2994,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+4), 4, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_number_of_bytes, tvb, (offset+8), 4, ENC_BIG_ENDIAN);
proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, (offset+12), 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_filename, tvb, (offset+14), 12, ENC_ASCII|ENC_NA);
offset = offset + 26;
}
}
@@ -3183,7 +3183,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
if((reported_length_remaining > 0) && (reported_length_remaining <= 8))
{
- proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
offset = offset + reported_length_remaining;
}
}
@@ -3223,7 +3223,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if((reported_length_remaining > 2) && (reported_length_remaining <= (2+8)))
{
proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
offset = offset + reported_length_remaining;
}
}
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 441e6aab5a..ff493ca0fa 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -125,7 +125,7 @@ static void dissect_packetlogger (tvbuff_t *tvb, packet_info *pinfo, proto_tree
case PKT_POWER:
case PKT_NOTE:
case PKT_NEW_CONTROLLER:
- proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_ASCII|ENC_NA);
col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (next_tvb, 0, len));
break;
default:
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index b6d0a4261f..e8e8349c88 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -1596,7 +1596,7 @@ static void show_pdcp_config(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree
proto_tree *configuration_tree;
proto_item *configuration_ti = proto_tree_add_item(tree,
hf_pdcp_lte_configuration,
- tvb, 0, 0, FALSE);
+ tvb, 0, 0, ENC_ASCII|ENC_NA);
configuration_tree = proto_item_add_subtree(configuration_ti, ett_pdcp_configuration);
/* Direction */
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 852fe351e5..81daaeef23 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -194,11 +194,11 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(pflog_tree, hf_pflog_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- proto_tree_add_item(pflog_tree, hf_pflog_ifname, tvb, offset, 16, ENC_BIG_ENDIAN);
+ proto_tree_add_item(pflog_tree, hf_pflog_ifname, tvb, offset, 16, ENC_ASCII|ENC_NA);
ifname = tvb_get_ephemeral_string(tvb, offset, 16);
offset += 16;
- proto_tree_add_item(pflog_tree, hf_pflog_ruleset, tvb, offset, 16, ENC_BIG_ENDIAN);
+ proto_tree_add_item(pflog_tree, hf_pflog_ruleset, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
proto_tree_add_item(pflog_tree, hf_pflog_rulenr, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -426,7 +426,7 @@ dissect_old_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset +=4;
if (tree) {
- proto_tree_add_item(pflog_tree, hf_old_pflog_ifname, tvb, offset, 16, ENC_BIG_ENDIAN);
+ proto_tree_add_item(pflog_tree, hf_old_pflog_ifname, tvb, offset, 16, ENC_ASCII|ENC_NA);
}
ifname = tvb_get_ephemeral_string(tvb, offset, 16);
offset +=16;
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 102e6c23cf..f5450bdd24 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -267,7 +267,7 @@ dissect_pgsql_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (type == '\0')
n = 0;
proto_tree_add_text(ptree, tvb, 0, n, "Type: %s", typestr);
- hidden_item = proto_tree_add_item(ptree, hf_type, tvb, 0, n, ENC_NA);
+ hidden_item = proto_tree_add_item(ptree, hf_type, tvb, 0, n, ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_item(ptree, hf_length, tvb, n, 4, ENC_BIG_ENDIAN);
hidden_item = proto_tree_add_boolean(ptree, hf_frontend, tvb, 0, 0, fe);
@@ -295,23 +295,23 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb,
/* Password */
case 'p':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_passwd, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_passwd, tvb, n, siz, ENC_ASCII|ENC_NA);
break;
/* Simple query */
case 'Q':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII|ENC_NA);
break;
/* Parse */
case 'P':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_query, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
i = tvb_get_ntohs(tvb, n);
@@ -327,11 +327,11 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb,
/* Bind */
case 'B':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_statement, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
i = tvb_get_ntohs(tvb, n);
@@ -370,7 +370,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb,
/* Execute */
case 'E':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_portal, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
ti = proto_tree_add_text(tree, tvb, n, 4, "Returns: ");
@@ -418,9 +418,9 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb,
if ((signed)length <= 0) {
break;
}
- proto_tree_add_item(tree, hf_parameter_name, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_parameter_name, tvb, n, siz, ENC_ASCII|ENC_NA);
i = tvb_strsize(tvb, n+siz);
- proto_tree_add_item(tree, hf_parameter_value, tvb, n + siz, i, ENC_NA);
+ proto_tree_add_item(tree, hf_parameter_value, tvb, n + siz, i, ENC_ASCII|ENC_NA);
length -= i;
n += siz+i;
@@ -451,7 +451,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb,
/* Copy failure */
case 'f':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_error, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_error, tvb, n, siz, ENC_ASCII|ENC_NA);
break;
/* Function call */
@@ -548,7 +548,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb,
while (i-- > 0) {
proto_tree *twig;
siz = tvb_strsize(tvb, n);
- ti = proto_tree_add_item(shrub, hf_val_name, tvb, n, siz, ENC_NA);
+ ti = proto_tree_add_item(shrub, hf_val_name, tvb, n, siz, ENC_ASCII|ENC_NA);
twig = proto_item_add_subtree(ti, ett_values);
n += siz;
proto_tree_add_item(twig, hf_tableoid, tvb, n, 4, ENC_BIG_ENDIAN);
@@ -586,7 +586,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb,
/* Command completion */
case 'C':
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_tag, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_tag, tvb, n, siz, ENC_ASCII|ENC_NA);
break;
/* Ready */
@@ -627,11 +627,11 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb,
proto_tree_add_item(tree, hf_pid, tvb, n, 4, ENC_BIG_ENDIAN);
n += 4;
siz = tvb_strsize(tvb, n);
- proto_tree_add_item(tree, hf_condition, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_condition, tvb, n, siz, ENC_ASCII|ENC_NA);
n += siz;
siz = tvb_strsize(tvb, n);
if (siz > 1)
- proto_tree_add_item(tree, hf_text, tvb, n, siz, ENC_NA);
+ proto_tree_add_item(tree, hf_text, tvb, n, siz, ENC_ASCII|ENC_NA);
break;
/* Copy in/out */
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 2d0ec43d44..7367fd78cb 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -216,7 +216,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree,
offset+=1;
/* usmUserName */
- proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, FALSE);
+ proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, ENC_ASCII|ENC_NA);
offset+=len;
break;
@@ -324,7 +324,7 @@ dissect_pktc_wakeup(proto_tree *tree, tvbuff_t *tvb, int offset)
/* Server Kerberos Principal Identifier */
string_len=tvb_strsize(tvb, offset);
- proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, FALSE);
+ proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA);
offset+=string_len;
return offset;
@@ -427,7 +427,7 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
/* Server Kerberos Principal Identifier */
string_len=tvb_strsize(tvb, offset);
- proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, FALSE);
+ proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA);
offset+=string_len;
/* Timestamp: YYMMDDhhmmssZ */
@@ -525,7 +525,7 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr
string_len = tvb_length_remaining(tvb, offset) - 4;
if (string_len <= 0)
THROW(ReportedBoundsError);
- proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, FALSE);
+ proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, ENC_ASCII|ENC_NA);
offset+=string_len;
/* MTA IP address */
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index 09f9ed2daa..025a3c477e 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -959,7 +959,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length
/* Friendly Name Length */
proto_tree_add_text(pnrp_encodedCPA_tree, tvb, offset,2, "Length of Friendly name : %d",tvb_get_letohs(tvb,offset));
/* Friendly Name */
- proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_friendlyName, tvb, offset+2, tvb_get_letohs(tvb,offset), FALSE);
+ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_friendlyName, tvb, offset+2, tvb_get_letohs(tvb,offset), ENC_ASCII|ENC_NA);
offset +=tvb_get_letohs(tvb,offset)+2;
}
/* Service Address List */
@@ -1047,10 +1047,10 @@ static void dissect_publicKey_structure(tvbuff_t *tvb, gint offset, gint length,
proto_tree_add_text(pnrp_publicKey_tree, tvb, offset,1, "Unused Bits : %d",7);
offset +=1;
/* Algorithm ObjID */
- proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_objID, tvb, offset, objIDLength, FALSE);
+ proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_objID, tvb, offset, objIDLength, ENC_ASCII|ENC_NA);
offset += objIDLength;
/* Public Key Data */
- proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_publicKeyData, tvb, offset, cbDataLength, FALSE);
+ proto_tree_add_item(pnrp_publicKey_tree, hf_pnrp_publicKey_publicKeyData, tvb, offset, cbDataLength, ENC_ASCII|ENC_NA);
}
}
static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree)
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index 194a83389b..9b0899d050 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -295,7 +295,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (length_remaining < 32)
break;
if (tree) {
- proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_serialnum, tvb, offset, 32, ENC_NA);
+ proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_serialnum, tvb, offset, 32, ENC_ASCII|ENC_NA);
}
offset+=32;
length_remaining-=32;
@@ -305,7 +305,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (length_remaining < 32)
break;
if (tree) {
- /* proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, ENC_NA); */
+ /* proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, ENC_ASCII|ENC_NA); */
curr_str = tvb_format_stringzpad(tvb, offset, 32);
proto_tree_add_string(ppi_antenna_tree, hf_ppi_antenna_modelname, tvb, offset, 32, curr_str);
proto_item_append_text(antenna_line, " (%s)", curr_str);
@@ -317,7 +317,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (length_remaining < 32)
break;
if (tree) {
- /*proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, ENC_NA);*/
+ /*proto_tree_add_item(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA);*/
curr_str = tvb_format_stringzpad(tvb, offset, 32);
proto_tree_add_string(ppi_antenna_tree, hf_ppi_antenna_descstr, tvb, offset, 32, curr_str);
proto_item_append_text(antenna_line, " (%s)", curr_str);
diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c
index bb241ef11c..7b29c4c25e 100644
--- a/epan/dissectors/packet-ppi-gps.c
+++ b/epan/dissectors/packet-ppi-gps.c
@@ -372,7 +372,7 @@ dissect_ppi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
break;
if (tree)
{
- /* proto_tree_add_item(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, ENC_NA); */
+ /* proto_tree_add_item(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA); */
curr_str = tvb_format_stringzpad(tvb, offset, 32); /* need to append_text this */
proto_tree_add_string(ppi_gps_tree, hf_ppi_gps_descstr, tvb, offset, 32, curr_str);
proto_item_append_text(gps_line, " (%s)", curr_str);
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index ebfcf8f262..2ee91a8cee 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -623,7 +623,7 @@ dissect_ppi_vector_v1(tvbuff_t *tvb, int offset, gint length_remaining, proto_tr
case PPI_VECTOR_DESCSTR:
if (length_remaining < 32)
break;
- proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_NA);
+ proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA);
offset+=32;
length_remaining-=32;
break;
@@ -911,7 +911,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, int offset, gint length_remaining, proto_tr
break;
if (ppi_vector_tree)
{
- /* proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_NA); */
+ /* proto_tree_add_item(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, ENC_ASCII|ENC_NA); */
curr_str = tvb_format_stringzpad(tvb, offset, 32); /* need to append_text this */
proto_tree_add_string(ppi_vector_tree, hf_ppi_vector_descstr, tvb, offset, 32, curr_str);
proto_item_append_text(vector_line, " (%s)", curr_str);
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 22a10a4d36..6fb66d696d 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -4494,7 +4494,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
peer_id_length = tvb_get_guint8(tvb, offset);
offset +=1;
- proto_tree_add_item(data_tree, hf_pap_peer_id, tvb, offset, peer_id_length, FALSE);
+ proto_tree_add_item(data_tree, hf_pap_peer_id, tvb, offset, peer_id_length, ENC_ASCII|ENC_NA);
peer_id = tvb_format_text(tvb, offset, peer_id_length);
offset += peer_id_length;
@@ -4502,7 +4502,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
password_length = tvb_get_guint8(tvb, offset);
offset +=1;
- proto_tree_add_item(data_tree, hf_pap_password, tvb, offset, password_length, FALSE);
+ proto_tree_add_item(data_tree, hf_pap_password, tvb, offset, password_length, ENC_ASCII|ENC_NA);
password = tvb_format_text(tvb, offset, password_length);
offset += password_length;
@@ -4621,7 +4621,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
/* Find name in remaining bytes */
if (length > 0) {
tvb_ensure_bytes_exist(tvb, offset, length);
- proto_tree_add_item(field_tree, hf_chap_name, tvb, offset, length, FALSE);
+ proto_tree_add_item(field_tree, hf_chap_name, tvb, offset, length, ENC_ASCII|ENC_NA);
name_offset = offset;
name_size = length;
}
@@ -4644,7 +4644,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
case CHAP_FAIL:
if(tree) {
if (length > 0) {
- proto_tree_add_item(fh_tree, hf_chap_message, tvb, offset, length, FALSE);
+ proto_tree_add_item(fh_tree, hf_chap_message, tvb, offset, length, ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index cbeb8e1844..d6a5936070 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -466,12 +466,12 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr
if (poe_tag_length > 0)
{
proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name, tvb,
- tagstart+4, poe_tag_length, FALSE);
+ tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA);
}
break;
case PPPOE_TAG_AC_NAME:
proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_name, tvb,
- tagstart+4, poe_tag_length, FALSE);
+ tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA);
/* Show AC-Name in info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
@@ -646,15 +646,15 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr
strings. */
case PPPOE_TAG_SVC_ERR:
proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name_error, tvb,
- tagstart+4, poe_tag_length, FALSE);
+ tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA);
break;
case PPPOE_TAG_AC_ERR:
proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_system_error, tvb,
- tagstart+4, poe_tag_length, FALSE);
+ tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA);
break;
case PPPOE_TAG_GENERIC_ERR:
proto_tree_add_item(pppoe_tree, hf_pppoed_tag_generic_error, tvb,
- tagstart+4, poe_tag_length, FALSE);
+ tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA);
break;
/* Get out if see end-of-list tag */
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index 97bb09af4c..e5e9c90a2a 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -243,10 +243,10 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
- proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA);
}
static void
@@ -277,10 +277,10 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
- proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA);
}
@@ -370,10 +370,10 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);
offset += 2;
- proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
- proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA);
}
static void
@@ -431,13 +431,13 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_pptp_dialing_number_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
- proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, ENC_ASCII|ENC_NA);
offset += 64;
- proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA);
}
static void
@@ -516,7 +516,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);
offset += 2;
- proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, FALSE);
+ proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, ENC_ASCII|ENC_NA);
}
static void
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index b0db3a2e51..591ff6d77b 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -1613,7 +1613,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
hf_ptp_versionnetwork, tvb, PTP_VERSIONNETWORK_OFFSET, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ptp_tree,
- hf_ptp_subdomain, tvb, PTP_SUBDOMAIN_OFFSET, 16, FALSE);
+ hf_ptp_subdomain, tvb, PTP_SUBDOMAIN_OFFSET, 16, ENC_ASCII|ENC_NA);
proto_tree_add_item(ptp_tree,
hf_ptp_messagetype, tvb, PTP_MESSAGETYPE_OFFSET, 1, ENC_BIG_ENDIAN);
@@ -1708,7 +1708,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
PTP_SDR_GRANDMASTERCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ptp_tree, hf_ptp_sdr_grandmasterclockidentifier, tvb,
- PTP_SDR_GRANDMASTERCLOCKIDENTIFIER_OFFSET, 4, FALSE);
+ PTP_SDR_GRANDMASTERCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(ptp_tree,
hf_ptp_sdr_grandmasterclockvariance, tvb,
@@ -1733,7 +1733,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
hf_ptp_sdr_localclockstratum, tvb, PTP_SDR_LOCALCLOCKSTRATUM_OFFSET, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ptp_tree,
- hf_ptp_sdr_localclockidentifier, tvb, PTP_SDR_LOCALCLOCKIDENTIFIER_OFFSET, 4, FALSE);
+ hf_ptp_sdr_localclockidentifier, tvb, PTP_SDR_LOCALCLOCKIDENTIFIER_OFFSET, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(ptp_tree, hf_ptp_sdr_parentcommunicationtechnology, tvb,
PTP_SDR_PARENTCOMMUNICATIONTECHNOLOGY_OFFSET, 1, ENC_BIG_ENDIAN);
@@ -1855,7 +1855,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
case PTP_MM_SET_SUBDOMAIN:{
proto_tree_add_item(ptp_tree, hf_ptp_mm_set_subdomain_subdomainname, tvb,
- PTP_MM_SET_SUBDOMAIN_SUBDOMAINNAME_OFFSET, 16, FALSE);
+ PTP_MM_SET_SUBDOMAIN_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA);
break;
}
case PTP_MM_DEFAULT_DATA_SET:{
@@ -1897,7 +1897,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
PTP_MM_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_subdomainname, tvb,
- PTP_MM_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, FALSE);
+ PTP_MM_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA);
proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_numberports, tvb,
PTP_MM_DEFAULT_DATA_SET_NUMBERPORTS_OFFSET, 2, ENC_BIG_ENDIAN);
@@ -1923,7 +1923,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
PTP_MM_UPDATE_DEFAULT_DATA_SET_SYNCINTERVAL_OFFSET, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_subdomainname, tvb,
- PTP_MM_UPDATE_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, FALSE);
+ PTP_MM_UPDATE_DEFAULT_DATA_SET_SUBDOMAINNAME_OFFSET, 16, ENC_ASCII|ENC_NA);
break;
}
case PTP_MM_CURRENT_DATA_SET:{
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index 776bee4f27..dc92435261 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -162,7 +162,7 @@ dissect_quake_CCREQ_CONNECT
if (tree) {
ti = proto_tree_add_item(tree, hf_quake_CCREQ_CONNECT_game,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
proto_tree_add_item(tree, hf_quake_CCREQ_CONNECT_version,
@@ -182,7 +182,7 @@ dissect_quake_CCREQ_SERVER_INFO
if (tree) {
ti = proto_tree_add_item(tree, hf_quake_CCREQ_SERVER_INFO_game,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
proto_tree_add_item(tree, hf_quake_CCREQ_SERVER_INFO_version,
tvb, offset, 1, ENC_LITTLE_ENDIAN);
@@ -207,7 +207,7 @@ dissect_quake_CCREQ_RULE_INFO
{
if (tree) {
proto_tree_add_item(tree, hf_quake_CCREQ_RULE_INFO_lastrule,
- tvb, 0, -1, TRUE);
+ tvb, 0, -1, ENC_ASCII|ENC_NA);
}
}
@@ -236,7 +236,7 @@ dissect_quake_CCREP_REJECT
{
if (tree) {
proto_tree_add_item(tree, hf_quake_CCREP_REJECT_reason,
- tvb, 0, -1, TRUE);
+ tvb, 0, -1, ENC_ASCII|ENC_NA);
}
}
@@ -253,16 +253,16 @@ dissect_quake_CCREP_SERVER_INFO
if (tree) {
ti = proto_tree_add_item(tree,
hf_quake_CCREP_SERVER_INFO_address, tvb, offset, -1,
- TRUE);
+ ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
ti = proto_tree_add_item(tree,
hf_quake_CCREP_SERVER_INFO_server, tvb, offset, -1,
- TRUE);
+ ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
ti = proto_tree_add_item(tree, hf_quake_CCREP_SERVER_INFO_map,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
proto_tree_add_item(tree, hf_quake_CCREP_SERVER_INFO_num_player,
@@ -297,7 +297,7 @@ dissect_quake_CCREP_PLAYER_INFO
offset += 1;
ti = proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_name,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
colors = tvb_get_letohl(tvb, offset + 0);
@@ -324,7 +324,7 @@ dissect_quake_CCREP_PLAYER_INFO
offset += 4;
proto_tree_add_item(tree, hf_quake_CCREP_PLAYER_INFO_address,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
@@ -342,11 +342,11 @@ dissect_quake_CCREP_RULE_INFO
if (tree) {
ti = proto_tree_add_item(tree, hf_quake_CCREP_RULE_INFO_rule,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
offset += proto_item_get_len(ti);
proto_tree_add_item(tree, hf_quake_CCREP_RULE_INFO_value,
- tvb, offset, -1, TRUE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c
index 098df6fc9d..7574ee0ca6 100644
--- a/epan/dissectors/packet-radius_packetcable.c
+++ b/epan/dissectors/packet-radius_packetcable.c
@@ -416,25 +416,25 @@ static const gchar* dissect_packetcable_term_dsply_info(proto_tree* tree, tvbuff
if (bitmask & PACKETCABLE_GENERAL_DISPLAY) {
proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_general_display,
- tvb, intval, 80, FALSE);
+ tvb, intval, 80, ENC_ASCII|ENC_NA);
intval += 80;
}
if (bitmask & PACKETCABLE_CALLING_NUMBER) {
proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_calling_number,
- tvb, intval, 40, FALSE);
+ tvb, intval, 40, ENC_ASCII|ENC_NA);
intval += 40;
}
if (bitmask & PACKETCABLE_CALLING_NAME) {
proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_calling_name,
- tvb, intval, 40, FALSE);
+ tvb, intval, 40, ENC_ASCII|ENC_NA);
intval += 40;
}
if (bitmask & PACKETCABLE_MESSAGE_WAITING) {
proto_tree_add_item(obj_tree, hf_packetcable_terminal_display_info_message_waiting,
- tvb, intval, 40, FALSE);
+ tvb, intval, 40, ENC_ASCII|ENC_NA);
}
return "";
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 20cad26a58..72fd7ded12 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -110,7 +110,7 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset,
break;
case(RB_AVP_LABEL):
proto_tree_add_item(st, hf_redbackli_label, tvb,
- offset+2, avplen, FALSE);
+ offset+2, avplen, ENC_ASCII|ENC_NA);
break;
case(RB_AVP_EOH):
proto_tree_add_item(st, hf_redbackli_eohpad, tvb,
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 7565e61d7d..238efa2d5d 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -3063,7 +3063,7 @@ static int dissect_diagnosticinfo(tvbuff_t *tvb, proto_tree *tree, guint16 offse
break;
case DIAGNOSTICKINDID_SOFTWARE_VERSION:
- proto_tree_add_item(local_tree, hf_reload_diagnosticinfo_software_version, tvb, offset+local_offset, length, FALSE);
+ proto_tree_add_item(local_tree, hf_reload_diagnosticinfo_software_version, tvb, offset+local_offset, length, ENC_ASCII|ENC_NA);
break;
case DIAGNOSTICKINDID_MACHINE_UPTIME:
@@ -3785,7 +3785,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr
case ERRORCODE_UNDERLAY_DESTINATION_UNREACHABLE:
{
- proto_tree_add_item(error_tree, hf_reload_opaque_string, tvb, offset+2, 32, FALSE);
+ proto_tree_add_item(error_tree, hf_reload_opaque_string, tvb, offset+2, 32, ENC_ASCII|ENC_NA);
}
break;
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index ed3d64f949..50fdcd9c4c 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -260,7 +260,7 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree)
case AUTH_PASSWORD: /* Plain text password */
proto_tree_add_item(rip_authentication_tree, hf_rip_auth_passwd,
- tvb, offset+4, 16, FALSE);
+ tvb, offset+4, 16, ENC_ASCII|ENC_NA);
break;
case AUTH_KEYED_MSG_DIGEST: /* Keyed MD5 rfc 2082 */
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 23499d5cac..0c500934d5 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -496,7 +496,7 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info,
/* Create root of source info */
source_ti = proto_tree_add_item(tree,
hf_rlc_lte_reassembly_source,
- tvb, 0, 0, FALSE);
+ tvb, 0, 0, ENC_ASCII|ENC_NA);
source_tree = proto_item_add_subtree(source_ti, ett_rlc_lte_reassembly_source);
PROTO_ITEM_SET_GENERATED(source_ti);
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index 8b0c7acbee..928c91fcc1 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -220,7 +220,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
/* Check for text data in front */
if (urgent_offset > offset)
{
- proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, FALSE);
+ proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, ENC_ASCII|ENC_NA);
}
/* Show control byte */
@@ -278,13 +278,13 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
/* Client user name. */
str_len = tvb_strsize(tvb, offset);
proto_tree_add_item(user_info_tree, hf_user_info_client_user_name,
- tvb, offset, str_len, FALSE);
+ tvb, offset, str_len, ENC_ASCII|ENC_NA);
offset += str_len;
/* Server user name. */
str_len = tvb_strsize(tvb, offset);
proto_tree_add_item(user_info_tree, hf_user_info_server_user_name,
- tvb, offset, str_len, FALSE);
+ tvb, offset, str_len, ENC_ASCII|ENC_NA);
offset += str_len;
/* Terminal type/speed. */
@@ -293,7 +293,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
{
/* Terminal type */
proto_tree_add_item(user_info_tree, hf_user_info_terminal_type,
- tvb, offset, slash_offset-offset, FALSE);
+ tvb, offset, slash_offset-offset, ENC_ASCII|ENC_NA);
offset = slash_offset + 1;
/* Terminal speed */
@@ -327,7 +327,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
{
/* There's data before the terminal info. */
proto_tree_add_item(rlogin_tree, hf_data, tvb,
- offset, ti_offset - offset, FALSE);
+ offset, ti_offset - offset, ENC_ASCII|ENC_NA);
}
/* Create window info tree */
@@ -340,7 +340,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
offset += 2;
/* These bytes should be "ss" */
- proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, FALSE);
+ proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, ENC_ASCII|ENC_NA);
offset += 2;
/* Character rows */
@@ -376,7 +376,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info,
if (tvb_offset_exists(tvb, offset))
{
/* There's more data in the frame. */
- proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 788516ddbd..760608b429 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -133,13 +133,13 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(rmp_tree,
hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(rmp_tree,
- hf_rmp_machtype, tvb, 10, 20, FALSE);
+ hf_rmp_machtype, tvb, 10, 20, ENC_ASCII|ENC_NA);
/* The remaining fields are optional */
if(!tvb_offset_exists(tvb, 30))
return;
len = tvb_get_guint8(tvb, 30);
proto_tree_add_item(rmp_tree,
- hf_rmp_filename, tvb, 30, 1, ENC_BIG_ENDIAN);
+ hf_rmp_filename, tvb, 30, 1, ENC_ASCII|ENC_BIG_ENDIAN);
if(tvb_offset_exists(tvb, len+31))
call_dissector(data_handle,
tvb_new_subset_remaining(tvb, len+31),
@@ -157,7 +157,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN);
len = tvb_get_guint8(tvb, 10);
proto_tree_add_item(rmp_tree,
- hf_rmp_filename, tvb, 10, 1, ENC_BIG_ENDIAN);
+ hf_rmp_filename, tvb, 10, 1, ENC_ASCII|ENC_BIG_ENDIAN);
if(tvb_offset_exists(tvb, len+11))
call_dissector(data_handle,
tvb_new_subset_remaining(tvb, len+11),
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 38575ef571..129e3501ba 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -391,7 +391,7 @@ dissect_rpcap_error (tvbuff_t *tvb, packet_info *pinfo,
tvb_format_text_wsp (tvb, offset, len));
}
- ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, ENC_BIG_ENDIAN);
+ ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, ENC_ASCII|ENC_NA);
expert_add_info_format (pinfo, ti, PI_SEQUENCE, PI_NOTE,
"Error: %s", tvb_format_text_wsp (tvb, offset, len));
}
@@ -497,12 +497,12 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_,
if (namelen) {
proto_item_append_text (ti, ": %s", tvb_get_ephemeral_string (tvb, offset, namelen));
- proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
}
if (desclen) {
- proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, ENC_ASCII|ENC_NA);
offset += desclen;
}
@@ -664,11 +664,11 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_,
guint8 *username, *password;
username = tvb_get_ephemeral_string (tvb, offset, slen1);
- proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, ENC_ASCII|ENC_NA);
offset += slen1;
password = tvb_get_ephemeral_string (tvb, offset, slen2);
- proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, ENC_ASCII|ENC_NA);
offset += slen2;
proto_item_append_text (ti, " (%s/%s)", username, password);
@@ -683,7 +683,7 @@ dissect_rpcap_open_request (tvbuff_t *tvb, packet_info *pinfo _U_,
gint len;
len = tvb_length_remaining (tvb, offset);
- proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, ENC_BIG_ENDIAN);
+ proto_tree_add_item (parent_tree, hf_open_request, tvb, offset, len, ENC_ASCII|ENC_NA);
}
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index 2cbe9e6bc6..4cf0701f17 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -335,7 +335,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff)
if (paramlen - 1 > 0) {
proto_tree_add_item(v_tree,
hf_rsip_parameter_address_fqdn, tvb,
- off + 4, paramlen - 1, FALSE);
+ off + 4, paramlen - 1, ENC_ASCII|ENC_NA);
proto_item_append_text(pti, ": %s",
tvb_format_text(tvb, off + 4, paramlen - 1));
} else
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 25e8de1917..b8e8a2aedc 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -130,9 +130,9 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
switch (rsync_frame_data_p->state) {
case RSYNC_INIT:
- proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, ENC_ASCII|ENC_NA);
offset += 8;
- proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, ENC_ASCII|ENC_NA);
tvb_get_nstringz0(tvb, offset, sizeof(version), version);
offset += 4;
@@ -148,9 +148,9 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case RSYNC_SERV_INIT:
- proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, ENC_ASCII|ENC_NA);
offset += 8;
- proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, ENC_ASCII|ENC_NA);
tvb_get_nstringz0(tvb, offset, sizeof(version), version);
offset += 4;
@@ -166,7 +166,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case RSYNC_CLIENT_QUERY:
- proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Client Query");
@@ -174,7 +174,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case RSYNC_SERV_MOTD:
- proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Server MOTD");
@@ -187,14 +187,14 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (0 == strncmp("@RSYNCD:", auth_string, 8)) {
/* matches, so we assume its an authentication message */
/* needs to handle the AUTHREQD case, but doesn't - FIXME */
- proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Authentication");
conversation_data->state = RSYNC_COMMAND;
} else { /* it didn't match, so it is probably a module list */
- proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Module list");
@@ -214,7 +214,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case RSYNC_COMMAND:
if (pinfo->destport == glb_rsync_tcp_port) {
/* then we are still sending commands */
- proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, TRUE);
+ proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Command");
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 161f0733b7..99c441aaae 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -1223,7 +1223,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
item_len = tvb_get_guint8( tvb, offset );
/* Item len of 1 because its an FT_UINT_STRING... */
proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_sip_uri,
- tvb, offset, 1, ENC_BIG_ENDIAN );
+ tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN );
offset++;
col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"",
@@ -1254,7 +1254,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
item_len = tvb_get_guint8( tvb, offset );
/* Item len of 1 because its an FT_UINT_STRING... */
proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_disp_name,
- tvb, offset, 1, ENC_BIG_ENDIAN);
+ tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN);
offset++;
col_append_fstr(pinfo->cinfo, COL_INFO, " DISPLAY-NAME=\"%s\"",
@@ -1332,7 +1332,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
/* Reason phrase */
item_len = tvb_get_guint8( tvb, offset );
if ( item_len != 0 )
- proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, ENC_BIG_ENDIAN );
+ proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_reason1_phrase, tvb, offset, 1, ENC_ASCII|ENC_BIG_ENDIAN );
offset += (item_len+1);
packet_len -= (item_len+1);
@@ -1728,13 +1728,13 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_len, tvb, offset, 1, ENC_BIG_ENDIAN );
offset++;
- proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_string, tvb, offset, prefix_len, FALSE );
+ proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_prefix_string, tvb, offset, prefix_len, ENC_ASCII|ENC_NA );
offset += prefix_len;
item_len -= prefix_len +1;
if ( item_len == 0 )
continue;
}
- proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_text, tvb, offset, item_len, FALSE );
+ proto_tree_add_item( sdes_item_tree, hf_rtcp_sdes_text, tvb, offset, item_len, ENC_ASCII|ENC_NA );
offset += item_len;
}
}
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index a28dfbcc0d..060231cade 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -925,7 +925,7 @@ dissect_rtmpt_body_command(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree, g
name_tree = proto_item_add_subtree(ti, ett_rtmpt_string);
proto_tree_add_item(name_tree, hf_rtmpt_amf_stringlength, tvb, iPropertyOffset, 2, ENC_BIG_ENDIAN);
- proto_tree_add_item(name_tree, hf_rtmpt_amf_string, tvb, iPropertyOffset+2, iPropertyLength-2, FALSE);
+ proto_tree_add_item(name_tree, hf_rtmpt_amf_string, tvb, iPropertyOffset+2, iPropertyLength-2, ENC_ASCII|ENC_NA);
}
if (!iPush) {
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index 8d13efd2d7..23331b164e 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -789,7 +789,7 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o
offset+=1;
/*Label*/
- proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label,tvb,offset,lab_len,FALSE);
+ proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label,tvb,offset,lab_len,ENC_ASCII|ENC_NA);
offset+=lab_len;
return offset;
@@ -825,7 +825,7 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o
proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid_len, tvb, offset,1, ENC_BIG_ENDIAN);
offset+=1;
- proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid, tvb,offset,LB_uid_len,FALSE);
+ proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid, tvb,offset,LB_uid_len,ENC_ASCII|ENC_NA);
offset+=(guint8)LB_uid_len;
@@ -837,7 +837,7 @@ static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load,guint32 o
offset+=1;
/*Group Name*/
- proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name,tvb,offset,grp_name_len,FALSE);
+ proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name,tvb,offset,grp_name_len,ENC_ASCII|ENC_NA);
offset+=grp_name_len;
return offset;
@@ -985,7 +985,7 @@ static void dissect_setlbstate_req(tvbuff_t *tvb,proto_tree *pay_load,guint32 of
offset+=1;
/*LB UID*/
- proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid, tvb,offset,LB_uid_len,FALSE);
+ proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid, tvb,offset,LB_uid_len,ENC_ASCII|ENC_NA);
offset+=(guint8)LB_uid_len;
/*LB Health*/
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index 3206e3a027..e8a9f18447 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -151,7 +151,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
case SS_READY_TYPE:
info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_RDY_INFO_OFFSET;
if (info_length > 0) {
- proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_RDY_INFO_OFFSET, info_length, FALSE);
+ proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_RDY_INFO_OFFSET, info_length, ENC_ASCII|ENC_NA);
total_length += info_length;
}
break;
@@ -159,7 +159,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
info_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_NOTRDY_INFO_OFFSET;
if (info_length > 0) {
proto_tree_add_item(ssprotocol_tree, hf_message_reason, message_tvb, MESSAGE_NOTRDY_REASON_OFFSET, MESSAGE_NOTRDY_REASON_LENGTH, ENC_BIG_ENDIAN);
- proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_NOTRDY_INFO_OFFSET, info_length, FALSE);
+ proto_tree_add_item(ssprotocol_tree, hf_message_info, message_tvb, MESSAGE_NOTRDY_INFO_OFFSET, info_length, ENC_ASCII|ENC_NA);
total_length += info_length;
}
break;
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 71887793a7..f367ff8a04 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -481,7 +481,7 @@ dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, tvb_v, offset_v, 1, ENC_BIG_ENDIAN);
break;
case 0x0108: /* logical unit serial number */
- proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, tvb_v, offset_v, additional_length, 0);
+ proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, tvb_v, offset_v, additional_length, ENC_ASCII|ENC_NA);
break;
default:
proto_tree_add_text (tree, tvb_v, offset_v, additional_length,
@@ -758,10 +758,10 @@ dissect_mmc4_readdiscstructure (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
proto_tree_add_item (tree, hf_scsi_mmc_adip_eib0, tvb, offset+18, 1, ENC_BIG_ENDIAN);
/* disk manufacturer id */
- proto_tree_add_item (tree, hf_scsi_mmc_adip_device_manuf_id, tvb, offset+19, 8, 0);
+ proto_tree_add_item (tree, hf_scsi_mmc_adip_device_manuf_id, tvb, offset+19, 8, ENC_ASCII|ENC_NA);
/* media type id */
- proto_tree_add_item (tree, hf_scsi_mmc_adip_media_type_id, tvb, offset+27, 3, 0);
+ proto_tree_add_item (tree, hf_scsi_mmc_adip_media_type_id, tvb, offset+27, 3, ENC_ASCII|ENC_NA);
/* product revision number */
proto_tree_add_item (tree, hf_scsi_mmc_adip_product_revision_number, tvb, offset+30, 1, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 9d2999c5dc..46443289d4 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -2423,15 +2423,15 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo,
offset_v=dissect_spc_inq_reladrflags(tvb_v, offset_v, tree);
/* vendor id */
- proto_tree_add_item(tree, hf_scsi_inq_vendor_id, tvb_v, offset_v, 8, 0);
+ proto_tree_add_item(tree, hf_scsi_inq_vendor_id, tvb_v, offset_v, 8, ENC_ASCII|ENC_NA);
offset_v+=8;
/* product id */
- proto_tree_add_item(tree, hf_scsi_inq_product_id, tvb_v, offset_v, 16, 0);
+ proto_tree_add_item(tree, hf_scsi_inq_product_id, tvb_v, offset_v, 16, ENC_ASCII|ENC_NA);
offset_v+=16;
/* product revision level */
- proto_tree_add_item(tree, hf_scsi_inq_product_rev, tvb_v, offset_v, 4, 0);
+ proto_tree_add_item(tree, hf_scsi_inq_product_rev, tvb_v, offset_v, 4, ENC_ASCII|ENC_NA);
offset_v+=4;
/* vendor specific, 20 bytes */
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 13b01e653b..bd8743cdeb 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -1013,7 +1013,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
guint16 hostname_length;
hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (Hostname: %.*s)", hostname_length, tvb_get_ephemeral_string(parameter_tvb, HOSTNAME_OFFSET, hostname_length));
}
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index f3485cc327..32bb6fbebe 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -362,7 +362,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
type = tvb_get_guint8(tvb,offset);
delim = tvb_get_guint8(tvb,offset + 1);
if (delim != '=') {
- proto_item *ti2 = proto_tree_add_item(sdp_tree, hf_invalid, tvb, offset, linelen, FALSE);
+ proto_item *ti2 = proto_tree_add_item(sdp_tree, hf_invalid, tvb, offset, linelen, ENC_ASCII|ENC_NA);
expert_add_info_format(pinfo, ti2, PI_MALFORMED, PI_NOTE,
"Invalid SDP line (no '=' delimiter)");
offset = next_offset;
@@ -636,7 +636,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_owner_tree, hf_owner_username, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the session id */
@@ -646,7 +646,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_owner_tree, hf_owner_sessionid, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the version */
@@ -656,7 +656,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_owner_tree, hf_owner_version, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the network type */
@@ -666,7 +666,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_owner_tree, hf_owner_network_type, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the address type */
@@ -676,11 +676,11 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_owner_tree, hf_owner_address_type, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the address */
- proto_tree_add_item(sdp_owner_tree,hf_owner_address, tvb, offset, -1, FALSE);
+ proto_tree_add_item(sdp_owner_tree,hf_owner_address, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
/*
@@ -708,7 +708,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti,
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_network_type, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the address type */
@@ -722,7 +722,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti,
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_address_type, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
offset = next_offset + 1;
/* Find the connection address */
@@ -741,7 +741,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti,
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_connection_address, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
if(next_offset != -1){
offset = next_offset + 1;
next_offset = tvb_find_guint8(tvb,offset,-1,'/');
@@ -751,11 +751,11 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti,
tokenlen = next_offset - offset;
}
proto_tree_add_item(sdp_connection_info_tree,
- hf_connection_info_ttl, tvb, offset, tokenlen, FALSE);
+ hf_connection_info_ttl, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
if(next_offset != -1){
offset = next_offset + 1;
proto_tree_add_item(sdp_connection_info_tree,
- hf_connection_info_num_addr, tvb, offset, -1, FALSE);
+ hf_connection_info_num_addr, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
}
@@ -783,7 +783,7 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){
tokenlen = next_offset - offset;
item = proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_modifier, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
if (tvb_strneql(tvb, offset, "CT", 2) == 0){
proto_item_append_text(item, " [Conference Total(total bandwidth of all RTP sessions)]");
unit_is_kbs = TRUE;
@@ -799,7 +799,7 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){
offset = next_offset + 1;
item = proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_value, tvb, offset, -1,
- FALSE);
+ ENC_ASCII|ENC_NA);
if (unit_is_kbs == TRUE)
proto_item_append_text(item, " kb/s");
if (unit_is_bps == TRUE)
@@ -823,11 +823,11 @@ static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_time_tree, hf_time_start, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
/* get stop time */
offset = next_offset + 1;
- proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, offset, -1, FALSE);
+ proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){
@@ -847,7 +847,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_interval, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
/* get duration */
offset = next_offset + 1;
@@ -857,7 +857,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_repeat_time_tree,hf_repeat_time_duration, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
/* get offsets */
do{
@@ -869,7 +869,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){
tokenlen = -1; /* end of tvbuff */
}
proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_offset,
- tvb, offset, tokenlen, FALSE);
+ tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
} while( next_offset != -1 );
}
@@ -890,7 +890,7 @@ dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_timezone_tree, hf_timezone_time, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
next_offset = tvb_find_guint8(tvb,offset,-1,' ');
if(next_offset != -1){
@@ -899,7 +899,7 @@ dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){
tokenlen = -1; /* end of tvbuff */
}
proto_tree_add_item(sdp_timezone_tree, hf_timezone_offset, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
} while (next_offset != -1);
@@ -924,11 +924,11 @@ static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti){
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_type,
- tvb, offset, tokenlen, FALSE);
+ tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_data,
- tvb, offset, -1, FALSE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
}
static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti){
@@ -952,7 +952,7 @@ static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti
tokenlen = next_offset - offset;
prtcl_id = tvb_get_ephemeral_string(tvb, offset, tokenlen);
- proto_tree_add_item(key_tree, hf_key_mgmt_prtcl_id, tvb, offset, tokenlen, FALSE);
+ proto_tree_add_item(key_tree, hf_key_mgmt_prtcl_id, tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
@@ -1004,7 +1004,7 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info * pinfo, pr
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_field,
- tvb, offset, tokenlen, FALSE);
+ tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
field_name = tvb_get_ephemeral_string(tvb, offset, tokenlen);
@@ -1023,7 +1023,7 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info * pinfo, pr
tokenlen = next_offset - offset;
- proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_version,tvb,offset,tokenlen,FALSE);
+ proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_version,tvb,offset,tokenlen,ENC_ASCII|ENC_NA);
offset = tvb_pbrk_guint8(tvb,offset,-1,(guint8 *)"ABCDEFGHIJKLMNOPQRSTUVWXYZ", NULL);
@@ -1035,18 +1035,18 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info * pinfo, pr
if (tokenlen == -1)
return;
- proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_type,tvb,offset,tokenlen,FALSE);
+ proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_type,tvb,offset,tokenlen,ENC_ASCII|ENC_NA);
} else if (strcmp((char*)field_name, "key-mgmt") == 0) {
tvbuff_t *key_tvb;
proto_item *key_ti;
key_tvb = tvb_new_subset_remaining(tvb, offset);
- key_ti = proto_tree_add_item(sdp_session_attribute_tree, hf_key_mgmt_att_value, key_tvb, 0, -1, FALSE);
+ key_ti = proto_tree_add_item(sdp_session_attribute_tree, hf_key_mgmt_att_value, key_tvb, 0, -1, ENC_ASCII|ENC_NA);
dissect_key_mgmt(key_tvb, pinfo, key_ti);
} else {
proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_value,
- tvb, offset, -1, FALSE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
}
}
@@ -1078,7 +1078,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
/* Type of media session */
proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
transport_info->media_type = (char*)tvb_get_ephemeral_string(tvb, offset, tokenlen);
@@ -1103,7 +1103,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
return;
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_media_tree, hf_media_portcount, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
offset = next_offset + 1;
} else {
next_offset = tvb_find_guint8(tvb,offset, -1, ' ');
@@ -1131,7 +1131,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
/* XXX Remember Protocol */
proto_tree_add_item(sdp_media_tree, hf_media_proto, tvb, offset, tokenlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
do {
offset = next_offset + 1;
@@ -1156,7 +1156,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
transport_info->media[transport_info->media_count].pt_count++;
} else {
proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
}
} while (next_offset != -1);
@@ -1527,7 +1527,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = colon_offset - offset;
proto_tree_add_item(sdp_media_attribute_tree,
hf_media_attribute_field,
- tvb, offset, tokenlen, FALSE);
+ tvb, offset, tokenlen, ENC_ASCII|ENC_NA);
/*??field_name = tvb_get_ephemeral_string(tvb, offset, tokenlen);*/
sdp_media_attrbute_code = find_sdp_media_attribute_names(tvb, offset, tokenlen);
@@ -1555,7 +1555,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_format, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
payload_type = tvb_get_ephemeral_string(tvb, offset, tokenlen);
@@ -1570,7 +1570,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_encoding_name, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
key=g_malloc( sizeof(gint) );
*key=atol((char*)payload_type);
@@ -1589,7 +1589,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
}
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_sample_rate, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
transport_info->sample_rate[pt] = atoi(tvb_get_ephemeral_string(tvb, offset, tokenlen));
/* As per RFC2327 it is possible to have multiple Media Descriptions ("m=").
For example:
@@ -1657,7 +1657,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
media_format_item = proto_tree_add_item(sdp_media_attribute_tree,
hf_media_format, tvb, offset,
- tokenlen, FALSE);
+ tokenlen, ENC_ASCII|ENC_NA);
media_format = atoi((char*)tvb_get_ephemeral_string(tvb, offset, tokenlen));
if (media_format >= SDP_NO_OF_PT) {
return; /* Invalid */
@@ -1686,7 +1686,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = next_offset - offset;
fmtp_item = proto_tree_add_item(sdp_media_attribute_tree,
hf_media_format_specific_parameter, tvb,
- offset, tokenlen, FALSE);
+ offset, tokenlen, ENC_ASCII|ENC_NA);
fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp);
@@ -1766,7 +1766,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
default:
/* No special treatment for values of this attribute type, just add as one item. */
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
- tvb, offset, -1, FALSE);
+ tvb, offset, -1, ENC_ASCII|ENC_NA);
break;
}
}
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index b21af7b7ad..8d31389f43 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -198,13 +198,13 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE);
+ proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA);
offset += 12;
proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
break;
@@ -241,7 +241,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE);
+ proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA);
offset += 12;
proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -262,7 +262,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
} else {
- proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE);
+ proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
}
break;
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index b0ef31d3e0..3e517354d7 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -645,7 +645,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
{
proto_tree_add_item(param_tree,
hf_initial_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
@@ -737,7 +737,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
{
proto_tree_add_item(param_tree,
hf_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
@@ -810,7 +810,7 @@ PICS. */
{
proto_tree_add_item(param_tree,
hf_second_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
@@ -821,7 +821,7 @@ PICS. */
{
proto_tree_add_item(param_tree,
hf_second_initial_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
@@ -832,7 +832,7 @@ PICS. */
{
proto_tree_add_item(param_tree,
hf_large_initial_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
@@ -843,7 +843,7 @@ PICS. */
{
proto_tree_add_item(param_tree,
hf_large_second_initial_serial_number,
- tvb, offset, param_len, FALSE);
+ tvb, offset, param_len, ENC_ASCII|ENC_NA);
}
break;
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 4f20934f61..16d80058cf 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -1228,7 +1228,7 @@ display_sip_uri (tvbuff_t *tvb, proto_tree *sip_element_tree, uri_offset_info* u
if(uri_offsets->display_name_end != uri_offsets->display_name_start) {
proto_tree_add_item(sip_element_tree, hf_sip_display, tvb, uri_offsets->display_name_start,
- uri_offsets->display_name_end - uri_offsets->display_name_start + 1, FALSE);
+ uri_offsets->display_name_end - uri_offsets->display_name_start + 1, ENC_ASCII|ENC_NA);
}
ti = proto_tree_add_item(sip_element_tree, *(uri->hf_sip_addr), tvb, uri_offsets->uri_start, uri_offsets->uri_end - uri_offsets->uri_start + 1, FALSE);
@@ -1317,7 +1317,7 @@ dissect_sip_contact_item(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
current_offset = tvb_skip_wsp(tvb, queried_offset+1, line_end_offset - queried_offset+1);
}
proto_tree_add_item(tree, hf_sip_contact_param, tvb, contact_params_start_offset ,
- contact_param_end_offset - contact_params_start_offset +1, FALSE);
+ contact_param_end_offset - contact_params_start_offset +1, ENC_ASCII|ENC_NA);
/* In case there are more parameters, point to the start of it */
contact_params_start_offset = current_offset;
}
@@ -1483,7 +1483,7 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
if (transport_name_started && ((c == ' ') || (c == '\t')))
{
proto_tree_add_item(tree, hf_sip_via_transport, tvb, transport_start_offset,
- current_offset - transport_start_offset, FALSE);
+ current_offset - transport_start_offset, ENC_ASCII|ENC_NA);
break;
}
@@ -1519,10 +1519,10 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
/* Add address to tree */
if (ipv6_address == TRUE) {
proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset + 1,
- current_offset - address_start_offset - 2, FALSE);
+ current_offset - address_start_offset - 2, ENC_ASCII|ENC_NA);
} else {
proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset,
- current_offset - address_start_offset, FALSE);
+ current_offset - address_start_offset, ENC_ASCII|ENC_NA);
}
/* Transport port number may follow ([space] : [space])*/
@@ -1888,7 +1888,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
case REQUEST_LINE:
if (sip_tree) {
ti_a = proto_tree_add_item(sip_tree, hf_Request_Line, tvb,
- offset, linelen, FALSE);
+ offset, linelen, ENC_ASCII|ENC_NA);
reqresp_tree = proto_item_add_subtree(ti_a, ett_sip_reqresp);
}
@@ -1898,7 +1898,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
case STATUS_LINE:
if (sip_tree) {
ti_a = proto_tree_add_item(sip_tree, hf_sip_Status_Line, tvb,
- offset, linelen, FALSE);
+ offset, linelen, ENC_ASCII|ENC_NA);
reqresp_tree = proto_item_add_subtree(ti_a, ett_sip_reqresp);
}
dfilter_sip_status_line(tvb, reqresp_tree, pinfo, linelen);
@@ -1919,7 +1919,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
offset = next_offset;
if (sip_tree) {
th = proto_tree_add_item(sip_tree, hf_sip_msg_hdr, tvb, offset,
- tvb_length_remaining(tvb, offset), FALSE);
+ tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
proto_item_set_text(th, "Message Header");
hdr_tree = proto_item_add_subtree(th, ett_sip_hdr);
}
@@ -2074,7 +2074,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
parameter_end_offset = line_end_offset;
parameter_len = parameter_end_offset - parameter_offset;
proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset,
- parameter_len, FALSE);
+ parameter_len, ENC_ASCII|ENC_NA);
/* Tag indicates in-dialog messages, in case we have a INVITE, SUBSCRIBE or REFER, mark it */
switch (current_method_idx) {
@@ -2129,7 +2129,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
parameter_end_offset = line_end_offset;
parameter_len = parameter_end_offset - parameter_offset;
proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset,
- parameter_len, FALSE);
+ parameter_len, ENC_ASCII|ENC_NA);
}
}/* hdr_tree */
@@ -2256,7 +2256,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
gint turi_start_offset = hparam_offset + 12;
gint turi_end_offset = tvb_find_guint8(tvb, turi_start_offset, -1,'\"');
if (turi_end_offset != -1)
- proto_tree_add_item(tc_uri_item_tree, hf_sip_tc_turi, tvb, turi_start_offset,(turi_end_offset - turi_start_offset),FALSE);
+ proto_tree_add_item(tc_uri_item_tree, hf_sip_tc_turi, tvb, turi_start_offset,(turi_end_offset - turi_start_offset),ENC_ASCII|ENC_NA);
else
break; /* malformed */
}
@@ -2335,7 +2335,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
if (cseq_tree)
{
proto_tree_add_item(cseq_tree, hf_sip_cseq_method, tvb,
- value_offset + sub_value_offset, strlen_to_copy, FALSE);
+ value_offset + sub_value_offset, strlen_to_copy, ENC_ASCII|ENC_NA);
}
}
break;
@@ -2414,7 +2414,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
{
proto_tree_add_item(rack_tree, hf_sip_rack_cseq_method, tvb,
value_offset + sub_value_offset,
- (int)linelen-sub_value_offset, FALSE);
+ (int)linelen-sub_value_offset, ENC_ASCII|ENC_NA);
}
break;
@@ -2599,7 +2599,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
/* Set sip.auth as a hidden field/filter */
ti_c = proto_tree_add_item(hdr_tree, hf_sip_auth, tvb,
offset, next_offset-offset,
- FALSE);
+ ENC_ASCII|ENC_NA);
PROTO_ITEM_SET_HIDDEN(ti_c);
/* Authentication-Info does not begin with the scheme name */
@@ -2609,7 +2609,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
comma_offset = tvb_pbrk_guint8(tvb, value_offset, line_end_offset - value_offset, " \t\r\n", NULL);
proto_tree_add_item(sip_element_tree, hf_sip_auth_scheme,
tvb, value_offset, comma_offset - value_offset,
- FALSE);
+ ENC_ASCII|ENC_NA);
}else{
/* The first time comma_offset is "start of parameters" */
comma_offset = value_offset;
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index e423e5fa6e..6d1846cb12 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -1254,7 +1254,7 @@ dissect_skinny_xml(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, const gi
tvbuff_t *next_tvb;
dissector_handle_t handle;
- item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, start, length, TRUE);
+ item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, start, length, ENC_ASCII|ENC_NA);
subtree = proto_item_add_subtree(item, 0);
next_tvb = tvb_new_subset(tvb, start, length, -1);
handle = dissector_get_string_handle(media_type_dissector_table, "text/xml");
@@ -1346,7 +1346,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0001: /* RegisterMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, offset+28, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, offset+32, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_ipAddress, tvb, offset+36, 4, ENC_BIG_ENDIAN);
@@ -1369,7 +1369,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0004: /* EnblocCallMessage -- This decode NOT verified*/
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
break;
case 0x0005: /* StimulusMessage */
@@ -1451,7 +1451,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x0020: /* AlarmMessage */
proto_tree_add_item(skinny_tree, hf_skinny_alarmSeverity, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxAlarmMessageSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxAlarmMessageSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_alarmParam1, tvb, offset+96, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_alarmParam2, tvb, offset+100, 4, ENC_BIG_ENDIAN);
break;
@@ -1501,7 +1501,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0023: /* ConnectionStatisticsRes */
- proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+36, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_statsProcessingType, tvb, offset+40, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_packetsSent, tvb, offset+44, 4, ENC_LITTLE_ENDIAN);
@@ -1515,7 +1515,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0024: /* OffHookWithCgpnMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12,StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12,StationMaxDirnumSize, ENC_ASCII|ENC_NA);
break;
case 0x0025: /* SoftKeySetReqMessage */
@@ -1536,7 +1536,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0029: /* RegisterTokenReq */
- proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, 4, ENC_ASCII|ENC_NA);
i = offset+12+StationMaxDeviceNameSize;
proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i+4, 4, ENC_LITTLE_ENDIAN);
@@ -1847,7 +1847,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(skinny_tree, hf_skinny_directoryIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_unknown, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_directoryPhoneNumber, tvb, offset+24, 256, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_directoryPhoneNumber, tvb, offset+24, 256, ENC_ASCII|ENC_NA);
break;
@@ -1858,7 +1858,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
case 0x0081: /* RegisterAckMessage */
proto_tree_add_item(skinny_tree, hf_skinny_keepAliveInterval, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_dateTemplate, tvb, offset+16, StationDateTemplateSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_dateTemplate, tvb, offset+16, StationDateTemplateSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_secondaryKeepAliveInterval, tvb, offset+24, 4, ENC_LITTLE_ENDIAN);
break;
@@ -1980,14 +1980,14 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x008f: /* CallInfoMessage */
i = offset+12;
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
si->callingParty = g_strdup(tvb_format_stringzpad(tvb, i, StationMaxDirnumSize));
i += StationMaxDirnumSize;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
si->calledParty = g_strdup(tvb_format_stringzpad(tvb, i, StationMaxDirnumSize));
i += StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
@@ -1998,25 +1998,25 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
i += 4;
proto_tree_add_item(skinny_tree, hf_skinny_callType, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_cast_originalCdpnRedirectReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingReason, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_cast_callInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
@@ -2047,40 +2047,40 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(skinny_tree, hf_skinny_activeForward, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_forwardAllActive, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, offset+24, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, offset+24, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i = offset+24+StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_skinny_forwardBusyActive, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i += StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_skinny_forwardNoAnswerActive, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_forwardNumber, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
break;
case 0x0091: /* SpeedDialStatMessage */
proto_tree_add_item(skinny_tree, hf_skinny_speedDialNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_speedDialDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_speedDialDisplayName, tvb, offset+40, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_speedDialDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(skinny_tree, hf_skinny_speedDialDisplayName, tvb, offset+40, StationMaxNameSize, ENC_ASCII|ENC_NA);
break;
case 0x0092: /* LineStatMessage */
proto_tree_add_item(skinny_tree, hf_skinny_lineNumber, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_lineDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_lineFullyQualifiedDisplayName, tvb, offset+16+StationMaxDirnumSize, StationMaxNameSize, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_lineDisplayName, tvb, offset+16+StationMaxDirnumSize+StationMaxNameSize, StationMaxDisplayNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_lineDirNumber, tvb, offset+16, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(skinny_tree, hf_skinny_lineFullyQualifiedDisplayName, tvb, offset+16+StationMaxDirnumSize, StationMaxNameSize, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(skinny_tree, hf_skinny_lineDisplayName, tvb, offset+16+StationMaxDirnumSize+StationMaxNameSize, StationMaxDisplayNameSize, ENC_ASCII|ENC_NA);
break;
case 0x0093: /* ConfigStatMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_deviceName, tvb, offset+12, StationMaxDeviceNameSize, ENC_ASCII|ENC_NA);
i = offset+12+StationMaxDeviceNameSize;
proto_tree_add_item(skinny_tree, hf_skinny_stationUserId, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
proto_tree_add_item(skinny_tree, hf_skinny_stationInstance, tvb, i, 4, ENC_LITTLE_ENDIAN);
i += 4;
- proto_tree_add_item(skinny_tree, hf_skinny_userName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_userName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
- proto_tree_add_item(skinny_tree, hf_skinny_serverName, tvb, i, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_serverName, tvb, i, StationMaxNameSize, ENC_ASCII|ENC_NA);
i += StationMaxNameSize;
proto_tree_add_item(skinny_tree, hf_skinny_numberLines, tvb, i, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_numberSpeedDials, tvb, i+4, 4, ENC_LITTLE_ENDIAN);
@@ -2125,11 +2125,11 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x0098: /* VersionMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_version, tvb, offset+12, StationMaxVersionSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_version, tvb, offset+12, StationMaxVersionSize, ENC_ASCII|ENC_NA);
break;
case 0x0099: /* DisplayTextMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_ASCII|ENC_NA);
break;
case 0x009a: /* ClearDisplay */
@@ -2148,12 +2148,12 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x009d: /* RegisterRejectMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+12, StationMaxDisplayTextSize, ENC_ASCII|ENC_NA);
break;
case 0x009e: /* ServerResMessage */
for (i = 0; i < StationMaxServers; i++) {
- proto_tree_add_item(skinny_tree, hf_skinny_serverIdentifier, tvb, offset+12+(i*StationMaxServers), StationMaxServerNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_serverIdentifier, tvb, offset+12+(i*StationMaxServers), StationMaxServerNameSize, ENC_ASCII|ENC_NA);
}
j = offset+12+(i*StationMaxServers);
for (i = 0; i < StationMaxServers; i++) {
@@ -2229,7 +2229,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x0107: /* ConnectionStatisticsReq */
i = 12;
- proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, i, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_directoryNumber, tvb, i, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
i = 12 + StationMaxDirnumSize;
proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, i, 4, ENC_LITTLE_ENDIAN);
si->callId = tvb_get_letohl(tvb, i);
@@ -2243,7 +2243,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(skinny_tree, hf_skinny_softKeyCount, tvb, offset+16, 4, softKeyCount);
proto_tree_add_item(skinny_tree, hf_skinny_totalSoftKeyCount, tvb, offset+20, 4, ENC_LITTLE_ENDIAN);
for (i = 0; ((i < StationMaxSoftKeyDefinition) && (i < softKeyCount)); i++){
- proto_tree_add_item(skinny_tree, hf_skinny_softKeyLabel, tvb, offset+(i*20)+24, StationMaxSoftKeyLabelSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_softKeyLabel, tvb, offset+(i*20)+24, StationMaxSoftKeyLabelSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_softKeyEvent, tvb, offset+(i*20)+40, 4, ENC_LITTLE_ENDIAN);
}
/* there is more data here, but it doesn't make a whole lot of sense, I imagine
@@ -2305,7 +2305,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x0112: /* DisplayPromptStatusMessage */
proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayPromptStatusSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayPromptStatusSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+48, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+52, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(tvb, offset+48);
@@ -2321,7 +2321,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x0114: /* DisplayNotifyMessage */
proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayNotifySize , ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_displayMessage, tvb, offset+16, StationMaxDisplayNotifySize , ENC_ASCII|ENC_NA);
break;
case 0x0115: /* ClearNotifyMessage */
@@ -2366,7 +2366,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 0x011D: /* DialedNumberMessage */
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, offset+12, StationMaxDirnumSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_lineInstance, tvb, offset+12+StationMaxDirnumSize, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_callIdentifier, tvb, offset+12+StationMaxDirnumSize+4, 4, ENC_LITTLE_ENDIAN);
si->lineId = tvb_get_letohl(tvb, offset+12+StationMaxDirnumSize);
@@ -2388,14 +2388,14 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x011F: /* FeatureStatMessage */
proto_tree_add_item(skinny_tree, hf_skinny_featureIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_featureID, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_featureTextLabel, tvb, offset+20, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_featureTextLabel, tvb, offset+20, StationMaxNameSize, ENC_ASCII|ENC_NA);
proto_tree_add_item(skinny_tree, hf_skinny_featureStatus, tvb, offset+20+StationMaxNameSize, 4, ENC_LITTLE_ENDIAN);
break;
case 0x0120: /* DisplayPriNotifyMessage */
proto_tree_add_item(skinny_tree, hf_skinny_messageTimeOutValue, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(skinny_tree, hf_skinny_priority, tvb, offset+16, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_notify, tvb, offset+16, StationMaxDisplayNotifySize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_notify, tvb, offset+16, StationMaxDisplayNotifySize, ENC_ASCII|ENC_NA);
break;
case 0x0121: /* ClearPriNotifyMessage */
@@ -2493,8 +2493,8 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x012F: /* ServiceURLStatMessage */
proto_tree_add_item(skinny_tree, hf_skinny_serviceURLIndex, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_serviceURL, tvb, offset+16, StationMaxServiceURLSize, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(skinny_tree, hf_skinny_serviceURLDisplayName, tvb, offset+16+StationMaxServiceURLSize, StationMaxNameSize, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_serviceURL, tvb, offset+16, StationMaxServiceURLSize, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(skinny_tree, hf_skinny_serviceURLDisplayName, tvb, offset+16+StationMaxServiceURLSize, StationMaxNameSize, ENC_ASCII|ENC_NA);
break;
case 0x0130: /* CallSelectStatMessage */
@@ -2813,81 +2813,81 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* 8x party numbers */
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
/* 4x party names */
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
}
else if(hdr_version == CM7_MSG_TYPE_B || hdr_version == CM7_MSG_TYPE_A)
{/* I'm not sure. Not enough examples. */
/* 8x party numbers */
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyNumber, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cgpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyNumber, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledParty, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingParty, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_cdpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_originalCdpnVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingVoiceMailbox, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
/* 4x party names */
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_callingPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_calledPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_skinny_originalCalledPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
i += count;
count = tvb_strnlen(tvb, i, -1)+1;
- proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(skinny_tree, hf_cast_lastRedirectingPartyName, tvb, i, count, ENC_ASCII|ENC_NA);
}
}
break;
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 47e96ead26..deecf20f36 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -359,10 +359,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_password, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_password, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_version, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -378,7 +378,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Login successful: %s (Byte: %d)", val_to_str(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset));
offset += 1;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_login_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_login_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
if (i == 1){
proto_tree_add_ipv4(slsk_tree, hf_slsk_client_ip, tvb, offset, 4, tvb_get_ntohl(tvb, offset));
@@ -407,7 +407,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_ipv4(slsk_tree, hf_slsk_ip, tvb, offset, 4, tvb_get_ntohl(tvb, offset));
offset += 4;
@@ -421,7 +421,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -444,7 +444,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_user_exists, tvb, offset, 1, tvb_get_guint8(tvb, offset),
"User exists: %s (Byte: %d)", val_to_str(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset));
@@ -457,7 +457,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "i*")) {
@@ -602,7 +602,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_status_code, tvb, offset, 4, tvb_get_letohl(tvb, offset),
"Status: %s (Code: %d)", val_to_str(tvb_get_letohl(tvb, offset), slsk_status_codes, "Unknown"), tvb_get_letohl(tvb, offset));
@@ -615,7 +615,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -660,7 +660,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
len = tvb_get_letohl(uncompr_tvb, uncompr_tvb_offset);
proto_tree_add_uint(slsk_compr_packet_tree, hf_slsk_string_length, uncompr_tvb, uncompr_tvb_offset, 4, len);
- proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_username, uncompr_tvb, uncompr_tvb_offset+4, len, TRUE);
+ proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_username, uncompr_tvb, uncompr_tvb_offset+4, len, ENC_ASCII|ENC_NA);
uncompr_tvb_offset += 4+len;
proto_tree_add_item(slsk_compr_packet_tree, hf_slsk_token, uncompr_tvb, uncompr_tvb_offset, 4, ENC_LITTLE_ENDIAN);
uncompr_tvb_offset += 4;
@@ -747,13 +747,13 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "iss")) {
@@ -763,10 +763,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -779,7 +779,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "isi*")) {
@@ -789,7 +789,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_users_in_room, tvb, offset, 4, tvb_get_letohl(tvb, offset));
@@ -870,7 +870,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "i")) {
@@ -890,10 +890,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_total_uploads, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -917,7 +917,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_user_description, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_user_description, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_picture_exists, tvb, offset, 1, tvb_get_guint8(tvb, offset),
"Picture exists: %s (Byte: %d)", val_to_str(tvb_get_guint8(tvb, offset), slsk_yes_no, "Unknown"), tvb_get_guint8(tvb, offset));
@@ -925,7 +925,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
if ( tvb_get_guint8(tvb, offset -1 ) == 1 ) {
proto_tree_add_uint_format(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset),
"Picture Size: %d", tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_picture, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_picture, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
proto_tree_add_uint(slsk_tree, hf_slsk_total_uploads, tvb, offset, 4, tvb_get_letohl(tvb, offset));
@@ -946,10 +946,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -967,7 +967,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
offset += 4;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, ENC_ASCII|ENC_NA);
offset += 4+len;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
@@ -987,7 +987,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
offset += 4;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, ENC_ASCII|ENC_NA);
offset += 4+len;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
@@ -1013,10 +1013,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "iiiss")) {
@@ -1030,10 +1030,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_timestamp, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1060,7 +1060,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1096,7 +1096,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_average_speed, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1125,7 +1125,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_average_speed, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1146,7 +1146,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "iis")) {
@@ -1158,7 +1158,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1313,7 +1313,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_slotsfull, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1331,7 +1331,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
if (i == 1){
proto_tree_add_uint(slsk_tree, hf_slsk_size, tvb, offset, 4, tvb_get_letohl(tvb, offset));
@@ -1365,7 +1365,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
}
} else {
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
}
@@ -1379,7 +1379,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1392,7 +1392,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1405,7 +1405,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_place_in_queue, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1420,7 +1420,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1433,7 +1433,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "isi")) {
@@ -1443,7 +1443,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_ranking, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1455,10 +1455,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1472,7 +1472,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1485,7 +1485,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1584,7 +1584,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "isi*")) {
@@ -1594,7 +1594,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, 4, tvb_get_letohl(tvb, offset),
@@ -1625,7 +1625,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_string, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_number_of_users, tvb, offset, 4, tvb_get_letohl(tvb, offset),
@@ -1656,7 +1656,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1673,7 +1673,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1686,7 +1686,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1746,15 +1746,15 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, 16, 0,
"(+12 0 bytes)");
@@ -1769,10 +1769,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_filename, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_directory, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, 13, 0,
"(+13 0 bytes)");
@@ -1788,7 +1788,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -1808,7 +1808,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_room, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_users_in_room, tvb, offset, 4, tvb_get_letohl(tvb, offset));
@@ -1889,7 +1889,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_code, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
@@ -1900,7 +1900,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_port, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_chat_message, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -2044,7 +2044,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -2084,12 +2084,12 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_integer, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
}
@@ -2150,7 +2150,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
break;
@@ -2213,7 +2213,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "isi*")) {
@@ -2223,7 +2223,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, 4, tvb_get_letohl(tvb, offset),
@@ -2257,7 +2257,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "isi*")) {
@@ -2267,7 +2267,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
"Message Type: %s (Code: %02d)", message_type, msg_code);
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_recommendation, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
i=0; j = tvb_get_letohl(tvb, offset);
proto_tree_add_uint_format(slsk_tree, hf_slsk_integer, tvb, offset, 4, tvb_get_letohl(tvb, offset),
@@ -2300,7 +2300,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
else if (check_slsk_format(tvb, offset, "ii")) {
@@ -2325,12 +2325,12 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_uint(slsk_tree, hf_slsk_integer, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset));
offset += 4;
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, tvb_get_letohl(tvb, offset));
- proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_search_text, tvb, offset+4, tvb_get_letohl(tvb, offset), ENC_ASCII|ENC_NA);
offset += 4+tvb_get_letohl(tvb, offset);
}
}
@@ -2345,7 +2345,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
offset += 1;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
- proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, FALSE);
+ proto_tree_add_item(slsk_tree, hf_slsk_username, tvb, offset+4, len, ENC_ASCII|ENC_NA);
offset += 4+len;
len = tvb_get_letohl(tvb, offset);
proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len);
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 80902c6064..1a002224fa 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -747,7 +747,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
/* server name */
namelen = tvb_strsize(tvb, offset);
proto_tree_add_item(tree, hf_server_name,
- tvb, offset, namelen, TRUE);
+ tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
break;
@@ -776,7 +776,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
for (i = 0; i < server_count; i++) {
namelen = tvb_strsize(tvb, offset);
proto_tree_add_item(tree, hf_backup_server,
- tvb, offset, namelen, TRUE);
+ tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
}
break;
@@ -785,7 +785,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
/* master browser server name */
namelen = tvb_strsize(tvb, offset);
proto_tree_add_item(tree, hf_mb_server_name,
- tvb, offset, namelen, TRUE);
+ tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
break;
@@ -813,7 +813,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
/* name of browser to promote */
namelen = tvb_strsize(tvb, offset);
proto_tree_add_item(tree, hf_browser_to_promote,
- tvb, offset, namelen, TRUE);
+ tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
break;
}
@@ -914,7 +914,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", host_name);
}
proto_tree_add_item(tree, hf_server_name,
- tvb, offset, namelen, TRUE);
+ tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
/* master browser server name or server comment */
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 88b7a1f3b1..5ba6fc5607 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -186,7 +186,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb,
/* mailslot name */
len = tvb_strsize(mshdr_tvb, offset);
- proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, TRUE);
+ proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, ENC_ASCII|ENC_NA);
offset += len;
proto_item_set_len(item, offset);
}
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index e14e63510a..59818e69cc 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -694,21 +694,21 @@ add_logon_args(tvbuff_t *tvb, int offset, int count, packet_info *pinfo _U_,
}
/* user name */
- proto_tree_add_item(tree, hf_user_name, tvb, offset, 21, TRUE);
+ proto_tree_add_item(tree, hf_user_name, tvb, offset, 21, ENC_ASCII|ENC_NA);
offset += 21;
/* pad1 */
offset += 1;
/* password */
- proto_tree_add_item(tree, hf_password, tvb, offset, 15, TRUE);
+ proto_tree_add_item(tree, hf_password, tvb, offset, 15, ENC_ASCII|ENC_NA);
offset += 15;
/* pad2 */
offset += 1;
/* workstation name */
- proto_tree_add_item(tree, hf_workstation_name, tvb, offset, 16, TRUE);
+ proto_tree_add_item(tree, hf_workstation_name, tvb, offset, 16, ENC_ASCII|ENC_NA);
offset += 16;
return offset;
}
@@ -2694,7 +2694,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
/* parameter descriptor */
param_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_param_desc, p_tvb, offset,
- descriptor_len, TRUE);
+ descriptor_len, ENC_ASCII|ENC_NA);
if (!pinfo->fd->flags.visited) {
/*
* Save the parameter descriptor for future use.
@@ -2707,7 +2707,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
/* return descriptor */
data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_return_desc, p_tvb, offset,
- descriptor_len, TRUE);
+ descriptor_len, ENC_ASCII|ENC_NA);
if (!pinfo->fd->flags.visited) {
/*
* Save the return descriptor for future use.
@@ -2732,7 +2732,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
*/
aux_data_descrip = tvb_get_const_stringz(p_tvb, offset, &descriptor_len);
proto_tree_add_item(tree, hf_aux_data_desc, p_tvb, offset,
- descriptor_len, TRUE);
+ descriptor_len, ENC_ASCII|ENC_NA);
if (!pinfo->fd->flags.visited) {
/*
* Save the auxiliary data descriptor for
@@ -3810,7 +3810,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb,
/* XXX - can this be Unicode? */
proto_tree_add_item(pipe_tree,
hf_pipe_getinfo_pipe_name,
- d_tvb, offset, pipe_namelen, TRUE);
+ d_tvb, offset, pipe_namelen, ENC_ASCII|ENC_NA);
break;
}
}
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 37b6dd5a60..3c62b11a2f 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -9839,7 +9839,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_,
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
/* buffer format */
@@ -9852,7 +9852,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_,
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
/* buffer format */
@@ -9870,7 +9870,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_,
/* message */
CHECK_BYTE_COUNT(message_len);
proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len,
- ENC_LITTLE_ENDIAN);
+ ENC_ASCII|ENC_NA);
COUNT_BYTES(message_len);
END_OF_SMB
@@ -9899,7 +9899,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
/* buffer format */
@@ -9912,7 +9912,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
END_OF_SMB
@@ -9965,7 +9965,7 @@ dissect_send_multi_block_message_text_request(tvbuff_t *tvb, packet_info *pinfo
/* message */
CHECK_BYTE_COUNT(message_len);
proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len,
- ENC_LITTLE_ENDIAN);
+ ENC_ASCII|ENC_NA);
COUNT_BYTES(message_len);
END_OF_SMB
@@ -9994,7 +9994,7 @@ dissect_forwarded_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_forwarded_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
END_OF_SMB
@@ -10023,7 +10023,7 @@ dissect_get_machine_name_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
name_len = tvb_strsize(tvb, offset);
CHECK_BYTE_COUNT(name_len);
proto_tree_add_item(tree, hf_smb_machine_name, tvb, offset,
- name_len, ENC_LITTLE_ENDIAN);
+ name_len, ENC_ASCII|ENC_NA);
COUNT_BYTES(name_len);
END_OF_SMB
@@ -11921,7 +11921,7 @@ dissect_4_2_16_2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
CHECK_BYTE_COUNT_SUBR(name_len + 1);
proto_tree_add_item(
subtree, hf_smb_ea_name, tvb, offset, name_len + 1,
- ENC_LITTLE_ENDIAN);
+ ENC_ASCII|ENC_NA);
COUNT_BYTES_SUBR(name_len + 1);
/* EA data */
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 3b966ba220..0c021be3af 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -722,10 +722,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
cmdresp_tree = proto_item_add_subtree(ti, ett_smtp_cmdresp);
proto_tree_add_item(cmdresp_tree, hf_smtp_req_command, tvb,
- loffset, cmdlen, FALSE);
+ loffset, cmdlen, ENC_ASCII|ENC_NA);
if (linelen > 5) {
proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb,
- loffset + 5, linelen - 5, FALSE);
+ loffset + 5, linelen - 5, ENC_ASCII|ENC_NA);
}
if (smtp_data_desegment && !spd_frame_data->more_frags) {
@@ -820,7 +820,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (linelen >= 4) {
proto_tree_add_item(cmdresp_tree, hf_smtp_rsp_parameter, tvb,
- offset + 4, linelen - 4, FALSE);
+ offset + 4, linelen - 4, ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index a272f6632d..c943dbbc7e 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -503,7 +503,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* display user name */
username_len = tvb_strsize(tvb, offset);
proto_tree_add_item( tree, hf_user_name, tvb, offset,
- username_len, FALSE);
+ username_len, ENC_ASCII|ENC_NA);
offset += username_len;
if ( ipaddr[0] == 0 && ipaddr[1] == 0 &&
ipaddr[2] == 0 && ipaddr[3] != 0) {
@@ -511,7 +511,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
domainname_len = tvb_strsize(tvb, offset);
proto_tree_add_item( tree, hf_v4a_dns_name,
tvb, offset, domainname_len,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index d28cd2b99a..3e7684aa83 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -2553,7 +2553,7 @@ dissect_spice_link_common_header(tvbuff_t *tvb, proto_tree *tree)
{
if (tree) {
/* dissect common header */
- proto_tree_add_item(tree, hf_spice_magic, tvb, 0, 4, ENC_ASCII|ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(tree, hf_spice_magic, tvb, 0, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(tree, hf_major_version, tvb, 4, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_minor_version, tvb, 8, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_message_size, tvb, 12, 4, ENC_LITTLE_ENDIAN);
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 36686c0d7a..569516497c 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -394,7 +394,7 @@ dissect_authblk_v2(tvbuff_t *tvb, int offset, proto_tree *tree)
length = tvb_get_ntohs(tvb, offset + 8);
proto_tree_add_uint(tree, hf_srvloc_authblkv2_slpspilen, tvb, offset + 8, 2, length);
offset += 10;
- proto_tree_add_item(tree, hf_srvloc_authblkv2_slpspi, tvb, offset, length, TRUE);
+ proto_tree_add_item(tree, hf_srvloc_authblkv2_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
/* add code in here to handle Structured Authentication Block */
return offset;
@@ -789,7 +789,7 @@ dissect_url_entry_v2(tvbuff_t *tvb, int offset, proto_tree *tree)
proto_tree_add_uint(tree, hf_srvloc_url_urllen, tvb, offset, 2,
url_len);
offset += 2;
- proto_tree_add_item(tree, hf_srvloc_url_url, tvb, offset, url_len, TRUE);
+ proto_tree_add_item(tree, hf_srvloc_url_url, tvb, offset, url_len, ENC_ASCII|ENC_NA);
offset += url_len;
num_auths = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(tree, hf_srvloc_url_numauths, tvb, offset, 1,
@@ -1086,7 +1086,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_fstr(pinfo->cinfo, COL_INFO, ", V2 XID - %u", tvb_get_ntohs(tvb, offset + 10));
lang_tag_len = tvb_get_ntohs(tvb, offset + 12);
proto_tree_add_uint(srvloc_tree, hf_srvloc_langtaglen, tvb, offset + 12, 2, lang_tag_len);
- proto_tree_add_item(srvloc_tree, hf_srvloc_langtag, tvb, offset + 14, lang_tag_len, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_langtag, tvb, offset + 14, lang_tag_len, ENC_ASCII|ENC_NA);
offset += 14+lang_tag_len;
switch (function) {
@@ -1096,35 +1096,35 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_prlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_prlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_srvtypelen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_srvtypelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_srvtypelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_predicatelen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_predicate, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_predicate, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreq_slpspilen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_slpspi, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreq_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
break;
@@ -1151,14 +1151,14 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreg_srvtypelen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_srvtype, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_srvtype, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvreg_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvreg_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
@@ -1182,7 +1182,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvdereg_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
offset = dissect_url_entry_v2(tvb, offset, srvloc_tree);
@@ -1190,7 +1190,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvdereg_taglistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_taglist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvdereg_taglist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
break;
@@ -1209,35 +1209,35 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_prlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_prlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_urllen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_url, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_url, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_taglistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_taglist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_taglist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_attrreq_slpspilen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_slpspi, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_attrreq_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
break;
@@ -1281,28 +1281,28 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_urllen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_url, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_url, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_attrlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_attrlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_attrlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_daadvert_slpspilen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_slpspi, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_daadvert_slpspi, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
count = tvb_get_guint8(tvb, offset);
@@ -1319,7 +1319,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_prlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_prlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_prlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
@@ -1330,7 +1330,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_nameauthlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_nameauthlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_nameauthlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
}
@@ -1338,7 +1338,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtypereq_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvtypereq_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
break;
@@ -1354,7 +1354,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_srvtyperply_srvtypelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_srvtyperply_srvtypelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_srvtyperply_srvtypelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
break;
@@ -1364,21 +1364,21 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_urllen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_url, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_url, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_scopelistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_scopelist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_scopelist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
length = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(srvloc_tree, hf_srvloc_saadvert_attrlistlen, tvb, offset, 2, length);
offset += 2;
if (length) {
- proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_attrlist, tvb, offset, length, TRUE);
+ proto_tree_add_item(srvloc_tree, hf_srvloc_saadvert_attrlist, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
}
count = tvb_get_guint8(tvb, offset);
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index a9ff71da77..e3a96ecc67 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -890,7 +890,7 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
}
if (tree ) {
ssh_proto_tree_add_item(tree, hf_ssh_protocol,
- tvb, offset, linelen, FALSE);
+ tvb, offset, linelen, ENC_ASCII|ENC_NA);
}
offset+=linelen;
return offset;
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index 2d6559192b..3324f2a51c 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -550,7 +550,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(starteamroot_tree, tvb, offset, 16, STARTEAM_TEXT_PH);
starteam_tree = proto_item_add_subtree(ti, ett_starteam_ph);
- proto_tree_add_item(starteam_tree, hf_starteam_ph_signature, tvb, offset + 0, 4, FALSE);
+ proto_tree_add_item(starteam_tree, hf_starteam_ph_signature, tvb, offset + 0, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(starteam_tree, hf_starteam_ph_packet_size, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(starteam_tree, hf_starteam_ph_data_size, tvb, offset + 8, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(starteam_tree, hf_starteam_ph_data_flags, tvb, offset + 12, 4, ENC_LITTLE_ENDIAN);
@@ -562,7 +562,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
starteam_tree = proto_item_add_subtree(ti, ett_starteam_id);
proto_tree_add_item(starteam_tree, hf_starteam_id_revision_level, tvb, offset + 0, 2, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(starteam_tree, hf_starteam_id_client, tvb, offset + 2, 16, TRUE);
+ proto_tree_add_item(starteam_tree, hf_starteam_id_client, tvb, offset + 2, 16, ENC_ASCII|ENC_NA);
proto_tree_add_item(starteam_tree, hf_starteam_id_connect, tvb, offset + 18, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(starteam_tree, hf_starteam_id_component, tvb, offset + 22, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(starteam_tree, hf_starteam_id_command, tvb, offset + 26, 4, ENC_LITTLE_ENDIAN);
@@ -574,7 +574,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(tvb_length_remaining(tvb, offset) > 0){
ti = proto_tree_add_text(starteamroot_tree, tvb, offset, -1, STARTEAM_TEXT_DATA);
starteam_tree = proto_item_add_subtree(ti, ett_starteam_data);
- proto_tree_add_item(starteam_tree, hf_starteam_data_data, tvb, offset, tvb_length_remaining(tvb, offset), TRUE);
+ proto_tree_add_item(starteam_tree, hf_starteam_data_data, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
}
}
}
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 996fd10ae0..f74878024f 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -677,7 +677,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case USERNAME:
- proto_tree_add_item(att_tree, stun_att_username, tvb, offset, att_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(att_tree, stun_att_username, tvb, offset, att_length, ENC_ASCII|ENC_NA);
proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
col_append_fstr(
pinfo->cinfo, COL_INFO,
@@ -722,7 +722,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (att_length < 5)
break;
- proto_tree_add_item(att_tree, stun_att_error_reason, tvb, offset+4, att_length-4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(att_tree, stun_att_error_reason, tvb, offset+4, att_length-4, ENC_ASCII|ENC_NA);
proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset+4, att_length-4));
col_append_fstr(
@@ -744,7 +744,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case REALM:
- proto_tree_add_item(att_tree, stun_att_realm, tvb, offset, att_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(att_tree, stun_att_realm, tvb, offset, att_length, ENC_ASCII|ENC_NA);
proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
col_append_fstr(
pinfo->cinfo, COL_INFO,
@@ -756,7 +756,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case NONCE:
- proto_tree_add_item(att_tree, stun_att_nonce, tvb, offset, att_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(att_tree, stun_att_nonce, tvb, offset, att_length, ENC_ASCII|ENC_NA);
proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
col_append_fstr(
pinfo->cinfo, COL_INFO,
@@ -877,7 +877,7 @@ case EVEN_PORT:
break;
case SOFTWARE:
- proto_tree_add_item(att_tree, stun_att_software, tvb, offset, att_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(att_tree, stun_att_software, tvb, offset, att_length, ENC_ASCII|ENC_NA);
if (att_length % 4 != 0)
proto_tree_add_uint(att_tree, stun_att_padding, tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4));
break;
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index e2da240fde..33e83dae62 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -541,7 +541,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
guint16 info_string_length;
info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
@@ -1454,7 +1454,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
guint16 hostname_length;
hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_sua_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_sua_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", hostname_length,
tvb_get_ephemeral_string(parameter_tvb, HOSTNAME_OFFSET, hostname_length));
}
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index 0bc4390684..84a408f87d 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -230,7 +230,7 @@ static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, pr
if (tvb_length_remaining(tvb, offset + 11) != 0)
{
proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 11, 4, ENC_NA);
- proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 15, -1, FALSE);
+ proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 15, -1, ENC_ASCII|ENC_NA);
}
}
@@ -332,7 +332,7 @@ static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 5, 4, ENC_BIG_ENDIAN);
- proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 9, -1, FALSE);
+ proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 9, -1, ENC_ASCII|ENC_NA);
}
static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index 0cd062f770..9e3b9315f7 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -286,7 +286,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
msg_off, pri);
}
proto_tree_add_item(syslog_tree, hf_syslog_msg, tvb, msg_off,
- msg_len, FALSE);
+ msg_len, ENC_ASCII|ENC_NA);
if (mtp3_tvb) {
proto_item *mtp3_item;
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 6ade3b5267..0bfb0e4de6 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -273,7 +273,7 @@ dissect_tapa_discover_unknown_new_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_t
if (is_ascii)
proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuetext,
- tvb, offset, item_length, ENC_BIG_ENDIAN);
+ tvb, offset, item_length, ENC_ASCII|ENC_NA);
else
proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuehex,
tvb, offset, item_length, ENC_NA);
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 640b955ca6..a4c3b5a78b 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -1861,7 +1861,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto
proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA);
break;
case TDS_DATA_TYPE_BIGVARCHR: /* VarChar */
- proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, TRUE);
+ proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, ENC_ASCII|ENC_NA);
break;
case TDS_DATA_TYPE_NVARCHAR: /* NVarChar */
string_value = tvb_get_ephemeral_faked_unicode(tvb, *offset, length / 2, TRUE);
@@ -2014,7 +2014,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto
break;
case TDS_DATA_TYPE_BIGVARCHR: /* VarChar */
case TDS_DATA_TYPE_BIGCHAR: /* Char */
- proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, TRUE);
+ proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, ENC_ASCII|ENC_NA);
break;
case TDS_DATA_TYPE_NVARCHAR: /* NVarChar */
case TDS_DATA_TYPE_NCHAR: /* NChar */
@@ -2082,7 +2082,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case TDS_PROTOCOL_4:
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_tds_rpc_name_length8, tvb, offset, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(tree, hf_tds_rpc_name, tvb, offset + 1, len, TRUE);
+ proto_tree_add_item(tree, hf_tds_rpc_name, tvb, offset + 1, len, ENC_ASCII|ENC_NA);
offset += 1 + len;
break;
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 12a6e597dd..2e5fd3d20a 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -509,7 +509,7 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree)
offset+=4;
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA);
offset+=6;
- proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
}
@@ -539,7 +539,7 @@ static void ts2_parse_switchchannel(tvbuff_t *tvb, proto_tree *ts2_tree)
offset=0;
proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset+=4;
- proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
}
@@ -589,11 +589,11 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree)
offset=0;
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, ENC_NA);
offset+=2;
- proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
- proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
- proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA);
@@ -635,13 +635,13 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree)
proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset+=2;
tvb_get_ephemeral_stringz(tvb, offset, &string_len);
- proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , ENC_ASCII|ENC_NA);
offset+=string_len;
tvb_get_ephemeral_stringz(tvb, offset, &string_len);
- proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset,string_len ,TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset,string_len ,ENC_ASCII|ENC_NA);
offset+=string_len;
tvb_get_ephemeral_stringz(tvb, offset, &string_len);
- proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset,string_len , TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset,string_len , ENC_ASCII|ENC_NA);
offset+=string_len;
}
}
@@ -678,7 +678,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree)
proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN);
ts2_add_statusflags(tvb, ts2_tree, offset);
offset+=2;
- proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
offset+=30;
x++;
}
@@ -782,27 +782,27 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, ENC_LITTLE_ENDIAN);
break;
case TS2T_LOGINREQUEST:
- proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
conversation_data->server_port=pinfo->destport;
conversation_data->server_addr=pinfo->dst;
break;
case TS2T_LOGINREPLY:
- proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_LITTLE_ENDIAN);
- proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA);
proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA);
- proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
break;
}
break;
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index eb01556b4e..df9201b6e8 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -1841,7 +1841,7 @@ telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
*/
linelen = next_offset - offset;
- proto_tree_add_item(tree, hf_telnet_data, tvb, offset, linelen, FALSE);
+ proto_tree_add_item(tree, hf_telnet_data, tvb, offset, linelen, ENC_ASCII|ENC_NA);
offset = next_offset;
}
}
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index b8491eccc2..d5af2a572d 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -138,9 +138,9 @@ tftp_dissect_options(tvbuff_t *tvb, packet_info *pinfo, int offset,
opt_tree = proto_item_add_subtree(opt_item, ett_tftp_option);
proto_tree_add_item(opt_tree, hf_tftp_option_name, tvb, offset,
- option_len, ENC_BIG_ENDIAN);
+ option_len, ENC_ASCII|ENC_NA);
proto_tree_add_item(opt_tree, hf_tftp_option_value, tvb, value_offset,
- value_len, ENC_BIG_ENDIAN);
+ value_len, ENC_ASCII|ENC_NA);
offset += option_len + value_len;
@@ -207,7 +207,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
case TFTP_RRQ:
i1 = tvb_strsize(tvb, offset);
proto_tree_add_item(tftp_tree, hf_tftp_source_file,
- tvb, offset, i1, ENC_BIG_ENDIAN);
+ tvb, offset, i1, ENC_ASCII|ENC_NA);
tftp_info->source_file = tvb_get_seasonal_string(tvb, offset, i1);
@@ -218,7 +218,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
i1 = tvb_strsize(tvb, offset);
proto_tree_add_item(tftp_tree, hf_tftp_transfer_type,
- tvb, offset, i1, ENC_BIG_ENDIAN);
+ tvb, offset, i1, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s",
tvb_format_stringzpad(tvb, offset, i1));
@@ -232,7 +232,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
case TFTP_WRQ:
i1 = tvb_strsize(tvb, offset);
proto_tree_add_item(tftp_tree, hf_tftp_destination_file,
- tvb, offset, i1, ENC_BIG_ENDIAN);
+ tvb, offset, i1, ENC_ASCII|ENC_NA);
tftp_info->destination_file =
tvb_get_seasonal_string(tvb, offset, i1);
@@ -244,7 +244,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
i1 = tvb_strsize(tvb, offset);
proto_tree_add_item(tftp_tree, hf_tftp_transfer_type,
- tvb, offset, i1, ENC_BIG_ENDIAN);
+ tvb, offset, i1, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s",
tvb_format_stringzpad(tvb, offset, i1));
@@ -300,7 +300,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
i1 = tvb_strsize(tvb, offset);
proto_tree_add_item(tftp_tree, hf_tftp_error_string, tvb, offset,
- i1, ENC_BIG_ENDIAN);
+ i1, ENC_ASCII|ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Message: %s",
tvb_format_stringzpad(tvb, offset, i1));
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index 6cf468455d..deb40ee746 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -1030,7 +1030,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i
if ((message_type == TIPCv2_RESET_MSG)
|| ((message_type == TIPCv2_STATE_MSG) && ((msg_size-(orig_hdr_size*4)) != 0))) /* is allowed */
- proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_instance, tipc_tvb, offset, -1, FALSE);
+ proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_instance, tipc_tvb, offset, -1, ENC_ASCII|ENC_NA);
/* the bearer instance string is padded with \0 to the next word boundry */
b_inst_strlen = tvb_strsize(tipc_tvb, offset);
offset += b_inst_strlen;
@@ -1892,7 +1892,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr
switch (user) {
case TIPC_LINK_PROTOCOL:
- proto_tree_add_item(tipc_tree, hf_tipc_bearer_name, tvb, offset, -1, FALSE);
+ proto_tree_add_item(tipc_tree, hf_tipc_bearer_name, tvb, offset, -1, ENC_ASCII|ENC_NA);
break;
case TIPC_CHANGEOVER_PROTOCOL:
switch (msg_type) {
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 3c8beb4ee6..a833c25462 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -128,12 +128,12 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ( g_ascii_strcasecmp(field,"tivoconnect") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_flavor, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
}
else if ( g_ascii_strcasecmp(field,"method") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_method, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
}
else if ( g_ascii_strcasecmp(field,"platform") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
@@ -143,24 +143,24 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
else if ( g_ascii_strcasecmp(field,"machine") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_machine, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
packet_machine = value;
}
else if ( g_ascii_strcasecmp(field,"identity") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_identity, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
packet_identity = value;
}
else if ( g_ascii_strcasecmp(field,"services") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_services, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
}
else if ( g_ascii_strcasecmp(field,"swversion") == 0 ) {
proto_tree_add_item(tivoconnect_tree,
hf_tivoconnect_version, tvb, offset+fieldlen,
- length-fieldlen-1, FALSE);
+ length-fieldlen-1, ENC_ASCII|ENC_NA);
}
else {
/* unknown field! */
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index 4c8537b2e4..4317af4064 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -293,14 +293,14 @@ static gint dissect_counted_address(tvbuff_t *tvb, gint offset, packet_info *pin
proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_tnef_attribute_display_name, tvb, offset, length, FALSE);
+ proto_tree_add_item(tree, hf_tnef_attribute_display_name, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
length = tvb_get_letohs(tvb, offset);
proto_tree_add_item(tree, hf_tnef_value_length, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- proto_tree_add_item(tree, hf_tnef_attribute_email_address, tvb, offset, length, FALSE);
+ proto_tree_add_item(tree, hf_tnef_attribute_email_address, tvb, offset, length, ENC_ASCII|ENC_NA);
offset += length;
return offset;
@@ -576,10 +576,10 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(attr_tree, hf_tnef_version, tvb, offset, length, ENC_LITTLE_ENDIAN);
break;
case ATT_MESSAGE_CLASS:
- proto_tree_add_item(attr_tree, hf_tnef_message_class, tvb, offset, length, TRUE);
+ proto_tree_add_item(attr_tree, hf_tnef_message_class, tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case ATT_ORIGINAL_MESSAGE_CLASS:
- proto_tree_add_item(attr_tree, hf_tnef_original_message_class, tvb, offset, length, TRUE);
+ proto_tree_add_item(attr_tree, hf_tnef_original_message_class, tvb, offset, length, ENC_ASCII|ENC_NA);
break;
case ATT_MAPI_PROPS:
item = proto_tree_add_item(attr_tree, hf_tnef_mapi_props, tvb, offset, length, ENC_NA);
@@ -613,7 +613,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case ATP_STRING:
- proto_tree_add_item(attr_tree, hf_tnef_attribute_string, tvb, offset, length, FALSE);
+ proto_tree_add_item(attr_tree, hf_tnef_attribute_string, tvb, offset, length, ENC_ASCII|ENC_NA);
proto_item_append_text(attr_item, " %s", tvb_get_ephemeral_string(tvb, offset, length));
break;
default:
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 998ac4eab6..dd96940307 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -500,7 +500,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ( connect_tree && cd_len > 0)
{
proto_tree_add_item(connect_tree, hf_tns_connect_data, tvb,
- tns_offset+cd_offset, -1, FALSE);
+ tns_offset+cd_offset, -1, ENC_ASCII|ENC_NA);
}
return;
}
@@ -616,7 +616,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ( accept_tree && accept_len > 0)
{
proto_tree_add_item(accept_tree, hf_tns_accept_data, tvb,
- tns_offset+accept_offset, -1, FALSE);
+ tns_offset+accept_offset, -1, ENC_ASCII|ENC_NA);
}
return;
}
@@ -665,7 +665,7 @@ static void dissect_tns_refuse(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ( refuse_tree )
{
proto_tree_add_item(refuse_tree, hf_tns_refuse_data, tvb,
- offset, -1, FALSE);
+ offset, -1, ENC_ASCII|ENC_NA);
}
return;
}
@@ -707,7 +707,7 @@ static void dissect_tns_abort(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ( abort_tree )
{
proto_tree_add_item(abort_tree, hf_tns_abort_data, tvb,
- offset, -1, FALSE);
+ offset, -1, ENC_ASCII|ENC_NA);
}
return;
}
@@ -803,7 +803,7 @@ static void dissect_tns_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo,
if ( redirect_tree )
{
proto_tree_add_item(redirect_tree, hf_tns_redirect_data, tvb,
- offset, -1, FALSE);
+ offset, -1, ENC_ASCII|ENC_NA);
}
return;
}
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index dc6e8a1982..628ca31f4b 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -163,7 +163,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tsp_tree) {
proto_tree_add_item(tsp_tree, hf_tsp_name, tvb, 12,
- -1, FALSE);
+ -1, ENC_ASCII|ENC_NA);
}
}
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 91a1b54ceb..f1146593cb 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -180,7 +180,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* Since the frame size is limited this should work ok */
if (tvb_get_guint8(tvb, 0x14)>=0x20){
- name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, FALSE);
+ name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, ENC_ASCII|ENC_NA);
network_tree = proto_item_add_subtree(name_item, ett_network);
str_name=tvb_get_ephemeral_stringz(tvb, 0x14, &str_len);
diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c
index ae6e14ea4d..910aa07035 100644
--- a/epan/dissectors/packet-ua.c
+++ b/epan/dissectors/packet-ua.c
@@ -631,7 +631,7 @@ static int DissectTLV_data(tvbuff_t *pTvb, proto_tree *pTlv, int iOffs, guint8 u
case 138: /*Label_138*/
{
proto_item_append_text(pTlv, "'%s'", tvb_get_string(pTvb, iOffs, u8Length));
- proto_tree_add_item(pTlv, hf_tlv_label, pTvb, iOffs, u8Length, ENC_NA);
+ proto_tree_add_item(pTlv, hf_tlv_label, pTvb, iOffs, u8Length, ENC_ASCII|ENC_NA);
/* append text on NOE level */
pNoeItem = proto_item_get_parent(pTlv);
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index f171c4ce35..a16a16a6d7 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -1004,7 +1004,7 @@ ucp_handle_XSer(proto_tree *tree, tvbuff_t *tvb)
len = len * 16 + AHex2Bin(intval);
proto_tree_add_uint(tree, hf_xser_service, tvb, offset, 2, service);
proto_tree_add_uint(tree, hf_xser_length, tvb, offset+2, 2, len);
- proto_tree_add_item(tree, hf_xser_data, tvb, offset+4, len*2, FALSE);
+ proto_tree_add_item(tree, hf_xser_data, tvb, offset+4, len*2, ENC_ASCII|ENC_NA);
offset += 4 + (2 * len);
}
}
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index ec79657979..1c0c510727 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -1327,7 +1327,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
* 3629 [50]. This means that the 1st octet of the UTF-8 string is coded in octet 4 and the
* last octet of the UTF-8 string is coded in the last octet of this IE (octet n).
*/
- proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_Service_name_value, tvb, ie_offset, ie_len -1, FALSE);
+ proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_Service_name_value, tvb, ie_offset, ie_len -1, ENC_ASCII|ENC_NA);
break;
case 62:
/* 11.2.62 GAN Service Zone Information
diff --git a/epan/dissectors/packet-usb-at.c b/epan/dissectors/packet-usb-at.c
index e9d119bc1c..e439453d35 100644
--- a/epan/dissectors/packet-usb-at.c
+++ b/epan/dissectors/packet-usb-at.c
@@ -92,7 +92,7 @@ static void dissect_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
at_tree = proto_item_add_subtree(item, ett_at);
/* Command */
- proto_tree_add_item(at_tree, hf_at_command, tvb, 0, len, ENC_NA);
+ proto_tree_add_item(at_tree, hf_at_command, tvb, 0, len, ENC_ASCII|ENC_NA);
proto_item_append_text(item, ": %s", tvb_format_text_wsp(tvb, 0, len));
}
}
diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c
index f714bbfdf8..2fbf95ffe5 100644
--- a/epan/dissectors/packet-v52.c
+++ b/epan/dissectors/packet-v52.c
@@ -1089,7 +1089,7 @@ dissect_resource_unavailable(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_item(info_tree, hf_v52_info_element, info_tvb, info_offset, info_element_length, ENC_BIG_ENDIAN);
proto_tree_add_item(info_tree, hf_v52_info_length, info_tvb, info_offset+1, info_element_length, ENC_BIG_ENDIAN);
proto_item_append_text(ti_info, " %s (0x%x)",val_to_str(info_element, info_element_values, "unknown info element"),info_element);
- proto_tree_add_item(info_tree, hf_v52_res_unavailable, info_tvb, info_offset+2, info_element_length, FALSE);
+ proto_tree_add_item(info_tree, hf_v52_res_unavailable, info_tvb, info_offset+2, info_element_length, ENC_ASCII|ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, " | ");
col_append_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(info_tvb, info_offset), info_element_values_short, "Unknown element"));
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index ac4a33ff9a..ecfc89f379 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -200,7 +200,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree
if_id_length = tvb_get_ntohs(parameter_tvb, TEXT_IF_ID_LENGTH_OFFSET) - TEXT_IF_ID_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_text_if_id, parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length, FALSE);
+ proto_tree_add_item(parameter_tree, hf_text_if_id, parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (0x%.*s)", if_id_length,
tvb_get_ephemeral_string(parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length));
}
@@ -362,7 +362,7 @@ dissect_draft_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete
proto_tree_add_item(parameter_tree, hf_draft_error_code, parameter_tvb, offset, MGMT_ERROR_CODE_LENGTH, ENC_BIG_ENDIAN);
offset += MGMT_ERROR_CODE_LENGTH ;
if( tvb_length_remaining(parameter_tvb,offset) > 0 )
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,FALSE);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,ENC_ASCII|ENC_NA);
}
/*----------------------Error Indication (Draft)-------------------------------*/
@@ -524,7 +524,7 @@ dissect_asp_msg_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p
{
guint16 adaptation_layer_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
- proto_tree_add_item(parameter_tree, hf_adaptation_layer_id, parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length, FALSE);
+ proto_tree_add_item(parameter_tree, hf_adaptation_layer_id, parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", adaptation_layer_id_length,
tvb_get_ephemeral_string(parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length));
}
@@ -533,7 +533,7 @@ static void
dissect_scn_protocol_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint16 id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
- proto_tree_add_item(parameter_tree, hf_scn_protocol_id, parameter_tvb, PARAMETER_VALUE_OFFSET, id_length, FALSE);
+ proto_tree_add_item(parameter_tree, hf_scn_protocol_id, parameter_tvb, PARAMETER_VALUE_OFFSET, id_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", id_length,
tvb_get_ephemeral_string(parameter_tvb, PARAMETER_VALUE_OFFSET, id_length));
}
@@ -825,7 +825,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
if(iua_version == DRAFT) info_string_length += 4;
if(info_string_length > 4){
info_string_length -= PARAMETER_HEADER_LENGTH;
- proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, FALSE);
+ proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_get_ephemeral_string(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index bac63631f1..b28b9d1522 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -794,7 +794,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset,
return TRUE; /* we still hope to get a SERVER_VERSION message some day. Do not proceed yet */
proto_tree_add_item(tree, hf_vnc_server_proto_ver, tvb, 4,
- 7, FALSE);
+ 7, ENC_ASCII|ENC_NA);
per_conversation_info->server_proto_ver =
g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
per_conversation_info->server_port = pinfo->srcport;
@@ -812,7 +812,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset,
return TRUE; /* we still hope to get a CLIENT_VERSION message some day. Do not proceed yet */
proto_tree_add_item(tree, hf_vnc_client_proto_ver, tvb,
- 4, 7, FALSE);
+ 4, 7, ENC_ASCII|ENC_NA);
per_conversation_info->client_proto_ver =
g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
@@ -1104,7 +1104,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset,
offset += 4;
proto_tree_add_item(tree, hf_vnc_auth_error, tvb,
- offset, text_len, FALSE);
+ offset, text_len, ENC_ASCII|ENC_NA);
}
return TRUE; /* All versions: Do not continue
@@ -1192,7 +1192,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset,
proto_tree_add_item(tree, hf_vnc_desktop_name,
tvb, offset, desktop_name_len,
- FALSE);
+ ENC_ASCII|ENC_NA);
}
if(per_conversation_info->tight_enabled == TRUE)
@@ -1576,7 +1576,7 @@ vnc_client_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
*offset += 4;
proto_tree_add_item(tree, hf_vnc_client_cut_text, tvb, *offset,
- text_len, FALSE);
+ text_len, ENC_ASCII|ENC_NA);
*offset += text_len;
}
@@ -2484,7 +2484,7 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
VNC_BYTES_NEEDED(text_len);
proto_tree_add_item(tree, hf_vnc_server_cut_text, tvb, *offset,
- text_len, FALSE);
+ text_len, ENC_ASCII|ENC_NA);
*offset += text_len;
return *offset;
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 3157731a40..cadb8136ce 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -169,7 +169,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 1;
proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
- 32, FALSE);
+ 32, ENC_ASCII|ENC_NA);
offset += 32;
proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb,
@@ -203,7 +203,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 1;
proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
- 32, FALSE);
+ 32, ENC_ASCII|ENC_NA);
offset += 32;
proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb,
@@ -228,7 +228,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 1;
proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
- 32, FALSE);
+ 32, ENC_ASCII|ENC_NA);
offset += 32;
proto_tree_add_item(vtp_tree, hf_vtp_start_value, tvb,
@@ -244,7 +244,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 1;
proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
- 32, FALSE);
+ 32, ENC_ASCII|ENC_NA);
offset += 32;
proto_tree_add_item(vtp_tree, hf_vtp_pruning_first_vid, tvb, offset,
@@ -398,7 +398,7 @@ dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree)
if (vlan_info_left < vlan_name_len)
return -1;
proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name, tvb, offset,
- vlan_name_len, FALSE);
+ vlan_name_len, ENC_ASCII|ENC_NA);
offset += vlan_name_len;
vlan_info_left -= vlan_name_len;
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index ff1b68154b..fdee29eb97 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -6824,7 +6824,7 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb, 1, publicid_len, publicid);
} else { /* Public identifier in string table */
proto_tree_add_item (wbxml_tree, hf_wbxml_public_id_literal,
- tvb, 1, publicid_len, FALSE);
+ tvb, 1, publicid_len, ENC_ASCII|ENC_NA);
}
offset = 1 + publicid_len;
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index b50145aa50..7ac4ba2e02 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -452,7 +452,7 @@ static void dissect_listen_channel(proto_item *tlv_root, proto_item *tlv_item,
tvbuff_t *tvb, int offset)
{
proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_country, tvb,
- offset + 3, 3, FALSE);
+ offset + 3, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_oper_class, tvb,
offset + 6, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_number, tvb,
@@ -468,7 +468,7 @@ static void dissect_operating_channel(proto_item *tlv_root,
tvbuff_t *tvb, int offset)
{
proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_country, tvb,
- offset + 3, 3, FALSE);
+ offset + 3, 3, ENC_ASCII|ENC_NA);
proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_oper_class, tvb,
offset + 6, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_number, tvb,
@@ -486,7 +486,7 @@ static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb,
guint8 num_chan;
proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_country, tvb,
- s_offset, 3, FALSE);
+ s_offset, 3, ENC_ASCII|ENC_NA);
s_offset += 3;
while (offset + 3 + slen > s_offset) {
@@ -596,7 +596,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo,
item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name,
tvb, s_offset,
nlen > attr_len ? attr_len : nlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
if (nlen != attr_len) {
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
"Invalid Device Name attribute");
@@ -656,7 +656,7 @@ static void dissect_wifi_p2p_group_id(proto_item *tlv_root,
proto_item_append_text(tlv_item, ": %s", ether_to_str(addr));
s_offset += 6;
proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_ssid, tvb,
- s_offset, offset + 3 + slen - s_offset, FALSE);
+ s_offset, offset + 3 + slen - s_offset, ENC_ASCII|ENC_NA);
}
static void dissect_wifi_p2p_group_bssid(packet_info *pinfo,
@@ -828,7 +828,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo,
item = proto_tree_add_item(tlv_root, hf_p2p_attr_gi_dev_name,
tvb, s_offset,
nlen > attr_len ? attr_len : nlen,
- FALSE);
+ ENC_ASCII|ENC_NA);
if (nlen != attr_len) {
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
"Invalid Device Name attribute");