From 19dcb725b61e384f665ad4b955f3b78f63e626d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 30 Nov 2021 02:53:49 +0000 Subject: [PATCH] epan: Remove STR_ASCII and STR_UNICODE These display bases work to replace unprintable characters so the name is a misnomer. In addition they are the same option and this display behaviour is not something that is configurable. This does not affect encodings because all our internal text strings need to be valid UTF-8 and the source encoding is specified using ENC_*. Remove the assertion for valid UTF-8 in proto.c because tvb_get_*_string() must return a valid UTF-8 string, always, and we don't need to assert that, it is expensive. --- doc/README.dissector | 2 +- epan/dissectors/asn1/credssp/credssp.cnf | 2 +- epan/dissectors/asn1/gsm_map/gsm_map.cnf | 2 +- .../asn1/gsm_map/packet-gsm_map-template.c | 2 +- epan/dissectors/asn1/ldap/ldap.cnf | 2 +- epan/dissectors/asn1/lpp/lpp.cnf | 2 +- epan/dissectors/asn1/lte-rrc/lte-rrc.cnf | 4 +- .../asn1/lte-rrc/packet-lte-rrc-template.c | 2 +- epan/dissectors/asn1/ngap/ngap.cnf | 4 +- .../asn1/ngap/packet-ngap-template.c | 2 +- epan/dissectors/asn1/nr-rrc/nr-rrc.cnf | 2 +- .../asn1/nr-rrc/packet-nr-rrc-template.c | 2 +- epan/dissectors/asn1/p1/p1.cnf | 30 +- epan/dissectors/asn1/p22/p22.cnf | 8 +- .../asn1/pkix1explicit/pkix1explicit.cnf | 4 +- epan/dissectors/asn1/rrc/rrc.cnf | 2 +- epan/dissectors/asn1/rtse/rtse.cnf | 4 +- .../asn1/s1ap/packet-s1ap-template.c | 2 +- epan/dissectors/asn1/s1ap/s1ap.cnf | 6 +- .../asn1/sabp/packet-sabp-template.c | 2 +- .../asn1/sbc-ap/packet-sbc-ap-template.c | 2 +- epan/dissectors/asn1/ulp/ulp.cnf | 6 +- epan/dissectors/asn1/x2ap/x2ap.cnf | 6 +- epan/dissectors/asn1/x509sat/x509sat.cnf | 8 +- epan/dissectors/asn1/xnap/xnap.cnf | 4 +- epan/dissectors/file-jpeg.c | 2 +- epan/dissectors/file-pcapng.c | 24 +- epan/dissectors/file-png.c | 4 +- epan/dissectors/packet-adb.c | 2 +- epan/dissectors/packet-adb_cs.c | 8 +- epan/dissectors/packet-adb_service.c | 16 +- epan/dissectors/packet-afp.c | 12 +- epan/dissectors/packet-ansi_637.c | 8 +- epan/dissectors/packet-at-ldf.c | 2 +- epan/dissectors/packet-atalk.c | 12 +- epan/dissectors/packet-bacapp.c | 8 +- epan/dissectors/packet-bgp.c | 8 +- epan/dissectors/packet-blip.c | 4 +- epan/dissectors/packet-bluecom.c | 8 +- epan/dissectors/packet-bluetooth.c | 6 +- epan/dissectors/packet-bpsec.c | 2 +- epan/dissectors/packet-bpv7.c | 20 +- epan/dissectors/packet-btatt.c | 4 +- epan/dissectors/packet-caneth.c | 2 +- epan/dissectors/packet-cell_broadcast.c | 6 +- epan/dissectors/packet-cose.c | 14 +- epan/dissectors/packet-cql.c | 24 +- epan/dissectors/packet-credssp.c | 2 +- epan/dissectors/packet-cups.c | 8 +- epan/dissectors/packet-daap.c | 2 +- epan/dissectors/packet-dbus.c | 22 +- epan/dissectors/packet-dhcpv6.c | 10 +- epan/dissectors/packet-dns.c | 4 +- epan/dissectors/packet-dpnet.c | 2 +- epan/dissectors/packet-drbd.c | 6 +- epan/dissectors/packet-dvbci.c | 42 +- epan/dissectors/packet-edonkey.c | 24 +- epan/dissectors/packet-epl.c | 6 +- .../dissectors/packet-etsi_card_app_toolkit.c | 24 +- epan/dissectors/packet-gadu-gadu.c | 6 +- epan/dissectors/packet-gmr1_rr.c | 2 +- epan/dissectors/packet-gsm_a_dtap.c | 2 +- epan/dissectors/packet-gsm_a_rr.c | 2 +- epan/dissectors/packet-gsm_cbsp.c | 2 +- epan/dissectors/packet-gsm_map.c | 22 +- epan/dissectors/packet-gsm_sms.c | 10 +- epan/dissectors/packet-gtp.c | 4 +- epan/dissectors/packet-hdmi.c | 2 +- epan/dissectors/packet-hicp.c | 42 +- epan/dissectors/packet-hiqnet.c | 12 +- epan/dissectors/packet-http.c | 12 +- epan/dissectors/packet-http2.c | 92 +-- epan/dissectors/packet-ip.c | 28 +- epan/dissectors/packet-ipv6.c | 28 +- epan/dissectors/packet-irc.c | 22 +- epan/dissectors/packet-iso8583.c | 8 +- epan/dissectors/packet-isobus-vt.c | 22 +- epan/dissectors/packet-json.c | 14 +- epan/dissectors/packet-kafka.c | 68 +- epan/dissectors/packet-lbmsrs.c | 8 +- epan/dissectors/packet-ldap.c | 42 +- epan/dissectors/packet-logcat-text.c | 4 +- epan/dissectors/packet-logcat.c | 4 +- epan/dissectors/packet-lpp.c | 2 +- epan/dissectors/packet-lte-rrc.c | 6 +- epan/dissectors/packet-mbim.c | 8 +- epan/dissectors/packet-mdp.c | 12 +- epan/dissectors/packet-messageanalyzer.c | 36 +- epan/dissectors/packet-mpeg-descriptor.c | 10 +- epan/dissectors/packet-mq.c | 232 +++---- epan/dissectors/packet-nano.c | 2 +- epan/dissectors/packet-nas_5gs.c | 2 +- epan/dissectors/packet-nas_eps.c | 4 +- epan/dissectors/packet-netflow.c | 638 +++++++++--------- epan/dissectors/packet-netlink-generic.c | 4 +- epan/dissectors/packet-netlink-net_dm.c | 8 +- epan/dissectors/packet-netlink-netfilter.c | 10 +- epan/dissectors/packet-netlink-nl80211.c | 6 +- epan/dissectors/packet-netlink-route.c | 6 +- epan/dissectors/packet-netlink-sock_diag.c | 2 +- epan/dissectors/packet-netmon.c | 80 +-- epan/dissectors/packet-ngap.c | 6 +- epan/dissectors/packet-nr-rrc.c | 4 +- epan/dissectors/packet-nstrace.c | 6 +- epan/dissectors/packet-nvme.c | 4 +- epan/dissectors/packet-obex.c | 16 +- epan/dissectors/packet-opa-mad.c | 44 +- epan/dissectors/packet-oran.c | 4 +- epan/dissectors/packet-p1.c | 30 +- epan/dissectors/packet-p22.c | 12 +- epan/dissectors/packet-pkix1explicit.c | 4 +- epan/dissectors/packet-pktc.c | 2 +- epan/dissectors/packet-pnrp.c | 2 +- epan/dissectors/packet-pppoe.c | 14 +- epan/dissectors/packet-ptpip.c | 2 +- epan/dissectors/packet-rrc.c | 2 +- epan/dissectors/packet-rtse.c | 4 +- epan/dissectors/packet-s1ap.c | 8 +- epan/dissectors/packet-sabp.c | 2 +- epan/dissectors/packet-sametime.c | 16 +- epan/dissectors/packet-sbc-ap.c | 2 +- epan/dissectors/packet-shicp.c | 12 +- epan/dissectors/packet-smb.c | 68 +- epan/dissectors/packet-smb2.c | 42 +- epan/dissectors/packet-smpp.c | 2 +- epan/dissectors/packet-steam-ihs-discovery.c | 8 +- epan/dissectors/packet-syslog.c | 2 +- epan/dissectors/packet-systemd-journal.c | 124 ++-- epan/dissectors/packet-tcp.c | 2 +- epan/dissectors/packet-tcpcl.c | 4 +- epan/dissectors/packet-tds.c | 16 +- epan/dissectors/packet-tzsp.c | 6 +- epan/dissectors/packet-ubdp.c | 16 +- epan/dissectors/packet-ulp.c | 6 +- epan/dissectors/packet-usb.c | 6 +- epan/dissectors/packet-usbll.c | 6 +- epan/dissectors/packet-vlan.c | 2 +- epan/dissectors/packet-vnc.c | 4 +- epan/dissectors/packet-wbxml.c | 2 +- epan/dissectors/packet-wifi-nan.c | 4 +- epan/dissectors/packet-wisun.c | 2 +- epan/dissectors/packet-x2ap.c | 6 +- epan/dissectors/packet-x509sat.c | 8 +- epan/dissectors/packet-xnap.c | 4 +- epan/dissectors/packet-zbee-zcl-se.c | 12 +- epan/dissectors/packet-zvt.c | 2 +- epan/introspection-enums.c | 2 - epan/proto.c | 28 +- epan/proto.h | 8 +- epan/wslua/make-init-lua.pl | 2 +- epan/wslua/wslua_proto_field.c | 11 +- 151 files changed, 1278 insertions(+), 1309 deletions(-) diff --git a/doc/README.dissector b/doc/README.dissector index 42718a2ea3..bda5f6958e 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -176,7 +176,7 @@ FIELDDISPLAY --For FT_UINT{8,16,24,32,40,48,56,64} and --For FT_STRING, FT_STRINGZ and FT_UINT_STRING: - STR_ASCII or STR_UNICODE + (must be) BASE_NONE --For FT_BYTES and FT_UINT_BYTES: diff --git a/epan/dissectors/asn1/credssp/credssp.cnf b/epan/dissectors/asn1/credssp/credssp.cnf index c7006415d3..a55b150729 100644 --- a/epan/dissectors/asn1/credssp/credssp.cnf +++ b/epan/dissectors/asn1/credssp/credssp.cnf @@ -87,7 +87,7 @@ TSRequest #.TYPE_ATTR -TSRemoteGuardPackageCred/packageName TYPE = FT_STRING DISPLAY = STR_UNICODE STRINGS = NULL +TSRemoteGuardPackageCred/packageName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL #.FN_BODY TSRemoteGuardPackageCred/packageName VAL_PTR = &pname tvbuff_t *pname = NULL; diff --git a/epan/dissectors/asn1/gsm_map/gsm_map.cnf b/epan/dissectors/asn1/gsm_map/gsm_map.cnf index abe0ac0009..4b98629094 100644 --- a/epan/dissectors/asn1/gsm_map/gsm_map.cnf +++ b/epan/dissectors/asn1/gsm_map/gsm_map.cnf @@ -1205,7 +1205,7 @@ Ext-TeleserviceCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(Teleserv Ext-BearerServiceCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(Bearerservice_vals) ChargingCharacteristics TYPE = FT_UINT16 DISPLAY = BASE_DEC BITMASK = 0x0f00 STRINGS = VALS(chargingcharacteristics_values) RoutingInfo TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(gsm_map_ch_RoutingInfo_vals) -DiameterIdentity TYPE = FT_STRING DISPLAY = STR_ASCII +DiameterIdentity TYPE = FT_STRING DISPLAY = BASE_NONE #---------------------------------------------------------------------------------------- #.FIELD_ATTR diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index be1dad854d..5202c91f9a 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -3260,7 +3260,7 @@ void proto_register_gsm_map(void) { "Service Area Code", HFILL }}, { &hf_gsm_map_ussd_string, { "USSD String", "gsm_map.ussd_string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_gsm_map_spare_bits, { "Spare bit(s)", "gsm_map.spare_bits", diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf index 2a9f04869b..bd6ea73e35 100644 --- a/epan/dissectors/asn1/ldap/ldap.cnf +++ b/epan/dissectors/asn1/ldap/ldap.cnf @@ -25,7 +25,7 @@ BindResponse/_untag/matchedDN bindResponse_matchedDN IntermediateResponse/_untag/responseValue intermediateResponse_responseValue #.TYPE_ATTR -LDAPString TYPE = FT_STRING DISPLAY = STR_UNICODE STRINGS = NULL +LDAPString TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL LDAPURL TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL LDAPOID TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL Mechanism TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL diff --git a/epan/dissectors/asn1/lpp/lpp.cnf b/epan/dissectors/asn1/lpp/lpp.cnf index c06096a484..d5b72bf470 100644 --- a/epan/dissectors/asn1/lpp/lpp.cnf +++ b/epan/dissectors/asn1/lpp/lpp.cnf @@ -1773,7 +1773,7 @@ WLAN-MeasurementElement-r13/rssi-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& WLAN-AP-Identifier-r13/bssid-r13 TYPE=FT_ETHER #.TYPE_ATTR -WLAN-AP-Identifier-r13/ssid-r13 TYPE=FT_STRING DISPLAY=STR_ASCII +WLAN-AP-Identifier-r13/ssid-r13 TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY WLAN-AP-Identifier-r13/ssid-r13 VAL_PTR=&ssid_tvb HF_INDEX=-1 tvbuff_t *ssid_tvb = NULL; diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 6a4d42717e..3c68029271 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -1502,7 +1502,7 @@ LogMeasResultBT-r15/rssi-BT-r15 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units CarrierFreqUTRA-FDD-Ext-r12/multiBandInfoList-r12 FreqBandIndicator_UTRA_FDD_r12 #.TYPE_ATTR -SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=STR_UNICODE +SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY SystemInformationBlockType9/hnb-Name VAL_PTR=&hnb_name_tvb HF_INDEX=-1 tvbuff_t *hnb_name_tvb = NULL; @@ -1738,7 +1738,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_C SystemInformationBlockType26-r15/threshS-RSSI-CBR-r14 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_threshS_RSSI_CBR_r14_fmt) #.TYPE_ATTR -WLAN-Identifiers-r12/ssid-r12 TYPE=FT_STRING DISPLAY=STR_ASCII +WLAN-Identifiers-r12/ssid-r12 TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY WLAN-Identifiers-r12/ssid-r12 VAL_PTR=&ssid_tvb HF_INDEX=-1 tvbuff_t *ssid_tvb = NULL; diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c index 3cffef3ef9..cb10026ba0 100644 --- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c @@ -4082,7 +4082,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, { &hf_lte_rrc_warningMessageSegment_decoded_page, { "Decoded Page", "lte-rrc.warningMessageSegment.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1, { "Bit 1", "lte-rrc.interBandTDD_CA_WithDifferentConfig.bit1", diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index 1e196fa0db..3bc7c3fae6 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -975,7 +975,7 @@ VolumeTimedReport-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u VolumeTimedReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets #.TYPE_ATTR -BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE +BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY BluetoothName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -1144,7 +1144,7 @@ Threshold-RSRQ DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ngap_Threshold_RSRQ_fmt) Threshold-SINR DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ngap_Threshold_SINR_fmt) #.TYPE_ATTR -WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE +WLANName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY WLANName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index 5f218949aa..2931a9a3c3 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -1089,7 +1089,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_WarningMessageContents_decoded_page, { "Decoded Page", "ngap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_NGRANTraceID_TraceID, { "TraceID", "ngap.NGRANTraceID.TraceID", diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf index cf99fcac7c..49b1367fb1 100644 --- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf +++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf @@ -1671,7 +1671,7 @@ T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds EUTRA-NS-PmaxValue/additionalPmax DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm #.TYPE_ATTR -WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=STR_ASCII +WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY WLAN-Identifiers-r16/ssid-r16 VAL_PTR=&ssid_tvb HF_INDEX=-1 tvbuff_t *ssid_tvb = NULL; diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c index 5c5a8b5844..be4000a1db 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c @@ -824,7 +824,7 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, { &hf_nr_rrc_warningMessageSegment_decoded_page, { "Decoded Page", "nr-rrc.warningMessageSegment.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nr_rrc_sib7_fragments, { "Fragments", "nr-rrc.warningMessageSegment.fragments", diff --git a/epan/dissectors/asn1/p1/p1.cnf b/epan/dissectors/asn1/p1/p1.cnf index 4da5be4c53..bed9cab2de 100644 --- a/epan/dissectors/asn1/p1/p1.cnf +++ b/epan/dissectors/asn1/p1/p1.cnf @@ -1271,21 +1271,21 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" actx->subtree.tree = NULL; #.TYPE_ATTR -RecipientNumberForAdvice DISPLAY = STR_UNICODE -TeletexCommonName DISPLAY = STR_UNICODE -TeletexOrganizationName DISPLAY = STR_UNICODE -TeletexPersonalName/surname DISPLAY = STR_UNICODE -TeletexPersonalName/given-name DISPLAY = STR_UNICODE -TeletexPersonalName/initials DISPLAY = STR_UNICODE -TeletexPersonalName/generation-qualifier DISPLAY = STR_UNICODE -TeletexOrganizationalUnitName DISPLAY = STR_UNICODE -UnformattedPostalAddress/teletex-string DISPLAY = STR_UNICODE -PDSParameter/teletex-string DISPLAY = STR_UNICODE -TeletexDomainDefinedAttribute/type DISPLAY = STR_UNICODE -TeletexDomainDefinedAttribute/value DISPLAY = STR_UNICODE -TeletexNonBasicParameters/graphic-character-sets DISPLAY = STR_UNICODE -TeletexNonBasicParameters/control-character-sets DISPLAY = STR_UNICODE -TeletexNonBasicParameters/miscellaneous-terminal-capabilities DISPLAY = STR_UNICODE +RecipientNumberForAdvice DISPLAY = BASE_NONE +TeletexCommonName DISPLAY = BASE_NONE +TeletexOrganizationName DISPLAY = BASE_NONE +TeletexPersonalName/surname DISPLAY = BASE_NONE +TeletexPersonalName/given-name DISPLAY = BASE_NONE +TeletexPersonalName/initials DISPLAY = BASE_NONE +TeletexPersonalName/generation-qualifier DISPLAY = BASE_NONE +TeletexOrganizationalUnitName DISPLAY = BASE_NONE +UnformattedPostalAddress/teletex-string DISPLAY = BASE_NONE +PDSParameter/teletex-string DISPLAY = BASE_NONE +TeletexDomainDefinedAttribute/type DISPLAY = BASE_NONE +TeletexDomainDefinedAttribute/value DISPLAY = BASE_NONE +TeletexNonBasicParameters/graphic-character-sets DISPLAY = BASE_NONE +TeletexNonBasicParameters/control-character-sets DISPLAY = BASE_NONE +TeletexNonBasicParameters/miscellaneous-terminal-capabilities DISPLAY = BASE_NONE #.END diff --git a/epan/dissectors/asn1/p22/p22.cnf b/epan/dissectors/asn1/p22/p22.cnf index 451a297673..6b610c698d 100644 --- a/epan/dissectors/asn1/p22/p22.cnf +++ b/epan/dissectors/asn1/p22/p22.cnf @@ -265,16 +265,16 @@ IpnSecurityResponse B "2.6.1.18.1" "id-sec-security-common-fields" tvb_reported_length(subject), ENC_T61)); #.TYPE_ATTR -SubjectField DISPLAY = STR_UNICODE +SubjectField DISPLAY = BASE_NONE #.TYPE_ATTR -TeletexData/_item DISPLAY = STR_UNICODE +TeletexData/_item DISPLAY = BASE_NONE #.TYPE_ATTR -FreeFormName DISPLAY = STR_UNICODE +FreeFormName DISPLAY = BASE_NONE #.TYPE_ATTR -VideotexData DISPLAY = STR_UNICODE +VideotexData DISPLAY = BASE_NONE #.FN_PARS CharacterSetRegistration VAL_PTR=&crs diff --git a/epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf b/epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf index 29bc5f3cf5..bd4133926e 100644 --- a/epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf +++ b/epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf @@ -87,10 +87,10 @@ Extensions B "1.2.840.113549.1.9.14" "pkcs-9-at-extensionRequest" proto_tree_add_item(subtree, hf_pkix1explicit_addressFamily_safi, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); #.TYPE_ATTR -TeletexDomainDefinedAttribute/type DISPLAY = STR_UNICODE +TeletexDomainDefinedAttribute/type DISPLAY = BASE_NONE #.TYPE_ATTR -TeletexDomainDefinedAttribute/value DISPLAY = STR_UNICODE +TeletexDomainDefinedAttribute/value DISPLAY = BASE_NONE #.TYPE_ATTR Features/_item TYPE = FT_UINT16 STRINGS = VALS(tls_hello_extension_types) BLURB = "TLS Extension that MUST be supported by the server" diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf index f0946fb854..05f721c04a 100644 --- a/epan/dissectors/asn1/rrc/rrc.cnf +++ b/epan/dissectors/asn1/rrc/rrc.cnf @@ -1141,7 +1141,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me } #.TYPE_ATTR -HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE +HNBName TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY HNBName VAL_PTR = &hnbname_tvb HF_INDEX = -1 tvbuff_t *hnbname_tvb = NULL; diff --git a/epan/dissectors/asn1/rtse/rtse.cnf b/epan/dissectors/asn1/rtse/rtse.cnf index bfaff0346b..8bf5a8c97a 100644 --- a/epan/dissectors/asn1/rtse/rtse.cnf +++ b/epan/dissectors/asn1/rtse/rtse.cnf @@ -120,7 +120,7 @@ RTSE-apdus tvb_reported_length(string), ENC_T61)); #.TYPE_ATTR -CallingSSuserReference/t61String DISPLAY = STR_UNICODE +CallingSSuserReference/t61String DISPLAY = BASE_NONE #.FN_PARS CommonReference VAL_PTR=&string @@ -181,6 +181,6 @@ CallingSSuserReference/t61String DISPLAY = STR_UNICODE col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, rtse_AbortReason_vals, "reason(%%d)")); #.TYPE_ATTR -AdditionalReferenceInformation DISPLAY = STR_UNICODE +AdditionalReferenceInformation DISPLAY = BASE_NONE #.END diff --git a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c index 1b3ce9294a..a035987caf 100644 --- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c +++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c @@ -634,7 +634,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, { &hf_s1ap_WarningMessageContents_decoded_page, { "Decoded Page", "s1ap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_s1ap_measurementsToActivate_M1, { "M1", "s1ap.measurementsToActivate.M1", diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index 80bb2291a4..10660a29e6 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -1219,7 +1219,7 @@ ExtendedRepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_second } #.TYPE_ATTR -LHN-ID TYPE=FT_STRING DISPLAY = STR_UNICODE +LHN-ID TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY LHN-ID VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -1471,7 +1471,7 @@ M-TMSI TYPE = FT_UINT32 DISPLAY = BASE_DEC_HEX Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Packet_LossRate_fmt) #.TYPE_ATTR -BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE +BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY BluetoothName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -1479,7 +1479,7 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE #.END #.TYPE_ATTR -WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE +WLANName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY WLANName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s diff --git a/epan/dissectors/asn1/sabp/packet-sabp-template.c b/epan/dissectors/asn1/sabp/packet-sabp-template.c index 2f10494a7f..ada1db7b27 100644 --- a/epan/dissectors/asn1/sabp/packet-sabp-template.c +++ b/epan/dissectors/asn1/sabp/packet-sabp-template.c @@ -228,7 +228,7 @@ void proto_register_sabp(void) { NULL, HFILL }}, { &hf_sabp_cbs_page_content, { "CBS Page Content", "sabp.cb_page_content", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_sabp_cb_inf_len, { "CBS-Message-Information-Length", "sabp.cb_inf_len", diff --git a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c index fb29eb6ccb..c0a36d994d 100644 --- a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c +++ b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c @@ -197,7 +197,7 @@ void proto_register_sbc_ap(void) { NULL, HFILL }}, { &hf_sbc_ap_Warning_Message_Contents_decoded_page, { "Decoded Page", "sbc-ap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, #include "packet-sbc-ap-hfarr.c" }; diff --git a/epan/dissectors/asn1/ulp/ulp.cnf b/epan/dissectors/asn1/ulp/ulp.cnf index 2f23a50ccb..f552215dad 100644 --- a/epan/dissectors/asn1/ulp/ulp.cnf +++ b/epan/dissectors/asn1/ulp/ulp.cnf @@ -94,7 +94,7 @@ guint32 UlpMessage; } #.TYPE_ATTR -Notification/requestorId TYPE=FT_STRING DISPLAY=STR_UNICODE +Notification/requestorId TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY Notification/clientName VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; @@ -126,7 +126,7 @@ Notification/requestorId TYPE=FT_STRING DISPLAY=STR_UNICODE } #.TYPE_ATTR -Notification/clientName TYPE=FT_STRING DISPLAY=STR_UNICODE +Notification/clientName TYPE=FT_STRING DISPLAY=BASE_NONE #.TYPE_ATTR NavigationModel/gpsToe DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_hours @@ -618,7 +618,7 @@ WlanAPInformation/setSignaltoNoiseDelta DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(ulp_ } #.TYPE_ATTR -WlanAPInformation/apSSID TYPE=FT_STRING DISPLAY=STR_ASCII +WlanAPInformation/apSSID TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY WlanAPInformation/setMACAddress VAL_PTR=&val_tvb HF_INDEX=-1 tvbuff_t *val_tvb; diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index e7b6607f1d..d88ca92960 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -570,7 +570,7 @@ RSRPMeasurementResult/_item/rSRPMeasured DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2a } #.TYPE_ATTR -LHN-ID TYPE=FT_STRING DISPLAY = STR_UNICODE +LHN-ID TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY LHN-ID VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -670,7 +670,7 @@ Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(x2ap_Packet_LossRate_fmt proto_item_append_text(actx->created_item, " REs"); #.TYPE_ATTR -BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE +BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY BluetoothName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -678,7 +678,7 @@ BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE #.END #.TYPE_ATTR -WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE +WLANName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY WLANName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s diff --git a/epan/dissectors/asn1/x509sat/x509sat.cnf b/epan/dissectors/asn1/x509sat/x509sat.cnf index 6b7ffdd7d9..75a624a7c0 100644 --- a/epan/dissectors/asn1/x509sat/x509sat.cnf +++ b/epan/dissectors/asn1/x509sat/x509sat.cnf @@ -405,16 +405,16 @@ XDayOf/fifth fifth_dayof #.END #.TYPE_ATTR -DirectoryString/teletexString DISPLAY = STR_UNICODE +DirectoryString/teletexString DISPLAY = BASE_NONE #.TYPE_ATTR -SyntaxTeletexString DISPLAY = STR_UNICODE +SyntaxTeletexString DISPLAY = BASE_NONE #.TYPE_ATTR -SyntaxT61String DISPLAY = STR_UNICODE +SyntaxT61String DISPLAY = BASE_NONE #.TYPE_ATTR -SyntaxVideotexString DISPLAY = STR_UNICODE +SyntaxVideotexString DISPLAY = BASE_NONE #.END diff --git a/epan/dissectors/asn1/xnap/xnap.cnf b/epan/dissectors/asn1/xnap/xnap.cnf index 70a12dba4e..057b42e788 100644 --- a/epan/dissectors/asn1/xnap/xnap.cnf +++ b/epan/dissectors/asn1/xnap/xnap.cnf @@ -508,7 +508,7 @@ VolumeTimedReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u } #.TYPE_ATTR -BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE +BluetoothName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY BluetoothName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s @@ -663,7 +663,7 @@ Threshold-SINR DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(xnap_Threshold_SINR_fmt) } #.TYPE_ATTR -WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE +WLANName TYPE=FT_STRING DISPLAY = BASE_NONE #.FN_BODY WLANName VAL_PTR = ¶meter_tvb HF_INDEX = -1 tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index 5c459cd900..ce8d147cf4 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -1283,7 +1283,7 @@ proto_register_jfif(void) { &hf_comment, { "Comment", "image-jfif.comment", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 18a097c502..70be165ba7 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -2215,7 +2215,7 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_comment, { "Comment", "pcapng.options.option.data.comment", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_section_header_byte_order_magic, @@ -2245,27 +2245,27 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_section_header_hardware, { "Hardware", "pcapng.options.option.data.hardware", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_section_header_os, { "OS", "pcapng.options.option.data.os", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_section_header_user_application, { "User Application", "pcapng.options.option.data.user_application", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_interface_description_name, { "Name", "pcapng.options.option.data.interface.name", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_interface_description_description, { "Description", "pcapng.options.option.data.interface.description", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_ipv4, @@ -2330,7 +2330,7 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_interface_filter_string, { "Filter string", "pcapng.options.option.data.interface.filter.string", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_interface_filter_bpf_program, @@ -2345,12 +2345,12 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_interface_os, { "OS", "pcapng.options.option.data.interface.os", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_interface_hardware, { "Hardware", "pcapng.options.option.data.interface.hardware", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_interface_fcs_length, @@ -2525,7 +2525,7 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_data_dns_name, { "DNS Name", "pcapng.options.option.data.dns_name", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_data_start_time, @@ -2670,7 +2670,7 @@ proto_register_pcapng(void) }, { &hf_pcapng_record_name, { "Name", "pcapng.records.record.data.name", - FT_STRINGZ, STR_ASCII, NULL, 0x00, + FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_dsb_secrets_type, @@ -2695,7 +2695,7 @@ proto_register_pcapng(void) }, { &hf_pcapng_option_darwin_process_name, { "Darwin Process Name", "pcapng.darwin.process_name", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pcapng_option_darwin_process_uuid, diff --git a/epan/dissectors/file-png.c b/epan/dissectors/file-png.c index 6ae6303e1b..87d8b0893b 100644 --- a/epan/dissectors/file-png.c +++ b/epan/dissectors/file-png.c @@ -179,11 +179,11 @@ static header_field_info hfi_png_srgb_intent PNG_HFI_INIT = { VALS(srgb_intent_vals), 0, NULL, HFILL }; static header_field_info hfi_png_text_keyword PNG_HFI_INIT = { - "Keyword", "png.text.keyword", FT_STRING, STR_UNICODE, + "Keyword", "png.text.keyword", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }; static header_field_info hfi_png_text_string PNG_HFI_INIT = { - "String", "png.text.string", FT_STRING, STR_UNICODE, + "String", "png.text.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }; static header_field_info hfi_png_time_year PNG_HFI_INIT = { diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index e4415175a3..d06f5473f5 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -870,7 +870,7 @@ proto_register_adb(void) }, { &hf_connection_info, { "Info", "adb.connection_info", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index 61f6d89458..08feb0f061 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -369,7 +369,7 @@ proto_register_adb_cs(void) }, { &hf_hex_ascii_length, { "Hex ASCII Length", "adb_cs.hex_ascii_length", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_length, @@ -379,17 +379,17 @@ proto_register_adb_cs(void) }, { &hf_service, { "Service", "adb_cs.service", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_fail_reason, { "Fail Reason", "adb_cs.fail_reason", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_status, { "Status", "adb_cs.status", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_data, diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index 53bf63612b..3bcf7c9aba 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -563,7 +563,7 @@ proto_register_adb_service(void) static hf_register_info hf[] = { { &hf_service, { "Service", "adb_service.service", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_fragment, @@ -578,7 +578,7 @@ proto_register_adb_service(void) }, { &hf_hex_ascii_length, { "Hex ASCII String Length", "adb_service.hex_ascii_length", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_length, @@ -593,7 +593,7 @@ proto_register_adb_service(void) }, { &hf_hex_ascii_version, { "Hex ASCII String Version", "adb_service.hex_ascii_version", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_version, @@ -708,27 +708,27 @@ proto_register_adb_service(void) }, { &hf_devices, { "Devices", "adb_service.devices", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_stdin, { "Stdin", "adb_service.stdin", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_stdout, { "Stdout", "adb_service.stdout", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_result, { "Result", "adb_service.result", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_pids, { "PIDs", "adb_service.pids", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 0b50ba66a8..9107402e15 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -7052,27 +7052,27 @@ proto_register_afp(void) { &hf_afp_utf8_server_name, { "UTF-8 server name", "afp.utf8_server_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_name, { "Server name", "afp.server_name", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_type, { "Server type", "afp.server_type", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_vers, { "AFP version", "afp.server_vers", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_uams, { "UAM", "afp.server_uams", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_afp_server_icon, @@ -7082,7 +7082,7 @@ proto_register_afp(void) { &hf_afp_server_directory, { "Directory service", "afp.server_directory", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + FT_UINT_STRING, BASE_NONE, NULL, 0x0, "Server directory service", HFILL }}, { &hf_afp_server_signature, diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index b5b7ba3a33..5a25f914c6 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -2826,7 +2826,7 @@ proto_register_ansi_637(void) }, { &hf_ansi_637_tele_user_data_text, { "Encoded user data", "ansi_637_tele.user_data.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_ansi_637_tele_user_data_encoding, @@ -3196,7 +3196,7 @@ proto_register_ansi_637(void) }, { &hf_ansi_637_tele_cmas_text, { "CMAE_alert_text", "ansi_637_tele.cmas.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_ansi_637_tele_mult_enc_user_data_encoding, @@ -3211,7 +3211,7 @@ proto_register_ansi_637(void) }, { &hf_ansi_637_tele_mult_enc_user_data_text, { "Encoded user data", "ansi_637_tele.mult_enc_user_data.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_ansi_637_tele_srvc_cat_prog_data_encoding, @@ -3251,7 +3251,7 @@ proto_register_ansi_637(void) }, { &hf_ansi_637_tele_srvc_cat_prog_data_text, { "Encoded program data", "ansi_637_tele.srvc_cat_prog_data.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_ansi_637_msb_first_field, diff --git a/epan/dissectors/packet-at-ldf.c b/epan/dissectors/packet-at-ldf.c index fb76bc5be4..6c97ce9d31 100644 --- a/epan/dissectors/packet-at-ldf.c +++ b/epan/dissectors/packet-at-ldf.c @@ -122,7 +122,7 @@ proto_register_at_ldf(void) }, { &hf_at_ldf_text, { "Information", "atldf.info", - FT_STRINGZPAD, STR_ASCII, + FT_STRINGZPAD, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 6c1c27a47a..5e291d013e 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -1758,13 +1758,13 @@ proto_register_atalk(void) { "Enumerator", "nbp.enum", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nbp_node_object, - { "Object", "nbp.object", FT_UINT_STRING, STR_UNICODE, + { "Object", "nbp.object", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nbp_node_type, - { "Type", "nbp.type", FT_UINT_STRING, STR_UNICODE, + { "Type", "nbp.type", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nbp_node_zone, - { "Zone", "nbp.zone", FT_UINT_STRING, STR_UNICODE, + { "Zone", "nbp.zone", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nbp_tid, { "Transaction ID", "nbp.tid", FT_UINT8, BASE_DEC, @@ -1978,11 +1978,11 @@ proto_register_atalk(void) NULL, HFILL }}, { &hf_zip_zone_name, - { "Zone", "zip.zone_name", FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + { "Zone", "zip.zone_name", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zip_default_zone, - { "Default zone", "zip.default_zone",FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + { "Default zone", "zip.default_zone",FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zip_multicast_length, @@ -2025,7 +2025,7 @@ proto_register_atalk(void) "Sequence number", HFILL }}, { &hf_pap_status, - { "Status", "prap.status", FT_UINT_STRING, STR_UNICODE, NULL, 0x0, + { "Status", "prap.status", FT_UINT_STRING, BASE_NONE, NULL, 0x0, "Printer status", HFILL }}, { &hf_pap_eof, diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 9da1c160ae..111a824d67 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -15890,7 +15890,7 @@ proto_register_bacapp(void) }, { &hf_bacapp_object_name, { "Object Name", "bacapp.object_name", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_bacapp_instanceNumber, { "Instance Number", "bacapp.instance_number", @@ -15954,7 +15954,7 @@ proto_register_bacapp(void) }, { &hf_bacapp_present_value_null, { "Present Value (null)", "bacapp.present_value.null", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_bacapp_present_value_bool, { "Present Value (bool)", "bacapp.present_value.boolean", @@ -15982,11 +15982,11 @@ proto_register_bacapp(void) }, { &hf_bacapp_present_value_char_string, { "Present Value (char string)", "bacapp.present_value.char_string", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_bacapp_present_value_bit_string, { "Present Value (bit string)", "bacapp.present_value.bit_string", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_bacapp_present_value_enum_index, { "Present Value (enum index)", "bacapp.present_value.enum_index", diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index aace662c4a..95140a3dce 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -10659,7 +10659,7 @@ proto_register_bgp(void) { "BGP Shutdown Communication Length", "bgp.notify.communication_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_bgp_notify_communication, - { "Shutdown Communication", "bgp.notify.communication", FT_STRING, STR_UNICODE, + { "Shutdown Communication", "bgp.notify.communication", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* Route Refresh */ @@ -11506,7 +11506,7 @@ proto_register_bgp(void) BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_bgp_update_encaps_tunnel_subtlv_policy_name_name, { "Policy name", "bgp.update.encaps_tunnel_tlv_subtlv.policy_name.name", FT_STRING, - STR_ASCII, NULL, 0x0, NULL, HFILL}}, + BASE_NONE, NULL, 0x0, NULL, HFILL}}, /* BGP update path attribut SSA SAFI (deprecated IETF draft) */ { &hf_bgp_ssa_t, @@ -12342,7 +12342,7 @@ proto_register_bgp(void) BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_bgp_ls_tlv_link_name_attribute_value, {"Link Name", "bgp.ls.tlv.link_name_attribute_value", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bgp_ls_tlv_igp_flags, { "IGP Flags TLV", "bgp.ls.tlv.igp_flags", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -12411,7 +12411,7 @@ proto_register_bgp(void) BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_bgp_ls_tlv_node_name_value, {"Node name", "bgp.ls.tlv.node_name_value", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bgp_ls_tlv_is_is_area_identifier, { "IS-IS Area Identifier TLV", "bgp.ls.tlv.is_is_area_identifier", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-blip.c b/epan/dissectors/packet-blip.c index 3b21fcf3fa..d76be05081 100644 --- a/epan/dissectors/packet-blip.c +++ b/epan/dissectors/packet-blip.c @@ -570,11 +570,11 @@ proto_register_blip(void) NULL, 0x0, NULL, HFILL } }, { &hf_blip_properties, - { "Properties", "blip.props", FT_STRING, STR_UNICODE, + { "Properties", "blip.props", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_blip_message_body, - { "Message Body", "blip.messagebody", FT_STRING, STR_UNICODE, + { "Message Body", "blip.messagebody", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_blip_ack_size, diff --git a/epan/dissectors/packet-bluecom.c b/epan/dissectors/packet-bluecom.c index 495d67d447..c9026c7c3e 100644 --- a/epan/dissectors/packet-bluecom.c +++ b/epan/dissectors/packet-bluecom.c @@ -659,7 +659,7 @@ proto_register_bluecom(void) BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_identify_name, { "Name", "bluecom.identify.name", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_identify_ethaddr, { "EthAddr", "bluecom.identify.ethaddr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -676,7 +676,7 @@ proto_register_bluecom(void) BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_bcp_searchreq_name, { "Name", "bluecom.searchreq.name", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_searchreq_ipaddrfirst, { "IpAddrFirst", "bluecom.searchreq.ipaddrfirst", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -705,7 +705,7 @@ proto_register_bluecom(void) BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_searchrsp_name, { "Name", "bluecom.searchrsp.name", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_searchrsp_ethaddr, { "EthAddr", "bluecom.searchrsp.ethaddr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -731,7 +731,7 @@ proto_register_bluecom(void) BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_connectreq_name, { "Name", "bluecom.connectreq.name", FT_STRING, - STR_ASCII, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_bcp_connectreq_ethaddr, { "EthAddr", "bluecom.connectreq.ethaddr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index b10bfcc666..2b17b05aec 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -4029,17 +4029,17 @@ proto_register_bluetooth(void) }, { &hf_bluetooth_src_str, { "Source", "bluetooth.src_str", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_bluetooth_dst_str, { "Destination", "bluetooth.dst_str", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_bluetooth_addr_str, { "Source or Destination", "bluetooth.addr_str", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-bpsec.c b/epan/dissectors/packet-bpsec.c index 69a5901214..c7f04d3c73 100644 --- a/epan/dissectors/packet-bpsec.c +++ b/epan/dissectors/packet-bpsec.c @@ -90,7 +90,7 @@ static hf_register_info fields[] = { {&hf_asb_flags, {"Flags", "bpsec.asb.flags", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, {&hf_asb_flags_has_params, {"Parameters Present", "bpsec.asb.flags.has_params", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BPSEC_ASB_HAS_PARAMS, NULL, HFILL}}, {&hf_asb_secsrc_nodeid, {"Security Source", "bpsec.asb.secsrc.nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_asb_secsrc_uri, {"Security Source URI", "bpsec.asb.secsrc.uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_asb_secsrc_uri, {"Security Source URI", "bpsec.asb.secsrc.uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_asb_param_list, {"Security Parameters, Count", "bpsec.asb.param_count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_asb_param_pair, {"Parameter", "bpsec.asb.param", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_asb_param_id, {"Type ID", "bpsec.asb.param.id", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c index 1b2d58a64a..ca7c0b4391 100644 --- a/epan/dissectors/packet-bpv7.c +++ b/epan/dissectors/packet-bpv7.c @@ -245,11 +245,11 @@ static hf_register_info fields[] = { {&hf_create_ts_seqno, {"Sequence Number", "bpv7.create_ts.seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_eid_scheme, {"Scheme Code", "bpv7.eid.scheme", FT_UINT64, BASE_DEC | BASE_VAL64_STRING, VALS64(eid_schemes), 0x0, NULL, HFILL}}, {&hf_eid_dtn_ssp_code, {"DTN SSP", "bpv7.eid.dtn_ssp_code", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - {&hf_eid_dtn_ssp_text, {"DTN SSP", "bpv7.eid.dtn_ssp_text", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_eid_dtn_ssp_text, {"DTN SSP", "bpv7.eid.dtn_ssp_text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_eid_ipn_node, {"IPN Node Number", "bpv7.eid.ipn_node", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_eid_ipn_service, {"IPN Service Number", "bpv7.eid.ipn_service", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - {&hf_eid_dtn_wkssp, {"Well-known SSP", "bpv7.eid.wkssp", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, - {&hf_eid_dtn_serv, {"Service Name", "bpv7.eid.serv", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_eid_dtn_wkssp, {"Well-known SSP", "bpv7.eid.wkssp", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + {&hf_eid_dtn_serv, {"Service Name", "bpv7.eid.serv", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_primary_version, {"Version", "bpv7.primary.version", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_primary_bundle_flags, {"Bundle Flags", "bpv7.primary.bundle_flags", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, @@ -263,11 +263,11 @@ static hf_register_info fields[] = { {&hf_primary_bundle_flags_delivery_report, {"Request reporting of bundle delivery", "bpv7.primary.bundle_flags.delivery_report", FT_BOOLEAN, 24, TFS(&tfs_set_notset), BP_BUNDLE_REQ_DELIVERY_REPORT, NULL, HFILL}}, {&hf_primary_bundle_flags_deletion_report, {"Request reporting of bundle deletion", "bpv7.primary.bundle_flags.deletion_report", FT_BOOLEAN, 24, TFS(&tfs_set_notset), BP_BUNDLE_REQ_DELETION_REPORT, NULL, HFILL}}, {&hf_primary_dst_eid, {"Destination Endpoint ID", "bpv7.primary.dst_eid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_primary_dst_uri, {"Destination URI", "bpv7.primary.dst_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_primary_dst_uri, {"Destination URI", "bpv7.primary.dst_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_primary_src_nodeid, {"Source Node ID", "bpv7.primary.src_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_primary_src_uri, {"Source URI", "bpv7.primary.src_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_primary_src_uri, {"Source URI", "bpv7.primary.src_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_primary_report_nodeid, {"Report-to Node ID", "bpv7.primary.report_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_primary_report_uri, {"Report-to URI", "bpv7.primary.report_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_primary_report_uri, {"Report-to URI", "bpv7.primary.report_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_primary_create_ts, {"Creation Timestamp", "bpv7.primary.create_ts", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_primary_lifetime, {"Lifetime", "bpv7.primary.lifetime", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL}}, {&hf_primary_lifetime_exp, {"Lifetime Expanded", "bpv7.primary.lifetime_exp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -275,7 +275,7 @@ static hf_register_info fields[] = { {&hf_primary_frag_offset, {"Fragment Offset", "bpv7.primary.frag_offset", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, {&hf_primary_total_length, {"Total Application Data Unit Length", "bpv7.primary.total_len", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, - {&hf_bundle_ident, {"Bundle Identity", "bpv7.bundle.identity", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_bundle_ident, {"Bundle Identity", "bpv7.bundle.identity", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_bundle_seen, {"First Seen", "bpv7.bundle.first_seen", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_RETRANS_PREV), 0x0, NULL, HFILL}}, {&hf_bundle_seen_time_diff, {"Seen Time", "bpv7.bundle.seen_time_diff", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_bundle_status_ref, {"Status Bundle", "bpv7.bundle.status_ref", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -326,7 +326,7 @@ static hf_register_info fields[] = { FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_previous_node_nodeid, {"Previous Node ID", "bpv7.previous_node.nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_previous_node_uri, {"Previous URI", "bpv7.previous_node.uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_previous_node_uri, {"Previous URI", "bpv7.previous_node.uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_bundle_age_time, {"Bundle Age", "bpv7.bundle_age.time", FT_UINT64, BASE_DEC | BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL}}, @@ -345,11 +345,11 @@ static hf_register_info fields[] = { {&hf_status_rep_deleted, {"Reporting node deleted bundle", "bpv7.status_rep.deleted", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_status_rep_reason_code, {"Reason Code", "bpv7.status_rep.reason_code", FT_UINT64, BASE_DEC | BASE_VAL64_STRING, VALS64(status_report_reason_vals), 0x0, NULL, HFILL}}, {&hf_status_rep_subj_src_nodeid, {"Subject Source Node ID", "bpv7.status_rep.subj_src_nodeid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_status_rep_subj_src_uri, {"Subject Source URI", "bpv7.status_rep.subj_src_uri", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_status_rep_subj_src_uri, {"Subject Source URI", "bpv7.status_rep.subj_src_uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_status_rep_subj_ts, {"Subject Creation Timestamp", "bpv7.status_rep.subj_ts", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_status_rep_subj_frag_offset, {"Subject Fragment Offset", "bpv7.status_rep.subj_frag_offset", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_status_rep_subj_payload_len, {"Subject Payload Length", "bpv7.status_rep.subj_payload_len", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - {&hf_status_rep_subj_ident, {"Subject Identity", "bpv7.status_rep.identity", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_status_rep_subj_ident, {"Subject Identity", "bpv7.status_rep.identity", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_status_rep_subj_ref, {"Subject Bundle", "bpv7.status_rep.subj_ref", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, NULL, HFILL}}, {&hf_status_time_diff, {"Status Time", "bpv7.status_rep.subj_time_diff", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}}, }; diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index e22d8734dd..eb96dda369 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -16337,7 +16337,7 @@ proto_register_btatt(void) }, {&hf_btatt_ots_object_name, {"Object Name", "btatt.ots.object_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_btatt_ots_current_size, @@ -16522,7 +16522,7 @@ proto_register_btatt(void) }, {&hf_btatt_ots_name_string, {"Name String", "btatt.ots.name_string", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_btatt_ots_object_first_created, diff --git a/epan/dissectors/packet-caneth.c b/epan/dissectors/packet-caneth.c index e9b320a081..dc5d3b8546 100644 --- a/epan/dissectors/packet-caneth.c +++ b/epan/dissectors/packet-caneth.c @@ -183,7 +183,7 @@ proto_register_caneth(void) &hf_caneth_magic, { "Magic", "caneth.magic", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, "The magic identifier used to denote the start of a CAN-ETH packet", HFILL } diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 0afcd5fece..4ed7082d52 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -508,21 +508,21 @@ proto_register_cbs(void) { &hf_gsm_cbs_page_content, { "CBS Page Content", "gsm_cbs.page_content", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_gsm_cbs_page_content_padding, { "CBS Page Content Padding", "gsm_cbs.page_content_padding", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_gsm_cbs_message_content, { "CBS Message Content", "gsm_cbs.message_content", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-cose.c b/epan/dissectors/packet-cose.c index 295c62152e..162f5b128b 100644 --- a/epan/dissectors/packet-cose.c +++ b/epan/dissectors/packet-cose.c @@ -226,16 +226,16 @@ static hf_register_info fields[] = { {&hf_tag, {"Tag", "cose.msg.mac_tag", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_label_int, {"Label", "cose.header_label.int", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - {&hf_hdr_label_tstr, {"Label", "cose.header_label.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_hdr_label_tstr, {"Label", "cose.header_label.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_salt, {"Salt", "cose.salt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_static_key, {"Static Key", "cose.static_key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_ephem_key, {"Ephemeral Key", "cose.ephem_key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_alg_int, {"Algorithm", "cose.alg.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(alg_vals), 0x0, NULL, HFILL}}, - {&hf_hdr_alg_tstr, {"Algorithm", "cose.alg.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_hdr_alg_tstr, {"Algorithm", "cose.alg.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_crit_list, {"Critical Headers, Count", "cose.crit", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_ctype_uint, {"Content-Format", "cose.content-type.uint", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - {&hf_hdr_ctype_tstr, {"Content-Type", "cose.content-type.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_hdr_ctype_tstr, {"Content-Type", "cose.content-type.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_kid, {"Key identifier", "cose.kid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_iv, {"IV", "cose.iv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_piv, {"Partial IV", "cose.piv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -244,18 +244,18 @@ static hf_register_info fields[] = { {&hf_hdr_x5chain, {"X509 Chain (x5chain)", "cose.x5chain", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_x5t, {"X509 Thumbprint (x5t)", "cose.x5t", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_hdr_x5t_hash, {"Hash Value", "cose.x5t.hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - {&hf_hdr_x5u, {"X509 URI (x5u)", "cose.x5u", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_hdr_x5u, {"X509 URI (x5u)", "cose.x5u", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_key, {"COSE_Key", "cose.key", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_kty_int, {"Key Type", "cose.kty.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(kty_vals), 0x0, NULL, HFILL}}, - {&hf_keyparam_kty_tstr, {"Key Type", "cose.kty.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_keyparam_kty_tstr, {"Key Type", "cose.kty.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_keyops_list, {"Key Operations", "cose.keyops", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_keyops_int, {"Operation", "cose.keyops.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(keyops_vals), 0x0, NULL, HFILL}}, - {&hf_keyparam_keyops_tstr, {"Operation", "cose.keyops.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_keyparam_keyops_tstr, {"Operation", "cose.keyops.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_baseiv, {"Base IV", "cose.baseiv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_crv_int, {"Curve Type", "cose.crv.int", FT_INT64, BASE_DEC | BASE_VAL64_STRING, VALS64(crv_vals), 0x0, NULL, HFILL}}, - {&hf_keyparam_crv_tstr, {"Curve Type", "cose.crv.tstr", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_keyparam_crv_tstr, {"Curve Type", "cose.crv.tstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_xcoord, {"X-coordinate", "cose.key.xcoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_ycoord, {"Y-coordinate", "cose.key.ycoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_keyparam_dcoord, {"Private Key", "cose.key.dcoord", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index 954e0b9632..9f4d02c9a4 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -1825,7 +1825,7 @@ proto_register_cql(void) &hf_cql_string, { "String", "cql.string", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, "UTF-8 string value", HFILL } @@ -1834,7 +1834,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_global_table_spec_ksname, { "Global Spec Keyspace Name", "cql.result.rows.keyspace_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1843,7 +1843,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_global_table_spec_table_name, { "Global Spec Table Name", "cql.result.rows.table_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1852,7 +1852,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_table_name, { "Table Name", "cql.result.rows.table_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1861,7 +1861,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_udt_name, { "User Defined Type Name", "cql.result.rows.udt_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1870,7 +1870,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_udt_field_name, { "User Defined Type field Name", "cql.result.rows.udt_field_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1915,7 +1915,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_keyspace_name, { "Keyspace Name", "cql.result.rows.keyspace_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1924,7 +1924,7 @@ proto_register_cql(void) &hf_cql_string_result_rows_column_name, { "Column Name", "cql.result.rows.column_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -2004,7 +2004,7 @@ proto_register_cql(void) &hf_cql_ascii, { "Ascii", "cql.ascii", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, "An Ascii string", HFILL } @@ -2076,7 +2076,7 @@ proto_register_cql(void) &hf_cql_varchar, { "Varchar", "cql.varchar", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -2085,7 +2085,7 @@ proto_register_cql(void) &hf_cql_timeuuid, { "Time Uuid", "cql.timeuuid", - FT_GUID, STR_ASCII, + FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -2094,7 +2094,7 @@ proto_register_cql(void) &hf_cql_custom, { "Custom", "cql.custom", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, "A custom field", HFILL } diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index d91a96d396..9ffb6be0b3 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -691,7 +691,7 @@ void proto_register_credssp(void) { "OCTET_STRING", HFILL }}, { &hf_credssp_packageName, { "packageName", "credssp.packageName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_credssp_credBuffer, { "credBuffer", "credssp.credBuffer", diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index 1603668bbb..3c7144c7e8 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -359,16 +359,16 @@ proto_register_cups(void) { "State", "cups.state", FT_UINT8, BASE_HEX, VALS(cups_state_values), 0x0, NULL, HFILL }}, { &hf_cups_uri, - { "URI", "cups.uri", FT_STRING, STR_UNICODE, + { "URI", "cups.uri", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cups_location, - { "Location", "cups.location", FT_STRING, STR_UNICODE, + { "Location", "cups.location", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cups_information, - { "Information", "cups.information", FT_STRING, STR_UNICODE, + { "Information", "cups.information", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cups_make_model, - { "Make and model", "cups.make_model", FT_STRING, STR_UNICODE, + { "Make and model", "cups.make_model", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index dfe8fc7ffd..530dbaed70 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -717,7 +717,7 @@ proto_register_daap(void) }, { &hf_daap_data_string, { "Data string", "daap.data_string", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_daap_persistent_id, { "Persistent Id", "daap.persistent_id", diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index b5b43bb0f1..d66c948d00 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -1257,21 +1257,21 @@ proto_register_dbus(void) { { &hf_dbus_padding, { "Padding", "dbus.padding", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_path, { "Path", "dbus.path", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_interface, { "Interface", "dbus.interface", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_member, { "Member", "dbus.member", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_error_name, { "Error name", "dbus.error_name", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_reply_serial, { "Reply serial", "dbus.reply_serial", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_destination, { "Destination", "dbus.destination", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_sender, { "Sender", "dbus.sender", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_signature, { "Signature", "dbus.signature", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_unix_fds, { "Unix FDs", "dbus.unix_fds", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_body, { "Body", "dbus.body", @@ -1295,11 +1295,11 @@ proto_register_dbus(void) { { &hf_dbus_type_double, { "Double", "dbus.type.double", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_string, { "String", "dbus.type.string", - FT_UINT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_object_path, { "Object Path", "dbus.type.object_path", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_signature, { "Signature", "dbus.type.signature", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_array, { "Array", "dbus.type.array", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_array_length, { "Array Length", "dbus.type.array.length", @@ -1309,7 +1309,7 @@ proto_register_dbus(void) { { &hf_dbus_type_variant, { "Variant", "dbus.type.variant", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_variant_signature, { "Variant Signature", "dbus.type.variant.signature", - FT_UINT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL }}, + FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_dict_entry, { "Dict Entry", "dbus.type.dict_entry", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x00, NULL, HFILL }}, { &hf_dbus_type_dict_entry_key, { "Key", "dbus.type.dict_entry.key", diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 6903ff549f..96c8ef63ae 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -3116,7 +3116,7 @@ proto_register_dhcpv6(void) { "Remaining length in the domain name field exceeded", "dhcpv6.domain_field_len_exceeded", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_dhcpv6_decoded_portion, - { "Portion successfully decoded", "dhcpv6.decoded_portion", FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL}}, + { "Portion successfully decoded", "dhcpv6.decoded_portion", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}}, { &hf_dhcpv6_encoded_fqdn_len_gt_255, { "DNS-encoded labels of FQDN exceed 255 octets", "dhcpv6.encoded_fqdn_gt_255", FT_UINT16, BASE_DEC, NULL, 0, "Encoded length is greater than 255 [RFC 1035 3.1.]", HFILL}}, @@ -3124,10 +3124,10 @@ proto_register_dhcpv6(void) { "Root only domain name", "dhcpv6.root_only_domain_name", FT_STRING, BASE_NONE, NULL, 0, "The root domain cannot be resolved", HFILL}}, { &hf_dhcpv6_tld, - { "Top Level Domain name", "dhcpv6.tld", FT_STRING, STR_ASCII, NULL, 0, + { "Top Level Domain name", "dhcpv6.tld", FT_STRING, BASE_NONE, NULL, 0, "Likely to fail because most TLDs do not have an IP address", HFILL}}, { &hf_dhcpv6_partial_name_preceded_by_fqdn, - { "Partial name preceded by FQDN", "dhcpv6.partial_name_preceded_by_fqdn", FT_STRING, STR_ASCII, NULL, 0, + { "Partial name preceded by FQDN", "dhcpv6.partial_name_preceded_by_fqdn", FT_STRING, BASE_NONE, NULL, 0, "Partial domain names must be the only name in the domain field", HFILL}}, { &hf_remoteid_enterprise, @@ -3239,7 +3239,7 @@ proto_register_dhcpv6(void) { &hf_subscriber_id, { "Subscriber-ID", "dhcpv6.subscriber_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_client_fqdn, - { "Client Domain Name", "dhcpv6.client_domain", FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } }, + { "Client Domain Name", "dhcpv6.client_domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_pana_agent, { "PANA agents address", "dhcpv6.pana_agent", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_opt_timezone, @@ -3345,7 +3345,7 @@ proto_register_dhcpv6(void) { &hf_option_failover_reconfigure_key, { "Reconfigure Key", "dhcpv6.failover.reconfigure_key", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_option_failover_relationship_name, - { "Relationship Name", "dhcpv6.failover.relationship_name", FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }}, + { "Relationship Name", "dhcpv6.failover.relationship_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_option_failover_server_flags, { "Flags", "dhcpv6.failover.server.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_option_failover_server_reserved_flag, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index f414affc53..1d7d0a18d9 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -5165,7 +5165,7 @@ proto_register_dns(void) { &hf_dns_txt, { "TXT", "dns.txt", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dns_openpgpkey, @@ -5845,7 +5845,7 @@ proto_register_dns(void) { &hf_dns_opt_ext_error_extra_text, { "Extra Text", "dns.opt.ext_error.extra_text", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dns_count_questions, diff --git a/epan/dissectors/packet-dpnet.c b/epan/dissectors/packet-dpnet.c index 80c32a74aa..7dd613168c 100644 --- a/epan/dissectors/packet-dpnet.c +++ b/epan/dissectors/packet-dpnet.c @@ -553,7 +553,7 @@ proto_register_dpnet(void) }, { &hf_dpnet_session_name, { "Session name", "dpnet.session_name", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-drbd.c b/epan/dissectors/packet-drbd.c index f0850888ea..7b06292df3 100644 --- a/epan/dissectors/packet-drbd.c +++ b/epan/dissectors/packet-drbd.c @@ -1157,8 +1157,8 @@ void proto_register_drbd(void) { &hf_drbd_oldest_block_id, { "oldest_block_id", "drbd.oldest_block_id", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_youngest_block_id, { "youngest_block_id", "drbd.youngest_block_id", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_resync_rate, { "resync_rate", "drbd.resync_rate", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_drbd_verify_alg, { "verify_alg", "drbd.verify_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }}, - { &hf_drbd_csums_alg, { "csums_alg", "drbd.csums_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }}, + { &hf_drbd_verify_alg, { "verify_alg", "drbd.verify_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_drbd_csums_alg, { "csums_alg", "drbd.csums_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_c_plan_ahead, { "c_plan_ahead", "drbd.c_plan_ahead", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_c_delay_target, { "c_delay_target", "drbd.c_delay_target", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_c_fill_target, { "c_fill_target", "drbd.c_fill_target", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, @@ -1169,7 +1169,7 @@ void proto_register_drbd(void) { &hf_drbd_after_sb_2p, { "after_sb_2p", "drbd.after_sb_2p", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_conn_flags, { "conn_flags", "drbd.conn_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_two_primaries, { "two_primaries", "drbd.two_primaries", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_drbd_integrity_alg, { "integrity_alg", "drbd.integrity_alg", FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL }}, + { &hf_drbd_integrity_alg, { "integrity_alg", "drbd.integrity_alg", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_current_uuid, { "Current UUID", "drbd.current_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_bitmap_uuid, { "Bitmap UUID", "drbd.bitmap_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_drbd_history_uuid_list, { "History UUIDs", "drbd.history_uuids", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 78f8460fe6..1a18e0be4f 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -5274,15 +5274,15 @@ proto_register_dvbci(void) }, { &hf_dvbci_cis_tpll_v1_info_manuf, { "Manufacturer", "dvb-ci.cis.tpll_v1_info.manufacturer", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cis_tpll_v1_info_name, { "Name", "dvb-ci.cis.tpll_v1_info.name", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cis_tpll_v1_info_additional, { "Additional info", "dvb-ci.cis.tpll_v1_info.additional", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cis_tpll_v1_end, { "End of chain", "dvb-ci.cis.tpll_v1_end", @@ -5330,7 +5330,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_cis_stci_str, { "Interface description strings", "dvb-ci.cis.stci_str", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cis_tpce_indx_intface, { "Intface", "dvb-ci.cis.tpce_indx.intface", @@ -5560,7 +5560,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_menu_str, { "Menu string", "dvb-ci.ap.menu_string", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_data_rate, { "Transport stream data rate supported by the host", @@ -5734,7 +5734,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_enq, { "Enquiry string", "dvb-ci.mmi.enq", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_ans_id, { "Answer ID", "dvb-ci.mmi.ans_id", @@ -5742,7 +5742,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_ans, { "Answer", "dvb-ci.mmi.ans", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_choice_nb, { "Number of menu items", "dvb-ci.mmi.choice_nb", @@ -5758,27 +5758,27 @@ proto_register_dvbci(void) }, { &hf_dvbci_title, { "Title", "dvb-ci.mmi.title", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_subtitle, { "Sub-title", "dvb-ci.mmi.subtitle", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_bottom, { "Bottom line", "dvb-ci.mmi.bottom", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_item, { "Item", "dvb-ci.mmi.item", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_host_country, { "Host country", "dvb-ci.hlc.country", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_host_language, { "Host language", "dvb-ci.hlc.language", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cup_type, { "CAM upgrade type", "dvb-ci.cup.type", @@ -5944,7 +5944,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_pincode, { "PIN code", "dvb-ci.cc.pincode", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_app_dom_id_len, { "Application Domain Identifier length", "dvb-ci.ami.app_dom_id_len", @@ -5956,11 +5956,11 @@ proto_register_dvbci(void) }, { &hf_dvbci_app_dom_id, { "Application Domain Identifier", "dvb-ci.ami.app_dom_id", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_init_obj, { "Initial Object", "dvb-ci.ami.init_obj", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_ack_code, { "Acknowledgement", "dvb-ci.ami.ack_code", @@ -5980,7 +5980,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_file_name, { "File name", "dvb-ci.ami.file_name", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_file_data_len, { "File data length", "dvb-ci.ami.file_data_len", @@ -6064,7 +6064,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_lsc_hostname, { "Hostname", "dvb-ci.lsc.hostname", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_lsc_retry_count, { "Retry count", "dvb-ci.lsc.retry_count", @@ -6104,7 +6104,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_afs_dom_id, { "Domain identifier", "dvb-ci.afs.domain_identifier", - FT_UINT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } + FT_UINT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_afs_ack_code, { "Ack code", "dvb-ci.afs.ack_code", @@ -6222,7 +6222,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_opp_lang_code, { "Language code", "dvb-ci.opp.lang_code", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_prof_name, { "Profile name", "dvb-ci.opp.profile_name", @@ -6448,7 +6448,7 @@ proto_register_dvbci(void) &dvbci_dissect_lsc_msg); sas_msg_dissector_table = register_dissector_table("dvb-ci.sas.app_id_str", - "SAS application id", proto_dvbci, FT_STRING, STR_ASCII); + "SAS application id", proto_dvbci, FT_STRING, BASE_NONE); register_init_routine(dvbci_init); reassembly_table_register(&tpdu_reassembly_table, diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 2bc8e3552c..4b5d10d2f6 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -3129,7 +3129,7 @@ void proto_register_edonkey(void) { FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Meta Tag ID", HFILL } }, { &hf_edonkey_metatag_name, { "Meta Tag Name", "edonkey.metatag.name", - FT_STRING, STR_ASCII, NULL, 0, "eDonkey Meta Tag Name", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "eDonkey Meta Tag Name", HFILL } }, { &hf_edonkey_metatag_namesize, { "Meta Tag Name Size", "edonkey.metatag.namesize", FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Meta Tag Name Size", HFILL } }, @@ -3138,7 +3138,7 @@ void proto_register_edonkey(void) { FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Hash", HFILL } }, { &hf_edonkey_string, { "String", "edonkey.string", - FT_STRING, STR_ASCII, NULL, 0, "eDonkey String", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "eDonkey String", HFILL } }, { &hf_edonkey_string_length, { "String Length", "edonkey.string_length", FT_UINT16, BASE_DEC, NULL, 0, "eDonkey String Length", HFILL } }, @@ -3150,7 +3150,7 @@ void proto_register_edonkey(void) { FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Status", HFILL } }, { &hf_edonkey_directory, { "Directory", "edonkey.directory", - FT_STRING, STR_ASCII, NULL, 0, "eDonkey Directory", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "eDonkey Directory", HFILL } }, { &hf_edonkey_fileinfo, { "eDonkey File Info", "edonkey.fileinfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -3210,28 +3210,28 @@ void proto_register_edonkey(void) { FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_kademlia_peer_id, { "Peer ID", "edonkey.kademlia.peer.id", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia Peer ID", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia Peer ID", HFILL } }, { &hf_kademlia_hash, { "Kademlia Hash", "edonkey.kademlia.hash", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_kademlia_file_id, { "File ID", "edonkey.kademlia.file.id", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia File ID", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia File ID", HFILL } }, { &hf_kademlia_keyword_hash, { "Keyword Hash", "edonkey.kademlia.keyword.hash", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia Keyword Hash", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia Keyword Hash", HFILL } }, { &hf_kademlia_recipients_id, { "Recipient's ID", "edonkey.kademlia.recipients.id", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia Recipient's ID", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia Recipient's ID", HFILL } }, { &hf_kademlia_sender_id, { "Sender ID", "edonkey.kademlia.sender.id", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia Sender ID", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia Sender ID", HFILL } }, { &hf_kademlia_target_id, { "Target ID", "edonkey.kademlia.target.id", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia Target ID", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia Target ID", HFILL } }, { &hf_kademlia_distance, { "XOR Distance", "edonkey.kademlia.distance", - FT_STRING, STR_ASCII, NULL, 0, "Kademlia XOR Distance", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "Kademlia XOR Distance", HFILL } }, { &hf_kademlia_version, { "Kad Version", "edonkey.kademlia.version", FT_UINT8, BASE_DEC_HEX, VALS(kademlia_versions), 0, NULL, HFILL } }, @@ -3258,7 +3258,7 @@ void proto_register_edonkey(void) { FT_STRING, BASE_NONE, NULL, 0, "HASH Tag Value", HFILL } }, { &hf_kademlia_tag_string, { "Tag Value (String)", "edonkey.kademlia.tag.value.string", - FT_STRING, STR_ASCII, NULL, 0, "String Tag Value", HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, "String Tag Value", HFILL } }, { &hf_kademlia_tag_bsob, { "Tag Value (BSOB)", "edonkey.kademlia.tag.value.bsob", FT_BYTES, BASE_NONE, NULL, 0, "BSOB Tag Value", HFILL } }, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 4ed925b582..77b3a6f306 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -5723,7 +5723,7 @@ proto_register_epl(void) }, { &hf_epl_asnd_identresponse_profile_path, { "Profile Path", "epl.asnd.ires.profilepath", - FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_epl_asnd_identresponse_vid, { "VendorId", "epl.asnd.ires.vendorid", @@ -6208,7 +6208,7 @@ proto_register_epl(void) /* EPL Data types */ { &hf_epl_pdo, { "PDO", "epl.pdo", - FT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_epl_pdo_index, { "Index", "epl.pdo.index", @@ -6266,7 +6266,7 @@ proto_register_epl(void) }, { &hf_epl_od_string, { "Data", "epl.od.data.string", - FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_epl_od_octet_string, { "Data", "epl.od.data.bytestring", diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index c6776b45ab..ff47eae609 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1606,7 +1606,7 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_alpha_id_string, { "Alpha Identifier String", "etsi_cat.comp_tlv.alpha_id.string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_address_ton, @@ -1621,12 +1621,12 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_address_string, { "Address String", "etsi_cat.comp_tlv.address.string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_subaddress_string, { "Subaddress String", "etsi_cat.comp_tlv.subaddress.string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_result_gen, @@ -1671,7 +1671,7 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_text_string, { "Text String", "etsi_cat.comp_tlv.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_event, @@ -1691,7 +1691,7 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_item_string, { "Item String", "etsi_cat.comp_tlv.item.string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_loc_status, @@ -1751,22 +1751,22 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_at_cmd, { "AT Command", "etsi_cat.comp_tlv.at_cmd", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_at_rsp, { "AT Response", "etsi_cat.comp_tlv.at_rsp", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_dtmf_string, { "DMTF String", "etsi_cat.comp_tlv.dtmf.string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_language, { "Language", "etsi_cat.comp_tlv.language", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_me_status, @@ -2021,17 +2021,17 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_iari, { "IARI", "etsi_cat.comp_tlv.iari", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_impu, { "IMPU", "etsi_cat.comp_tlv.impu", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_ims_status_code, { "IMS Status-Code", "etsi_cat.comp_tlv.ims_status_code", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_broadcast_nw_tech, diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index e462d53be3..0e88346656 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -404,7 +404,7 @@ static header_field_info hfi_gadu_gadu_msg_class GADU_GADU_HFI_INIT = { "Message class", "gadu-gadu.msg.class", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_gadu_gadu_msg_text GADU_GADU_HFI_INIT = - { "Message text", "gadu-gadu.msg.text", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }; + { "Message text", "gadu-gadu.msg.text", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; /* GG_RECV_MSG80, GG_SEND_MSG80 (gadu-gadu.msg80.*) */ static header_field_info hfi_gadu_gadu_msg80_offset_plain GADU_GADU_HFI_INIT = @@ -443,7 +443,7 @@ static header_field_info hfi_gadu_gadu_status_img_size GADU_GADU_HFI_INIT = { "Image size", "gadu-gadu.status.image_size", FT_UINT8, BASE_DEC, NULL, 0x00, "Maximum image size in KB", HFILL }; static header_field_info hfi_gadu_gadu_status_descr GADU_GADU_HFI_INIT = - { "Description", "gadu-gadu.status.description", FT_STRINGZ, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Description", "gadu-gadu.status.description", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; /* Direct Connection (gadu-gadu.dcc.*) */ static header_field_info hfi_dcc_type GADU_GADU_HFI_INIT = @@ -466,7 +466,7 @@ static header_field_info hfi_gadu_gadu_new_status_status GADU_GADU_HFI_INIT = { "Status", "gadu-gadu.new_status.status", FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_gadu_gadu_new_status_desc GADU_GADU_HFI_INIT = - { "Description", "gadu-gadu.new_status.description", FT_STRINGZ, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Description", "gadu-gadu.new_status.description", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; /* Userlist (gadu-gadu.userlist.*) */ static header_field_info hfi_gadu_gadu_userlist_request_type GADU_GADU_HFI_INIT = diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index 732a623716..14130a84d2 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -2070,7 +2070,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pos_display_text, { "Country and Region name", "gmr1.rr.pos_display.text", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_rr_pos_upd_info_v, diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 161ca39b2d..ef2113072a 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -7858,7 +7858,7 @@ proto_register_gsm_a_dtap(void) }, { &hf_gsm_a_dtap_text_string, { "Text String", "gsm_a.dtap.text_string", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_gsm_a_dtap_time_zone_time, diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 1e471eb6f9..42776ce3e3 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -14353,7 +14353,7 @@ proto_register_gsm_a_rr(void) }, { &hf_gsm_a_rr_ec_imsi, { "IMSI", "gsm_a.rr.ec_imsi", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-gsm_cbsp.c b/epan/dissectors/packet-gsm_cbsp.c index 57f540ee43..9865ec489b 100644 --- a/epan/dissectors/packet-gsm_cbsp.c +++ b/epan/dissectors/packet-gsm_cbsp.c @@ -869,7 +869,7 @@ proto_register_cbsp(void) { &hf_cbsp_cb_msg_page, { "CBS Message Information Page", "cbsp.cb_msg_page", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_cbsp_cbs_page_content, { "CBS Page Content", "cbsp.cb_page_content", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_cbsp_sched_period, { "Schedule Period", "cbsp.sched_period", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_cbsp_num_of_res_slots, { "Number of Reserved Slots", "cbsp.num_of_res_slots", diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index c7ef7768fd..ee3b893012 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -24652,7 +24652,7 @@ void proto_register_gsm_map(void) { "Service Area Code", HFILL }}, { &hf_gsm_map_ussd_string, { "USSD String", "gsm_map.ussd_string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_gsm_map_spare_bits, { "Spare bit(s)", "gsm_map.spare_bits", @@ -24822,11 +24822,11 @@ void proto_register_gsm_map(void) { "ISDN_AddressString", HFILL }}, { &hf_gsm_map_diameter_Name, { "diameter-Name", "gsm_map.diameter_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_diameter_Realm, { "diameter-Realm", "gsm_map.diameter_Realm", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_cellGlobalIdOrServiceAreaIdFixedLength, { "cellGlobalIdOrServiceAreaIdFixedLength", "gsm_map.cellGlobalIdOrServiceAreaIdFixedLength", @@ -26701,11 +26701,11 @@ void proto_register_gsm_map(void) { NULL, HFILL }}, { &hf_gsm_map_ms_sgsn_Name, { "sgsn-Name", "gsm_map.ms.sgsn_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_ms_sgsn_Realm, { "sgsn-Realm", "gsm_map.ms.sgsn_Realm", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_ms_lgd_supportIndicator, { "lgd-supportIndicator", "gsm_map.ms.lgd_supportIndicator_element", @@ -28373,7 +28373,7 @@ void proto_register_gsm_map(void) { "TA_Id", HFILL }}, { &hf_gsm_map_ms_mme_Name, { "mme-Name", "gsm_map.ms.mme_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_ms_routeingAreaIdentity, { "routeingAreaIdentity", "gsm_map.ms.routeingAreaIdentity", @@ -30095,19 +30095,19 @@ void proto_register_gsm_map(void) { "SupportedLCS_CapabilitySets", HFILL }}, { &hf_gsm_map_lcs_mme_Name, { "mme-Name", "gsm_map.lcs.mme_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_lcs_aaa_Server_Name, { "aaa-Server-Name", "gsm_map.lcs.aaa_Server_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_lcs_sgsn_Name, { "sgsn-Name", "gsm_map.lcs.sgsn_Name", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_lcs_sgsn_Realm, { "sgsn-Realm", "gsm_map.lcs.sgsn_Realm", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_lcs_locationType, { "locationType", "gsm_map.lcs.locationType_element", @@ -30435,7 +30435,7 @@ void proto_register_gsm_map(void) { "ISDN_AddressString", HFILL }}, { &hf_gsm_map_lcs_mme_Number, { "mme-Number", "gsm_map.lcs.mme_Number", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "DiameterIdentity", HFILL }}, { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable, { "msAvailable", "gsm.map.lcs.DeferredLocationEventType.msAvailable", diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index d7f387ba8d..57e9bcf29f 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2986,22 +2986,22 @@ proto_register_gsm_sms(void) }, { &hf_gsm_sms_tp_oa, { "TP-OA Digits", "gsm_sms.tp-oa", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "TP-Originating-Address Digits", HFILL } }, { &hf_gsm_sms_tp_da, { "TP-DA Digits", "gsm_sms.tp-da", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "TP-Destination-Address Digits", HFILL } }, { &hf_gsm_sms_tp_ra, { "TP-RA Digits", "gsm_sms.tp-ra", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "TP-Recipient-Address Digits", HFILL } }, { &hf_gsm_sms_tp_digits, { "Digits", "gsm_sms.tp-digits", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "TP (Unknown) Digits", HFILL } }, { &hf_gsm_sms_tp_pid, @@ -3066,7 +3066,7 @@ proto_register_gsm_sms(void) }, { &hf_gsm_sms_text, { "SMS text", "gsm_sms.sms_text", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "The text of the SMS", HFILL } }, { &hf_gsm_sms_body, diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index b45e7b212f..69ae2bae95 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -10444,12 +10444,12 @@ proto_register_gtp(void) }, {&hf_gtp_node_name, { "Node name", "gtp.node_name", - FT_UINT_STRING, STR_ASCII, NULL, 0, + FT_UINT_STRING, BASE_NONE, NULL, 0, "Diameter Identity of the node", HFILL} }, {&hf_gtp_node_realm, { "Node realm", "gtp.node_realm", - FT_UINT_STRING, STR_ASCII, NULL, 0, + FT_UINT_STRING, BASE_NONE, NULL, 0, "Diameter Realm Identity of the node", HFILL} }, {&hf_gtp_npdu_number, diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index 6b84f56e48..7008d15151 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -214,7 +214,7 @@ proto_register_hdmi(void) FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_hdmi_edid_manf_id, { "Manufacturer ID", "hdmi.edid.manf_id", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_hdmi_edid_manf_prod_code, { "Manufacturer product code", "hdmi.edid.manf_prod_code", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-hicp.c b/epan/dissectors/packet-hicp.c index a3da0b6d82..48f8cfcc16 100644 --- a/epan/dissectors/packet-hicp.c +++ b/epan/dissectors/packet-hicp.c @@ -242,127 +242,127 @@ proto_register_hicp(void) static hf_register_info hf[] = { { &hf_hicp_cmd, { "Command", "hicp.cmd", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_proto_version, { "Protocol version", "hicp.protoversion", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_fb_type, { "Fieldbus type", "hicp.fbtype", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_module_version, { "Module version", "hicp.moduleversion", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_mac, { "MAC address", "hicp.mac", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_ip, { "IP address", "hicp.ip", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_sn, { "Subnet mask", "hicp.sn", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_gw, { "Gateway address", "hicp.gw", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_dhcp, { "DHCP", "hicp.dhcp", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_pswd_required, { "Password", "hicp.pswdrequired", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_hn, { "Hostname", "hicp.hn", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_dns1, { "Primary DNS address", "hicp.dns1", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_dns2, { "Secondary DNS", "hicp.dns2", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_ext, { "Extended commands supported", "hicp.ext", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_pswd, { "Password", "hicp.pswd", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_new_pswd, { "New password", "hicp.newpswd", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_new_mac, { "New MAC address", "hicp.newmac", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_status, { "Status", "hicp.status", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_error, { "Error", "hicp.error", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_target, { "Target", "hicp.target", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hicp_src, { "Source", "hicp.src", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c index c14585baca..6429ae9dbd 100644 --- a/epan/dissectors/packet-hiqnet.c +++ b/epan/dissectors/packet-hiqnet.c @@ -1233,7 +1233,7 @@ proto_register_hiqnet(void) }, { &hf_hiqnet_errstr, { "Error string", "hiqnet.errstr", - FT_STRINGZ, STR_UNICODE, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -1488,7 +1488,7 @@ proto_register_hiqnet(void) /* Counted *and* null-terminated */ { &hf_hiqnet_string_value, { "Value", "hiqnet.string_value", - FT_STRINGZ, STR_UNICODE, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -1506,7 +1506,7 @@ proto_register_hiqnet(void) }, { &hf_hiqnet_wrkgrppath, { "Workgroup Path", "hiqnet.wrkgrppath", - FT_STRINGZ, STR_UNICODE, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -1686,19 +1686,19 @@ proto_register_hiqnet(void) }, { &hf_hiqnet_eventtime, { "Time", "hiqnet.eventtime", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hiqnet_eventdate, { "Date", "hiqnet.eventdate", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hiqnet_eventinfo, { "Information", "hiqnet.information", - FT_STRING, STR_UNICODE, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index a3410f28f6..913ab2f76a 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3942,19 +3942,19 @@ proto_register_http(void) "HTTP Request Method", HFILL }}, { &hf_http_request_uri, { "Request URI", "http.request.uri", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Request-URI", HFILL }}, { &hf_http_request_path, { "Request URI Path", "http.request.uri.path", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Request-URI Path", HFILL }}, { &hf_http_request_query, { "Request URI Query", "http.request.uri.query", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Request-URI Query", HFILL }}, { &hf_http_request_query_parameter, { "Request URI Query Parameter", "http.request.uri.query.parameter", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Request-URI Query Parameter", HFILL }}, { &hf_http_request_version, { "Request Version", "http.request.version", @@ -3978,7 +3978,7 @@ proto_register_http(void) "HTTP Response Status Code Description", HFILL }}, { &hf_http_response_for_uri, { "Request URI", "http.response_for.uri", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Response For-URI", HFILL }}, { &hf_http_response_phrase, { "Response Phrase", "http.response.phrase", @@ -4162,7 +4162,7 @@ proto_register_http(void) NULL, HFILL }}, { &hf_http_file_data, { "File Data", "http.file_data", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_http_unknown_header, { "Unknown header", "http.unknown_header", diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index aceb29e115..69c1484501 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -629,7 +629,7 @@ register_static_headers(void) { { &hf_http2_headers_authority, {":authority", "http2.headers.authority", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Authority portion of the target URI", HFILL} }, { @@ -641,55 +641,55 @@ register_static_headers(void) { { &hf_http2_headers_path, {":path", "http2.headers.path", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_http2_headers_method, {":method", "http2.headers.method", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_http2_headers_scheme, {":scheme", "http2.headers.scheme", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_http2_headers_accept, {"accept", "http2.headers.accept", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Media types that are acceptable to the user agent", HFILL} }, { &hf_http2_headers_accept_charset, {"accept-charset", "http2.headers.accept_charset", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Acceptable charsets in textual responses for the user agent", HFILL} }, { &hf_http2_headers_accept_encoding, {"accept-encoding", "http2.headers.accept_encoding", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Acceptable content codings (like compression) in responses for the user agent", HFILL} }, { &hf_http2_headers_accept_language, {"accept-language", "http2.headers.accept_language", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Preferred natural languages for the user agent", HFILL} }, { &hf_http2_headers_accept_ranges, {"accept-ranges", "http2.headers.accept_ranges", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Bytes range which server may use for partial data transfer", HFILL} }, { &hf_http2_headers_access_control_allow_origin, {"access-control-allow-origin", "http2.headers.access_control_allow_origin", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Origin control for cross-origin resource sharing", HFILL} }, { @@ -701,37 +701,37 @@ register_static_headers(void) { { &hf_http2_headers_allow, {"allow", "http2.headers.allow", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "List of allowed methods for request", HFILL} }, { &hf_http2_headers_authorization, {"authorization", "http2.headers.authorization", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Credentials for a server-side authorization", HFILL} }, { &hf_http2_headers_cache_control, {"cache-control", "http2.headers.cache_control", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Request or response directives for a cache control", HFILL} }, { &hf_http2_headers_content_disposition, {"content-disposition", "http2.headers.content_disposition", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Indicates that response will be displayed as page or downloaded with dialog box", HFILL} }, { &hf_http2_headers_content_encoding, {"content-encoding", "http2.headers.content_encoding", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_http2_headers_content_language, {"content-language", "http2.headers.content_language", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { @@ -743,103 +743,103 @@ register_static_headers(void) { { &hf_http2_headers_content_location, {"content-location", "http2.headers.content_location", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Alternative URL for a response data", HFILL} }, { &hf_http2_headers_content_range, {"content-range", "http2.headers.content_range", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Range of bytes which was sent by server for partial data transfer", HFILL} }, { &hf_http2_headers_content_type, {"content-type", "http2.headers.content_type", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "MIME type of response", HFILL} }, { &hf_http2_headers_cookie, {"cookie", "http2.headers.cookie", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Stored cookies", HFILL} }, { &hf_http2_headers_date, {"date", "http2.headers.date", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Date and time at which the data was originated", HFILL} }, { &hf_http2_headers_etag, {"etag", "http2.headers.etag", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Directive for version indication of resource", HFILL} }, { &hf_http2_headers_expect, {"expect", "http2.headers.expect", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Expectations that need to be fulfilled for correct request", HFILL} }, { &hf_http2_headers_expires, {"expires", "http2.headers.expires", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Data after which resource will be stale", HFILL} }, { &hf_http2_headers_from, {"from", "http2.headers.from", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email of a person who responsible for a requesting data", HFILL} }, { &hf_http2_headers_if_match, {"if-match", "http2.headers.if_match", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for requesting data matched by a list of ETags", HFILL} }, { &hf_http2_headers_if_modified_since, {"if-modified-since", "http2.headers.if_modified_since", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Resource will be sent with status code 200 if it was modified otherwise with status code 304", HFILL} }, { &hf_http2_headers_if_none_match, {"if-none-match", "http2.headers.if_none_match", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for requesting data not matched by a list of ETags", HFILL} }, { &hf_http2_headers_if_range, {"if-range", "http2.headers.if_range", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for a range request which is used to check if a resource was modified", HFILL} }, { &hf_http2_headers_if_unmodified_since, {"if-unmodified-since", "http2.headers.if_unmodified_since", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Resource will be processed if it was not modified otherwise 412 error will be returned", HFILL} }, { &hf_http2_headers_last_modified, {"last-modified", "http2.headers.last_modified", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Date and time at which the origin server believes the resource was last modified", HFILL} }, { &hf_http2_headers_link, {"link", "http2.headers.link", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for indicating that resource will be preloaded", HFILL} }, { &hf_http2_headers_location, {"location", "http2.headers.location", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for indicating that client will be redirected", HFILL} }, { @@ -851,79 +851,79 @@ register_static_headers(void) { { &hf_http2_headers_proxy_authenticate, {"proxy-authenticate", "http2.headers.proxy_authenticate", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Authentication method that should be used to gain access to a resource behind a proxy server", HFILL} }, { &hf_http2_headers_proxy_authorization, {"proxy-authorization", "http2.headers.proxy_authorization", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Credentials for a proxy-side authorization", HFILL} }, { &hf_http2_headers_range, {"range", "http2.headers.range", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Range of resource bytes that server should return", HFILL} }, { &hf_http2_headers_referer, {"referer", "http2.headers.referer", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Address of the previous web page", HFILL} }, { &hf_http2_headers_refresh, {"refresh", "http2.headers.refresh", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Time in seconds after which client will be redirected by given url", HFILL} }, { &hf_http2_headers_retry_after, {"retry-after", "http2.headers.retry_after", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism to indicate when resource expected to be available", HFILL} }, { &hf_http2_headers_server, {"server", "http2.headers.server", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Information about server software", HFILL} }, { &hf_http2_headers_set_cookie, {"set-cookie", "http2.headers.set_cookie", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Send a cookie to the client", HFILL} }, { &hf_http2_headers_strict_transport_security, {"strict-transport-security", "http2.headers.strict_transport_security", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HSTS indicates that resource should be accessed only using HTTPS", HFILL} }, { &hf_http2_headers_user_agent, {"user-agent", "http2.headers.user_agent", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Information about client software", HFILL} }, { &hf_http2_headers_vary, {"vary", "http2.headers.vary", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Mechanism for selecting which header will be used for content negotiation algorithm", HFILL} }, { &hf_http2_headers_via, {"via", "http2.headers.via", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Additional information for loop detection and protocol capabilities in proxy requests", HFILL} }, { &hf_http2_headers_www_authenticate, {"www-authenticate", "http2.headers.www_authenticate", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Authentication method that should be used to gain access to a resource", HFILL} } }; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 6a46d4fac0..d2e75a4cb3 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2521,19 +2521,19 @@ proto_register_ip(void) { &hf_geoip_country, { "Source or Destination GeoIP Country", "ip.geoip.country", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_country_iso, { "Source or Destination GeoIP ISO Two Letter Country Code", "ip.geoip.country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_city, { "Source or Destination GeoIP City", "ip.geoip.city", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_as_number, { "Source or Destination GeoIP AS Number", "ip.geoip.asnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_as_org, { "Source or Destination GeoIP AS Organization", "ip.geoip.org", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_latitude, { "Source or Destination GeoIP Latitude", "ip.geoip.lat", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -2542,22 +2542,22 @@ proto_register_ip(void) FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_summary, { "Source GeoIP", "ip.geoip.src_summary", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_country, { "Source GeoIP Country", "ip.geoip.src_country", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_country_iso, { "Source GeoIP ISO Two Letter Country Code", "ip.geoip.src_country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_city, { "Source GeoIP City", "ip.geoip.src_city", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_as_number, { "Source GeoIP AS Number", "ip.geoip.src_asnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_as_org, { "Source GeoIP AS Organization", "ip.geoip.src_org", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_src_latitude, { "Source GeoIP Latitude", "ip.geoip.src_lat", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -2566,22 +2566,22 @@ proto_register_ip(void) FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_summary, { "Destination GeoIP", "ip.geoip.dst_summary", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_country, { "Destination GeoIP Country", "ip.geoip.dst_country", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_country_iso, { "Destination GeoIP ISO Two Letter Country Code", "ip.geoip.dst_country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_city, { "Destination GeoIP City", "ip.geoip.dst_city", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_as_number, { "Destination GeoIP AS Number", "ip.geoip.dst_asnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_as_org, { "Destination GeoIP AS Organization", "ip.geoip.dst_org", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_geoip_dst_latitude, { "Destination GeoIP Latitude", "ip.geoip.dst_lat", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 310dd07e12..c1a0948ffd 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -3292,17 +3292,17 @@ proto_register_ipv6(void) { &hf_geoip_country, { "Source or Destination GeoIP Country", "ipv6.geoip.country", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_country_iso, { "Source or Destination GeoIP ISO Two Letter Country Code", "ipv6.geoip.country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_city, { "Source or Destination GeoIP City", "ipv6.geoip.city", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_as_number, @@ -3312,7 +3312,7 @@ proto_register_ipv6(void) }, { &hf_geoip_as_org, { "Source or Destination GeoIP AS Organization", "ipv6.geoip.org", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_latitude, @@ -3327,22 +3327,22 @@ proto_register_ipv6(void) }, { &hf_geoip_src_summary, { "Source GeoIP", "ipv6.geoip.src_summary", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_src_country, { "Source GeoIP Country", "ipv6.geoip.src_country", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_src_country_iso, { "Source GeoIP ISO Two Letter Country Code", "ipv6.geoip.src_country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_src_city, { "Source GeoIP City", "ipv6.geoip.src_city", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_src_as_number, @@ -3352,7 +3352,7 @@ proto_register_ipv6(void) }, { &hf_geoip_src_as_org, { "Source GeoIP AS Organization", "ipv6.geoip.src_org", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_src_latitude, @@ -3367,22 +3367,22 @@ proto_register_ipv6(void) }, { &hf_geoip_dst_summary, { "Destination GeoIP", "ipv6.geoip.dst_summary", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_dst_country, { "Destination GeoIP Country", "ipv6.geoip.dst_country", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_dst_country_iso, { "Destination GeoIP ISO Two Letter Country Code", "ipv6.geoip.dst_country_iso", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_dst_city, { "Destination GeoIP City", "ipv6.geoip.dst_city", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_dst_as_number, @@ -3392,7 +3392,7 @@ proto_register_ipv6(void) }, { &hf_geoip_dst_as_org, { "Destination GeoIP AS Organization", "ipv6.geoip.dst_org", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_geoip_dst_latitude, diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index 36a316db15..3277120288 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -485,40 +485,40 @@ void proto_register_irc(void) { static hf_register_info hf[] = { - { &hf_irc_response, { "Response", "irc.response", FT_STRING, STR_ASCII, + { &hf_irc_response, { "Response", "irc.response", FT_STRING, BASE_NONE, NULL, 0x0, "Line of response message", HFILL }}, - { &hf_irc_request, { "Request", "irc.request", FT_STRING, STR_ASCII, + { &hf_irc_request, { "Request", "irc.request", FT_STRING, BASE_NONE, NULL, 0x0, "Line of request message", HFILL }}, - { &hf_irc_request_prefix, { "Prefix", "irc.request.prefix", FT_STRING, STR_ASCII, + { &hf_irc_request_prefix, { "Prefix", "irc.request.prefix", FT_STRING, BASE_NONE, NULL, 0x0, "Request prefix", HFILL }}, - { &hf_irc_request_command, { "Command", "irc.request.command", FT_STRING, STR_ASCII, + { &hf_irc_request_command, { "Command", "irc.request.command", FT_STRING, BASE_NONE, NULL, 0x0, "Request command", HFILL }}, - { &hf_irc_request_command_param, { "Parameter", "irc.request.command_parameter", FT_STRING, STR_ASCII, + { &hf_irc_request_command_param, { "Parameter", "irc.request.command_parameter", FT_STRING, BASE_NONE, NULL, 0x0, "Request command parameter", HFILL }}, - { &hf_irc_request_trailer, { "Trailer", "irc.request.trailer", FT_STRING, STR_ASCII, + { &hf_irc_request_trailer, { "Trailer", "irc.request.trailer", FT_STRING, BASE_NONE, NULL, 0x0, "Request trailer", HFILL }}, - { &hf_irc_response_prefix, { "Prefix", "irc.response.prefix", FT_STRING, STR_ASCII, + { &hf_irc_response_prefix, { "Prefix", "irc.response.prefix", FT_STRING, BASE_NONE, NULL, 0x0, "Response prefix", HFILL }}, - { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, STR_ASCII, + { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, BASE_NONE, NULL, 0x0, "Response command", HFILL }}, { &hf_irc_response_num_command, { "Command", "irc.response.num_command", FT_UINT16, BASE_DEC, NULL, 0x0, "Response (numeric) command", HFILL }}, - { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, STR_ASCII, + { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, BASE_NONE, NULL, 0x0, "Response command parameter", HFILL }}, - { &hf_irc_response_trailer, { "Trailer", "irc.response.trailer", FT_STRING, STR_ASCII, + { &hf_irc_response_trailer, { "Trailer", "irc.response.trailer", FT_STRING, BASE_NONE, NULL, 0x0, "Response trailer", HFILL }}, - { &hf_irc_ctcp, { "CTCP Data", "irc.ctcp", FT_STRING, STR_ASCII, + { &hf_irc_ctcp, { "CTCP Data", "irc.ctcp", FT_STRING, BASE_NONE, NULL, 0x0, "Placeholder to dissect CTCP data", HFILL }} }; diff --git a/epan/dissectors/packet-iso8583.c b/epan/dissectors/packet-iso8583.c index 608d6f4348..fbf9ff1e17 100644 --- a/epan/dissectors/packet-iso8583.c +++ b/epan/dissectors/packet-iso8583.c @@ -1013,17 +1013,17 @@ proto_register_iso8583(void) }, { &hf_iso8583_mti, { "MTI", "iso8583.mti", - FT_STRING, STR_ASCII, NULL , 0, + FT_STRING, BASE_NONE, NULL , 0, "Message Type Indicator (MTI)", HFILL } }, { &hf_iso8583_bitmap1, { "Bitmap 1", "iso8583.map1", - FT_STRING, STR_ASCII, NULL , 0, + FT_STRING, BASE_NONE, NULL , 0, "First Bitmap (hex representation)", HFILL } }, { &hf_iso8583_bitmap2, { "Bitmap 2", "iso8583.map2", - FT_STRING, STR_ASCII, NULL , 0, + FT_STRING, BASE_NONE, NULL , 0, "Second Bitmap (hex representation)", HFILL } } }; @@ -1317,7 +1317,7 @@ proto_register_iso8583(void) else { hf_data[i].hfinfo.type = FT_STRING; - hf_data[i].hfinfo.display = STR_ASCII; + hf_data[i].hfinfo.display = BASE_NONE; } hf_data[i].hfinfo.strings = NULL; hf_data[i].hfinfo.bitmask = 0; diff --git a/epan/dissectors/packet-isobus-vt.c b/epan/dissectors/packet-isobus-vt.c index d59299cfb9..9f12202daf 100644 --- a/epan/dissectors/packet-isobus-vt.c +++ b/epan/dissectors/packet-isobus-vt.c @@ -4530,7 +4530,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_vtchgstrval_value, { "Value", "isobus.vt.vt_chg_str_val.val", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_vtonuserlayouthideshow_objectid_1, @@ -5175,7 +5175,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_chgstrval_value, { "Value", "isobus.vt.change_string_value.value", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_changebackgroundcolour_objectid, @@ -5395,7 +5395,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_graphicscontext_drawtext_textstring, { "Text string", "isobus.vt.graphics_context.draw_text.point.text_string", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_graphicscontext_panviewport_viewportx, @@ -5810,7 +5810,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_storeversion_versionlabel, { "Version Label", "isobus.vt.store_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_storeversion_errorcodes, @@ -5820,7 +5820,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_loadversion_versionlabel, { "Version Label", "isobus.vt.load_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_loadversion_errorcodes, @@ -5830,7 +5830,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_deleteversion_versionlabel, { "Version Label", "isobus.vt.delete_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_deleteversion_errorcodes, @@ -5845,12 +5845,12 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_extendedgetversions_versionlabel, { "Version label", "isobus.vt.extended_get_versions.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_extendedstoreversion_versionlabel, { "Version Label", "isobus.vt.extended_store_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_extendedstoreversion_errorcodes, @@ -5860,7 +5860,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_extendedloadversion_versionlabel, { "Version Label", "isobus.vt.extended_load_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_extendedloadversion_errorcodes, @@ -5870,7 +5870,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_extendeddeleteversion_versionlabel, { "Version Label", "isobus.vt.extended_delete_version.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_extendeddeleteversion_errorcodes, @@ -5885,7 +5885,7 @@ proto_register_isobus_vt(void) }, { &hf_isobus_vt_getversions_versionlabel, { "Version label", "isobus.vt.get_versions.version_label", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isobus_vt_unsupportedvtfunction_unsupportedvtfunction, diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index cc9670889e..da574c1b15 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -66,22 +66,22 @@ static header_field_info hfi_json_object JSON_HFI_INIT = { "Object", "json.object", FT_NONE, BASE_NONE, NULL, 0x00, "JSON object", HFILL }; static header_field_info hfi_json_member JSON_HFI_INIT = - { "Member", "json.member", FT_STRING, STR_UNICODE, NULL, 0x00, "JSON object member", HFILL }; + { "Member", "json.member", FT_STRING, BASE_NONE, NULL, 0x00, "JSON object member", HFILL }; static header_field_info hfi_json_key JSON_HFI_INIT = - { "Key", "json.key", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Key", "json.key", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_json_path JSON_HFI_INIT = - { "Path", "json.path", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Path", "json.path", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_json_path_with_value JSON_HFI_INIT = - { "Path with value", "json.path_with_value", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Path with value", "json.path_with_value", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_json_member_with_value JSON_HFI_INIT = - { "Member with value", "json.member_with_value", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Member with value", "json.member_with_value", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_json_value_string JSON_HFI_INIT = /* FT_STRINGZ? */ - { "String value", "json.value.string", FT_STRING, STR_UNICODE, NULL, 0x00, "JSON string value", HFILL }; + { "String value", "json.value.string", FT_STRING, BASE_NONE, NULL, 0x00, "JSON string value", HFILL }; static header_field_info hfi_json_value_number JSON_HFI_INIT = /* FT_DOUBLE/ FT_INT64? */ { "Number value", "json.value.number", FT_STRING, BASE_NONE, NULL, 0x00, "JSON number value", HFILL }; @@ -115,7 +115,7 @@ static header_field_info hfi_json_binary_data JSON_HFI_INIT = { "Binary data", "json.binary_data", FT_BYTES, BASE_NONE, NULL, 0x00, "JSON binary data", HFILL }; static header_field_info hfi_json_ignored_leading_bytes JSON_HFI_INIT = - { "Ignored leading bytes", "json.ignored_leading_bytes", FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL }; + { "Ignored leading bytes", "json.ignored_leading_bytes", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }; static int hf_json_3gpp_ueepspdnconnection = -1; static int hf_json_3gpp_bearerlevelqos = -1; diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index b2e56a2720..095a7ad77d 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -9395,7 +9395,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_metadata, { "Metadata", "kafka.metadata", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_error, @@ -9405,7 +9405,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_error_message, { "Error Message", "kafka.error_message", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_api_key, @@ -9448,17 +9448,17 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_client_id, { "Client ID", "kafka.client_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, "The ID of the sending client.", HFILL } }, { &hf_kafka_client_host, { "Client Host", "kafka.client_host", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_transactional_id, { "Transactional ID", "kafka.transactional_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_transaction_result, @@ -9483,7 +9483,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_topic_name, { "Topic Name", "kafka.topic_name", - FT_STRING, STR_UNICODE, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_producer_id, @@ -9603,7 +9603,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_batch_index_error_message, { "Batch Index Error Message", "kafka.batch_index_error_message", - FT_STRING, STR_UNICODE, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_message_timestamp, @@ -9633,17 +9633,17 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_consumer_group, { "Consumer Group", "kafka.consumer_group", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_consumer_group_instance, { "Consumer Group Instance", "kafka.consumer_group_instance", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_coordinator_key, { "Coordinator Key", "kafka.coordinator_key", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_coordinator_type, @@ -9668,12 +9668,12 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_broker_host, { "Host", "kafka.host", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_listener_name, { "Listener", "kafka.listener_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_broker_port, @@ -9683,7 +9683,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_rack, { "Rack", "kafka.rack", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_broker_security_protocol_type, @@ -9693,7 +9693,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_cluster_id, { "Cluster ID", "kafka.cluster_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_controller_id, @@ -9713,7 +9713,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_group_leader_id, { "Leader ID", "kafka.group_leader_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_leader_id, @@ -9803,22 +9803,22 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_group_state, { "State", "kafka.group_state", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_member_id, { "Consumer Group Member ID", "kafka.member_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_protocol_type, { "Protocol Type", "kafka.protocol_type", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_protocol_name, { "Protocol Name", "kafka.protocol_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_protocol_metadata, @@ -9843,7 +9843,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_sasl_mechanism, { "SASL Mechanism", "kafka.sasl_mechanism", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_num_partitions, @@ -9863,12 +9863,12 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_config_key, { "Key", "kafka.config_key", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_config_value, { "Value", "kafka.config_value", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_config_operation, @@ -9888,7 +9888,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_forgotten_topic_name, { "Forgotten Topic Name", "kafka.forgotten_topic_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_forgotten_topic_partition, @@ -9913,7 +9913,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_record_header_key, { "Header Key", "kafka.header_key", - FT_STRING, STR_UNICODE, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_record_header_value, @@ -9958,7 +9958,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_acl_resource_name, { "Resource Name", "kafka.acl_resource_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_acl_resource_pattern_type, @@ -9968,12 +9968,12 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_acl_principal, { "Principal", "kafka.acl_principal", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_acl_host, { "Host", "kafka.acl_host", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_acl_operation, @@ -9993,7 +9993,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_config_resource_name, { "Resource Name", "kafka.config_resource_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_config_include_synonyms, @@ -10023,7 +10023,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_log_dir, { "Log Directory", "kafka.log_dir", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_segment_size, @@ -10063,12 +10063,12 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_token_principal_type, { "Principal Type", "kafka.principal_type", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_token_principal_name, { "Principal Name", "kafka.principal_name", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_token_issue_timestamp, @@ -10088,7 +10088,7 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_token_id, { "ID", "kafka.token_id", - FT_STRING, STR_ASCII, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_token_hmac, @@ -10143,12 +10143,12 @@ proto_register_kafka_protocol_fields(int protocol) }, { &hf_kafka_client_software_name, { "Client Software Name", "kafka.client_software_name", - FT_STRING, STR_UNICODE, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, { &hf_kafka_client_software_version, { "Client Software Version", "kafka.client_software_version", - FT_STRING, STR_UNICODE, 0, 0, + FT_STRING, BASE_NONE, 0, 0, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c index 369d55b256..8da777d0d3 100644 --- a/epan/dissectors/packet-lbmsrs.c +++ b/epan/dissectors/packet-lbmsrs.c @@ -2672,7 +2672,7 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_mdata_len, { "Metadata Length", "lbmsrs.rsocket.metadata_len", FT_UINT24, BASE_DEC, NULL,0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_mdata, - { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, STR_ASCII, NULL, 0x0, NULL,HFILL } }, + { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, BASE_NONE, NULL, 0x0, NULL,HFILL } }, { &hf_lbmsrs_rsocket_ignore_flag, { "Ignore", "lbmsrs.rsocket.flags.ignore", FT_BOOLEAN, 16, NULL, 0x0200, NULL,HFILL } }, { &hf_lbmsrs_rsocket_metadata_flag, @@ -2700,11 +2700,11 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_mdata_mime_length, { "Metadata MIME Length", "lbmsrs.rsocket.mdata_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_mdata_mime_type, - { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, STR_ASCII,NULL, 0x0, NULL, HFILL } }, + { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, BASE_NONE,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_data_mime_length, { "Data MIME Length", "lbmsrs.rsocket.data_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_data_mime_type, - { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, STR_ASCII, NULL,0x0, NULL, HFILL } }, + { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, BASE_NONE, NULL,0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_req_n, { "Request N", "lbmsrs.rsocket.request_n", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,HFILL } }, { &hf_lbmsrs_rsocket_error_code, @@ -2714,7 +2714,7 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_resume_token_len, { "Resume Token Length", "lbmsrs.rsocket.resume.token.len", FT_UINT16, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_resume_token, - { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, STR_ASCII, NULL, 0x0,NULL, HFILL } }, + { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL } }, /*rsocket related items end*/ /*SRS Registration Request items start*/ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 33c7a31dba..7c2ef2f636 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -5168,7 +5168,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_delRequest, { "delRequest", "ldap.delRequest", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ldap_delResponse, { "delResponse", "ldap.delResponse_element", @@ -5208,11 +5208,11 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_AttributeDescriptionList_item, { "AttributeDescription", "ldap.AttributeDescription", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ldap_attributeDesc, { "attributeDesc", "ldap.attributeDesc", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "AttributeDescription", HFILL }}, { &hf_ldap_assertionValue, { "assertionValue", "ldap.assertionValue", @@ -5220,7 +5220,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_type, { "type", "ldap.type", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "AttributeDescription", HFILL }}, { &hf_ldap_vals, { "vals", "ldap.vals", @@ -5236,11 +5236,11 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_matchedDN, { "matchedDN", "ldap.matchedDN", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_errorMessage, { "errorMessage", "ldap.errorMessage", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ldap_referral, { "referral", "ldap.referral", @@ -5272,7 +5272,7 @@ void proto_register_ldap(void) { "INTEGER_1_127", HFILL }}, { &hf_ldap_name, { "name", "ldap.name", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_authentication, { "authentication", "ldap.authentication", @@ -5308,7 +5308,7 @@ void proto_register_ldap(void) { "BindResponse_resultCode", HFILL }}, { &hf_ldap_bindResponse_matchedDN, { "matchedDN", "ldap.matchedDN", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_bindResponse_matchedDN", HFILL }}, { &hf_ldap_serverSaslCreds, { "serverSaslCreds", "ldap.serverSaslCreds", @@ -5316,7 +5316,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_baseObject, { "baseObject", "ldap.baseObject", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_scope, { "scope", "ldap.scope", @@ -5384,7 +5384,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_present, { "present", "ldap.present", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ldap_approxMatch, { "approxMatch", "ldap.approxMatch_element", @@ -5404,19 +5404,19 @@ void proto_register_ldap(void) { "T_substringFilter_substrings_item", HFILL }}, { &hf_ldap_initial, { "initial", "ldap.initial", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPString", HFILL }}, { &hf_ldap_any, { "any", "ldap.any", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPString", HFILL }}, { &hf_ldap_final, { "final", "ldap.final", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPString", HFILL }}, { &hf_ldap_matchingRule, { "matchingRule", "ldap.matchingRule", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "MatchingRuleId", HFILL }}, { &hf_ldap_matchValue, { "matchValue", "ldap.matchValue", @@ -5428,7 +5428,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_objectName, { "objectName", "ldap.objectName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_searchResultEntry_attributes, { "attributes", "ldap.attributes", @@ -5444,7 +5444,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_object, { "object", "ldap.object", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_modifyRequest_modification, { "modification", "ldap.modification", @@ -5464,7 +5464,7 @@ void proto_register_ldap(void) { "AttributeTypeAndValues", HFILL }}, { &hf_ldap_entry, { "entry", "ldap.entry", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_attributes, { "attributes", "ldap.attributes", @@ -5476,7 +5476,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_newrdn, { "newrdn", "ldap.newrdn", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "RelativeLDAPDN", HFILL }}, { &hf_ldap_deleteoldrdn, { "deleteoldrdn", "ldap.deleteoldrdn", @@ -5484,7 +5484,7 @@ void proto_register_ldap(void) { "BOOLEAN", HFILL }}, { &hf_ldap_newSuperior, { "newSuperior", "ldap.newSuperior", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "LDAPDN", HFILL }}, { &hf_ldap_ava, { "ava", "ldap.ava_element", @@ -5528,11 +5528,11 @@ void proto_register_ldap(void) { NULL, HFILL }}, { &hf_ldap_attributeType, { "attributeType", "ldap.attributeType", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "AttributeDescription", HFILL }}, { &hf_ldap_orderingRule, { "orderingRule", "ldap.orderingRule", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "MatchingRuleId", HFILL }}, { &hf_ldap_reverseOrder, { "reverseOrder", "ldap.reverseOrder", diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index fb509e14d9..613b8c59c1 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -325,12 +325,12 @@ void proto_register_logcat_text(void) { }, { &hf_logcat_text_tag, { "Tag", "logcat_text.tag", - FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_logcat_text_log, { "Log", "logcat_text.log", - FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_logcat_text_priority, diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index 28d489b8b9..38c9f5647a 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -252,12 +252,12 @@ proto_register_logcat(void) }, { &hf_logcat_tag, { "Tag", "logcat.tag", - FT_STRINGZ, STR_UNICODE, NULL, 0x00, + FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_logcat_log, { "Log", "logcat.log", - FT_STRINGZ, STR_UNICODE, NULL, 0x00, + FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index b4d74286ee..3ec627d8cf 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -34314,7 +34314,7 @@ void proto_register_lpp(void) { "OCTET_STRING_SIZE_6", HFILL }}, { &hf_lpp_ssid_r13, { "ssid-r13", "lpp.ssid_r13", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lpp_rttValue_r13, { "rttValue-r13", "lpp.rttValue_r13", diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 2c976816e6..d9eeb20db5 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -137823,7 +137823,7 @@ void proto_register_lte_rrc(void) { "T_csfb_DualRxTxSupport_r11", HFILL }}, { &hf_lte_rrc_hnb_Name, { "hnb-Name", "lte-rrc.hnb_Name", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_messageIdentifier, { "messageIdentifier", "lte-rrc.messageIdentifier", @@ -138039,7 +138039,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, { &hf_lte_rrc_ssid_r12, { "ssid-r12", "lte-rrc.ssid_r12", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_bssid_r12, { "bssid-r12", "lte-rrc.bssid_r12", @@ -162663,7 +162663,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, { &hf_lte_rrc_warningMessageSegment_decoded_page, { "Decoded Page", "lte-rrc.warningMessageSegment.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1, { "Bit 1", "lte-rrc.interBandTDD_CA_WithDifferentConfig.bit1", diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 52cf2975d4..0fb312a232 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -10857,7 +10857,7 @@ proto_register_mbim(void) }, { &hf_mbim_sms_cdma_record_encoded_message_text, { "Text", "mbim.control.sms_cdma_record.encoded_message.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mbim_sms_read_req_format, @@ -10962,7 +10962,7 @@ proto_register_mbim(void) }, { &hf_mbim_sms_send_cdma_encoded_message_text, { "Text", "mbim.control.sms_send_cdma.encoded_message.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mbim_set_sms_send_format, @@ -11032,7 +11032,7 @@ proto_register_mbim(void) }, { &hf_mbim_set_ussd_ussd_payload_text, { "USSD Payload Text", "mbim.control.set_ussd.ussd_payload.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mbim_ussd_info_ussd_response, @@ -11067,7 +11067,7 @@ proto_register_mbim(void) }, { &hf_mbim_ussd_info_ussd_payload_text, { "USSD Payload Text", "mbim.control.ussd_info.ussd_payload.text", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mbim_phonebook_configuration_info_phonebook_state, diff --git a/epan/dissectors/packet-mdp.c b/epan/dissectors/packet-mdp.c index 93c56e44ed..ad3b1471c2 100644 --- a/epan/dissectors/packet-mdp.c +++ b/epan/dissectors/packet-mdp.c @@ -117,13 +117,13 @@ proto_register_mdp(void) static hf_register_info hf[] = { { &hf_mdp_preamble_data, {"Preamble Data","mdp.preamble_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_mdp_device_info, {"Device Info", "mdp.device_info", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_mdp_network_info, {"Network Info", "mdp.network_info", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_mdp_longitude, {"Longitude", "mdp.longitude", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_mdp_latitude, {"Latitude", "mdp.latitude", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_device_info, {"Device Info", "mdp.device_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_network_info, {"Network Info", "mdp.network_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_longitude, {"Longitude", "mdp.longitude", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_latitude, {"Latitude", "mdp.latitude", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_mdp_type, {"Type", "mdp.type", FT_UINT8, BASE_DEC, VALS(type_vals), 0x0, NULL, HFILL }}, - { &hf_mdp_type_six, {"Type 6 UID", "mdp.type_six", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_mdp_type_seven, {"Type 7 UID", "mdp.type_seven", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_type_six, {"Type 6 UID", "mdp.type_six", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mdp_type_seven, {"Type 7 UID", "mdp.type_seven", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_mdp_length, {"Length", "mdp.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_mdp_data, {"Unknown Data", "mdp.data", FT_BYTES, BASE_NONE, NULL, 0X0, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-messageanalyzer.c b/epan/dissectors/packet-messageanalyzer.c index 821f1524a9..3b97ab871c 100644 --- a/epan/dissectors/packet-messageanalyzer.c +++ b/epan/dissectors/packet-messageanalyzer.c @@ -1234,7 +1234,7 @@ void proto_register_message_analyzer(void) }, { &hf_ma_wfp_capture_auth_process_path, { "Payload Length", "message_analyzer.wfp_capture.auth.process_path", - FT_UINT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, }; @@ -1245,7 +1245,7 @@ void proto_register_message_analyzer(void) }, { &hf_etw_wfp_capture_driver_name, { "Driver Name", "etw.wfp_capture.driver_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_wfp_capture_major_version, { "Major Version", "etw.wfp_capture.major_version", @@ -1269,11 +1269,11 @@ void proto_register_message_analyzer(void) }, { &hf_etw_wfp_capture_driver_error_message, { "Driver Name", "etw.wfp_capture.driver_error_message", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_wfp_capture_callout_error_message, { "Driver Name", "etw.wfp_capture.callout_error_message", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_wfp_capture_nt_status, { "NT Status", "etw.wfp_capture.nt_status", @@ -1316,15 +1316,15 @@ void proto_register_message_analyzer(void) }, { &hf_etw_ndis_source_port_name, { "Source port name", "etw.ndis.source_port_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_source_nic_name, { "Source NIC name", "etw.ndis.source_nic_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_source_nic_type, { "Source NIC type", "etw.ndis.source_nic_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_destination_count, { "Destination count", "etw.ndis.destination_count", @@ -1336,15 +1336,15 @@ void proto_register_message_analyzer(void) }, { &hf_etw_ndis_destination_port_name, { "Destination port name", "etw.ndis.destination_port_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_destination_nic_name, { "Destination NIC name", "etw.ndis.destination_nic_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_destination_nic_type, { "Destination NIC type", "etw.ndis.destination_nic_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_oob_data_size, { "OOB data size", "etw.ndis.oob_data_size", @@ -1360,19 +1360,19 @@ void proto_register_message_analyzer(void) }, { &hf_etw_ndis_friendly_name, { "Friendly name", "etw.ndis.friendly_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_unique_name, { "Unique name", "etw.ndis.unique_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_service_name, { "Service name", "etw.ndis.service_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_version, { "Version", "etw.ndis.version", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_media_type, { "Media types", "etw.ndis.media_type", @@ -1436,15 +1436,15 @@ void proto_register_message_analyzer(void) }, { &hf_etw_ndis_param_str, { "Param String", "etw.ndis.param_str", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_description, { "Description", "etw.ndis.description", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_source_name, { "Source name", "etw.ndis.source_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_if_index, { "IfIndex", "etw.ndis.if_index", @@ -1460,7 +1460,7 @@ void proto_register_message_analyzer(void) }, { &hf_etw_ndis_layer_name, { "Layer name", "etw.ndis.layer_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_etw_ndis_keyword, { "Keyword", "etw.ndis.keyword", diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index ed36a744da..460690b2d5 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -3638,7 +3638,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_service_provider, { "Service Provider Name", "mpeg_descr.svc.provider_name", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_service_name_length, { @@ -3653,7 +3653,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_service_name, { "Service Name", "mpeg_descr.svc.svc_name", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, /* 0x4A Linkage Descriptor */ @@ -3772,7 +3772,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_short_event_name, { "Event Name", "mpeg_descr.short_evt.name", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_short_event_text_length, { @@ -3787,7 +3787,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_short_event_text, { "Event Text", "mpeg_descr.short_evt.txt", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, /* 0x4E Extended Event Descriptor */ @@ -3843,7 +3843,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_extended_event_text, { "Text", "mpeg_descr.ext_evt.txt", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, /* 0x50 Component Descriptor */ diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 2f33364052..8685c30647 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -4009,7 +4009,7 @@ void proto_register_mq(void) { static hf_register_info hf[] = { - {&hf_mq_tsh_StructID, {"StructID..", "mq.tsh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_tsh_StructID, {"StructID..", "mq.tsh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_tsh_mqseglen, {"MQSegmLen.", "mq.tsh.seglength", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH MQ Segment length", HFILL}}, {&hf_mq_tsh_convid, {"Convers ID", "mq.tsh.convid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Conversation ID", HFILL}}, {&hf_mq_tsh_requestid, {"Request ID", "mq.tsh.requestid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Request ID", HFILL}}, @@ -4047,27 +4047,27 @@ void proto_register_mq(void) {&hf_mq_socket_parm1, {"Parm1....", "mq.socket.parm1", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 1", HFILL}}, {&hf_mq_socket_parm2, {"Parm2....", "mq.socket.parm2", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 2", HFILL}}, - {&hf_mq_caut_StructID, {"StructID.", "mq.caut.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_caut_StructID, {"StructID.", "mq.caut.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_caut_AuthType, {"AuthType.", "mq.caut.authtype", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT Authority Type", HFILL}}, {&hf_mq_caut_UsrMaxLen, {"UsrMaxLen", "mq.caut.usrmaxlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT userid Maximum length", HFILL}}, {&hf_mq_caut_PwdMaxLen, {"PwdMaxLen", "mq.caut.pwdmaxlen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT password Maximum length", HFILL}}, {&hf_mq_caut_UsrLength, {"UsrLength", "mq.caut.usrlength", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT userid length", HFILL}}, {&hf_mq_caut_PwdLength, {"PwdLength", "mq.caut.pswlength", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "CAUT password length", HFILL}}, - {&hf_mq_caut_usr, {"userid...", "mq.msh.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT UserId", HFILL}}, - {&hf_mq_caut_psw, {"password.", "mq.msh.password", FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT Password", HFILL}}, + {&hf_mq_caut_usr, {"userid...", "mq.msh.userid", FT_STRING, BASE_NONE, NULL, 0x0, "CAUT UserId", HFILL}}, + {&hf_mq_caut_psw, {"password.", "mq.msh.password", FT_STRING, BASE_NONE, NULL, 0x0, "CAUT Password", HFILL}}, - {&hf_mq_msh_StructID, {"StructID", "mq.msh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_msh_StructID, {"StructID", "mq.msh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_msh_seqnum, {"Seq Numb", "mq.msh.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH sequence number", HFILL}}, {&hf_mq_msh_datalength, {"Buf len.", "mq.msh.buflength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH buffer length", HFILL}}, {&hf_mq_msh_unknown1, {"Unknown1", "mq.msh.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "MSH unknown1", HFILL}}, {&hf_mq_msh_msglength, {"Msg len.", "mq.msh.msglength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH message length", HFILL}}, - {&hf_mq_xqh_StructID, {"StructID", "mq.xqh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_xqh_StructID, {"StructID", "mq.xqh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_xqh_version, {"Version.", "mq.xqh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "XQH version", HFILL}}, - {&hf_mq_xqh_remoteq, {"Remote Q", "mq.xqh.remoteq", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue", HFILL}}, - {&hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue manager", HFILL}}, + {&hf_mq_xqh_remoteq, {"Remote Q", "mq.xqh.remoteq", FT_STRING, BASE_NONE, NULL, 0x0, "XQH remote queue", HFILL}}, + {&hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "XQH remote queue manager", HFILL}}, - {&hf_mq_id_StructID, {"Structid..", "mq.id.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_id_StructID, {"Structid..", "mq.id.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_id_FapLevel, {"FAP level.", "mq.id.faplevel", FT_UINT8, BASE_DEC, NULL, 0x0, "ID Formats And Protocols level", HFILL}}, {&hf_mq_id_cf1, {"CapFlag1..", "mq.id.cflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability Flags 1", HFILL}}, {&hf_mq_id_ecf1, {"ECapFlag1.", "mq.id.ecflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability Flags 1", HFILL}}, @@ -4077,11 +4077,11 @@ void proto_register_mq(void) {&hf_mq_id_MaxTrSize, {"MaxTrSize.", "mq.id.maxtrsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max trans size", HFILL}}, {&hf_mq_id_MaxMsgSize, {"MaxMsgSize", "mq.id.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max msg size", HFILL}}, {&hf_mq_id_SeqWrapVal, {"SeqWrapVal", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL}}, - {&hf_mq_id_channel, {"ChannelNme", "mq.id.channelname", FT_STRING, STR_UNICODE, NULL, 0x0, "ID channel name", HFILL}}, + {&hf_mq_id_channel, {"ChannelNme", "mq.id.channelname", FT_STRING, BASE_NONE, NULL, 0x0, "ID channel name", HFILL}}, {&hf_mq_id_cf2, {"CapFlag2..", "mq.id.cflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags 2", HFILL}}, {&hf_mq_id_ecf2, {"ECapFlag2.", "mq.id.ecflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability flags 2", HFILL}}, {&hf_mq_id_ccsid, {"ccsid.....", "mq.id.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "ID Coded Character Set ID", HFILL}}, - {&hf_mq_id_qmgrname, {"QMgrName..", "mq.id.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Queue Manager Name", HFILL}}, + {&hf_mq_id_qmgrname, {"QMgrName..", "mq.id.qm", FT_STRING, BASE_NONE, NULL, 0x0, "ID Queue Manager Name", HFILL}}, {&hf_mq_id_HBInterval, {"HBInterval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL}}, {&hf_mq_id_EFLLength, {"EFLLength.", "mq.id.efllength", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID EFL Length", HFILL}}, {&hf_mq_id_ief2, {"IniErrFlg2", "mq.id.inierrflg2", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Initial Error Flags 2", HFILL}}, @@ -4097,8 +4097,8 @@ void proto_register_mq(void) {&hf_mq_id_ProcessId, {"ProcessId.", "mq.id.processid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Process Identifier", HFILL}}, {&hf_mq_id_ThreadId, {"ThreadId..", "mq.id.threadid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Thread Identifier", HFILL}}, {&hf_mq_id_TraceId, {"TraceId...", "mq.id.traceid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Trace Identifier", HFILL}}, - {&hf_mq_id_ProdId, {"ProdId....", "mq.id.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Product Identifier", HFILL}}, - {&hf_mq_id_mqmid, {"MQM ID....", "mq.id.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID MQM ID", HFILL}}, + {&hf_mq_id_ProdId, {"ProdId....", "mq.id.prodid", FT_STRING, BASE_NONE, NULL, 0x0, "ID Product Identifier", HFILL}}, + {&hf_mq_id_mqmid, {"MQM ID....", "mq.id.mqmid", FT_STRING, BASE_NONE, NULL, 0x0, "ID MQM ID", HFILL}}, {&hf_mq_id_pal, {"PAL.......", "mq.id.pal", FT_BYTES, BASE_NONE, NULL, 0x0, "ID PAL", HFILL}}, {&hf_mq_id_r, {"R.........", "mq.id.r", FT_BYTES, BASE_NONE, NULL, 0x0, "ID R", HFILL}}, @@ -4140,28 +4140,28 @@ void proto_register_mq(void) {&hf_mq_id_ief2_MsgCmpLst, {"Invalid Msg CompLst", "mq.id.ief2.msgcomplst", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_MSGCOMPLIST, "ID invalid Message Compression List", HFILL}}, {&hf_mq_id_ief2_SSLReset, {"Invalid SSL Reset", "mq.id.ief2.sslreset", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_SSL_RESET, "ID invalid SSL Reset", HFILL}}, - {&hf_mq_uid_StructID, {"Structid", "mq.uid.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, - {&hf_mq_uid_userid, {"User ID.", "mq.uid.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID structid", HFILL}}, - {&hf_mq_uid_password, {"Password", "mq.uid.password", FT_STRING, STR_UNICODE, NULL, 0x0, "UID password", HFILL}}, - {&hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID long user id", HFILL}}, + {&hf_mq_uid_StructID, {"Structid", "mq.uid.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_uid_userid, {"User ID.", "mq.uid.userid", FT_STRING, BASE_NONE, NULL, 0x0, "UID structid", HFILL}}, + {&hf_mq_uid_password, {"Password", "mq.uid.password", FT_STRING, BASE_NONE, NULL, 0x0, "UID password", HFILL}}, + {&hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRING, BASE_NONE, NULL, 0x0, "UID long user id", HFILL}}, {&hf_mq_sidlen, {"SID Len.", "mq.uid.sidlen", FT_UINT8, BASE_DEC, NULL, 0x0, "Sid Len", HFILL}}, {&hf_mq_sidtyp, {"SIDType.", "mq.uid.sidtyp", FT_UINT8, BASE_DEC, VALS(GET_VALSV(sidtype)), 0x0, "Sid Typ", HFILL}}, {&hf_mq_securityid, {"SecurID.", "mq.uid.securityid", FT_BYTES, BASE_NONE, NULL, 0x0, "Security ID", HFILL}}, - {&hf_mq_conn_QMgr, {"QMgr....", "mq.conn.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN queue manager", HFILL}}, - {&hf_mq_conn_appname, {"ApplName", "mq.conn.appname", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN application name", HFILL}}, + {&hf_mq_conn_QMgr, {"QMgr....", "mq.conn.qm", FT_STRING, BASE_NONE, NULL, 0x0, "CONN queue manager", HFILL}}, + {&hf_mq_conn_appname, {"ApplName", "mq.conn.appname", FT_STRING, BASE_NONE, NULL, 0x0, "CONN application name", HFILL}}, {&hf_mq_conn_apptype, {"ApplType", "mq.conn.apptype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "CONN application type", HFILL}}, {&hf_mq_conn_acttoken, {"AccntTok", "mq.conn.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "CONN accounting token", HFILL}}, {&hf_mq_conn_options, {"Options.", "mq.conn.options", FT_UINT32, BASE_DEC, VALS(mq_conn_options_vals), 0x0, "CONN options", HFILL}}, {&hf_mq_conn_Xoptions, {"XOptions", "mq.conn.xoptions", FT_UINT32, BASE_HEX, NULL, 0x0, "CONN Xoptions", HFILL}}, - {&hf_mq_fcno_StructID, {"StructId..", "mq.fcno.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_fcno_StructID, {"StructId..", "mq.fcno.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_fcno_version, {"version...", "mq.fcno.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO version", HFILL}}, {&hf_mq_fcno_capflag, {"CapFlag...", "mq.fcno.capflag", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO Capability Flag", HFILL}}, - {&hf_mq_fcno_prodid, {"prodid....", "mq.fcno.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Product Id", HFILL}}, - {&hf_mq_fcno_mqmid, {"MqmId.....", "mq.fcno.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Mqm ID", HFILL}}, + {&hf_mq_fcno_prodid, {"prodid....", "mq.fcno.prodid", FT_STRING, BASE_NONE, NULL, 0x0, "FCNO Product Id", HFILL}}, + {&hf_mq_fcno_mqmid, {"MqmId.....", "mq.fcno.mqmid", FT_STRING, BASE_NONE, NULL, 0x0, "FCNO Mqm ID", HFILL}}, {&hf_mq_fcno_conn_tag, {"conntag...", "mq.fcno.conntag", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO Connection Tag", HFILL}}, {&hf_mq_fcno_retconn_tag, {"retconntag", "mq.fcno.retconntag", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO Retry Connection Tag", HFILL}}, @@ -4173,13 +4173,13 @@ void proto_register_mq(void) {&hf_mq_inq_charlen, {"Character length", "mq.inq.charlen", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Character length", HFILL}}, {&hf_mq_inq_sel, {"Selector........", "mq.inq.sel", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(selector), 0x0, "INQ Selector", HFILL}}, {&hf_mq_inq_intvalue, {"Integer value...", "mq.inq.intvalue", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer value", HFILL}}, - {&hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRING, STR_UNICODE, NULL, 0x0, "INQ Character values", HFILL}}, + {&hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRING, BASE_NONE, NULL, 0x0, "INQ Character values", HFILL}}, {&hf_mq_spi_verb, {"SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0, NULL, HFILL}}, {&hf_mq_spi_version, {"Version", "mq.spi.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Version", HFILL}}, {&hf_mq_spi_length, {"Max reply size", "mq.spi.replength", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Max reply size", HFILL}}, - {&hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_spi_base_version, {"Version", "mq.spib.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Version", HFILL}}, {&hf_mq_spi_base_length, {"Length", "mq.spib.length", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Length", HFILL}}, @@ -4191,9 +4191,9 @@ void proto_register_mq(void) {&hf_mq_spi_spqo_flags, {"Flags", "mq.spqo.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output flags", HFILL}}, {&hf_mq_spi_spai_mode, {"Mode", "mq.spai.mode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_activate)), 0x0, "SPI Activate Input mode", HFILL}}, - {&hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown1", HFILL}}, - {&hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown2", HFILL}}, - {&hf_mq_spi_spai_msgid, {"Message Id", "mq.spai.msgid", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input message id", HFILL}}, + {&hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown1", HFILL}}, + {&hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown2", HFILL}}, + {&hf_mq_spi_spai_msgid, {"Message Id", "mq.spai.msgid", FT_STRING, BASE_NONE, NULL, 0x0, "SPI Activate Input message id", HFILL}}, {&hf_mq_spi_spgi_batchsz, {"Batch size", "mq.spgi.batchsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch size", HFILL}}, {&hf_mq_spi_spgi_batchint, {"Batch interval", "mq.spgi.batchint", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch interval", HFILL}}, {&hf_mq_spi_spgi_maxmsgsz, {"Max message size", "mq.spgi.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input max message size", HFILL}}, @@ -4238,7 +4238,7 @@ void proto_register_mq(void) {&hf_mq_open_options_NO_MULTICAST, {"NO_MULTICAST", "mq.open.options.NoMulticast", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_MULTICAST, "OPEN options NO_MULTICAST", HFILL}}, {&hf_mq_open_options_BIND_ON_GROUP, {"BIND_ON_GROUP", "mq.open.options.BindOnGroup", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_GROUP, "OPEN options BIND_ON_GROUP", HFILL}}, - {&hf_mq_fopa_StructID, {"StructId.......", "mq.fopa.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_fopa_StructID, {"StructId.......", "mq.fopa.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_fopa_version, {"Version........", "mq.fopa.version", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Version", HFILL}}, {&hf_mq_fopa_length, {"Length.........", "mq.fopa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Length", HFILL}}, {&hf_mq_fopa_DefPersistence, {"DefPersistence.", "mq.fopa.defpersistence", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPER)), 0x0, "FOPA DefPersistence", HFILL}}, @@ -4247,7 +4247,7 @@ void proto_register_mq(void) {&hf_mq_fopa_PropertyControl, {"PropertyControl", "mq.fopa.propertycontrol", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPROP)), 0x0, "FOPA PropertyControl", HFILL}}, {&hf_mq_fopa_Unknown, {"Unknown........", "mq.fopa.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, "FOPA Unknown", HFILL}}, - {&hf_mq_fcmi_StructID, {"StructId.......", "mq.fcmi.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_fcmi_StructID, {"StructId.......", "mq.fcmi.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_fcmi_unknown, {"Unknown........", "mq.fcmi.unknown", FT_UINT32, BASE_DEC, NULL, 0x0, "FCMI Unknown", HFILL}}, {&hf_mq_msgreq_version, {"version..", "mq.msgreq.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ version", HFILL}}, @@ -4288,7 +4288,7 @@ void proto_register_mq(void) {&hf_mq_msgasy_MsgToken, {"MsgToken.", "mq.msgasy.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MSGASYNC Mesasage Token", HFILL}}, {&hf_mq_msgasy_Status, {"status...", "mq.msgasy.status", FT_UINT16, BASE_HEX, NULL, 0x0, "MSGASYNC Status", HFILL}}, {&hf_mq_msgasy_resolQNLn, {"resolQNLn", "mq.msgasy.resolqnln", FT_UINT8, BASE_DEC, NULL, 0x0, "MSGASYNC Resolved Queue Name Length", HFILL}}, - {&hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRING, STR_UNICODE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL}}, + {&hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRING, BASE_NONE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL}}, {&hf_mq_msgasy_padding, {"Padding..", "mq.msgasy.padding", FT_BYTES, BASE_NONE, NULL, 0x0, "MSGASYNC Padding", HFILL}}, {&hf_mq_notif_vers, {"version.", "mq.notif.vers", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "NOTIFICATION version", HFILL}}, @@ -4306,13 +4306,13 @@ void proto_register_mq(void) {&hf_mq_status_code, {"Code..", "mq.status.code", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(status), 0x0, "STATUS code", HFILL}}, {&hf_mq_status_value, {"Value.", "mq.status.value", FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS value", HFILL}}, - {&hf_mq_od_StructID, {"StructID.........", "mq.od.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_od_StructID, {"StructID.........", "mq.od.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_od_version, {"version..........", "mq.od.version", FT_UINT32, BASE_DEC, NULL, 0x0, "OD version", HFILL}}, {&hf_mq_od_objecttype, {"ObjType..........", "mq.od.objtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD object type", HFILL}}, - {&hf_mq_od_objectname, {"ObjName..........", "mq.od.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object name", HFILL}}, - {&hf_mq_od_objqmgrname, {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object queue manager name", HFILL}}, - {&hf_mq_od_dynqname, {"DynQName.........", "mq.od.dynqname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD dynamic queue name", HFILL}}, - {&hf_mq_od_altuserid, {"AltUserID........", "mq.od.altuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate userid", HFILL}}, + {&hf_mq_od_objectname, {"ObjName..........", "mq.od.objname", FT_STRING, BASE_NONE, NULL, 0x0, "OD object name", HFILL}}, + {&hf_mq_od_objqmgrname, {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "OD object queue manager name", HFILL}}, + {&hf_mq_od_dynqname, {"DynQName.........", "mq.od.dynqname", FT_STRING, BASE_NONE, NULL, 0x0, "OD dynamic queue name", HFILL}}, + {&hf_mq_od_altuserid, {"AltUserID........", "mq.od.altuserid", FT_STRING, BASE_NONE, NULL, 0x0, "OD alternate userid", HFILL}}, {&hf_mq_od_recspresent, {"NbrRecord........", "mq.od.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "OD number of records", HFILL}}, {&hf_mq_od_knowndstcnt, {"Known Dest Count.", "mq.od.kdestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD known destination count", HFILL}}, {&hf_mq_od_unknowdstcnt, {"Unknown Dest Cnt.", "mq.od.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD unknown destination count", HFILL}}, @@ -4321,13 +4321,13 @@ void proto_register_mq(void) {&hf_mq_od_resprecofs, {"Offset of 1st RR.", "mq.od.offsetrr", FT_UINT32, BASE_DEC, NULL, 0x0, "OD offset of first RR", HFILL}}, {&hf_mq_od_objrecptr, {"Addr of 1st OR.", "mq.od.addror", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first OR", HFILL}}, {&hf_mq_od_resprecptr, {"Addr of 1st RR.", "mq.od.addrrr", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first RR", HFILL}}, - {&hf_mq_od_altsecurid, {"Alt security id..", "mq.od.altsecid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate security id", HFILL}}, - {&hf_mq_od_resolvqname, {"Resolved Q Name..", "mq.od.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue name", HFILL}}, - {&hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue manager name", HFILL}}, + {&hf_mq_od_altsecurid, {"Alt security id..", "mq.od.altsecid", FT_STRING, BASE_NONE, NULL, 0x0, "OD alternate security id", HFILL}}, + {&hf_mq_od_resolvqname, {"Resolved Q Name..", "mq.od.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "OD resolved queue name", HFILL}}, + {&hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "OD resolved queue manager name", HFILL}}, {&hf_mq_od_resolvobjtyp, {"Resolv Obj Type..", "mq.od.resolvedobjtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD resolved object type", HFILL}}, - {&hf_mq_or_objname, {"Object name...", "mq.or.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object name", HFILL}}, - {&hf_mq_or_objqmgrname, {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object queue manager name", HFILL}}, + {&hf_mq_or_objname, {"Object name...", "mq.or.objname", FT_STRING, BASE_NONE, NULL, 0x0, "OR object name", HFILL}}, + {&hf_mq_or_objqmgrname, {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "OR object queue manager name", HFILL}}, {&hf_mq_rr_compcode, {"Comp Code", "mq.rr.completioncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR completion code", HFILL}}, {&hf_mq_rr_reascode, {"Reas Code", "mq.rr.reasoncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR reason code", HFILL}}, @@ -4338,7 +4338,7 @@ void proto_register_mq(void) {&hf_mq_pmr_feedback, {"Feedback", "mq.pmr.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "PMR Feedback", HFILL}}, {&hf_mq_pmr_acttoken, {"Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR accounting token", HFILL}}, - {&hf_mq_md_StructID, {"StructID.", "mq.md.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_md_StructID, {"StructID.", "mq.md.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_md_version, {"Version..", "mq.md.version", FT_UINT32, BASE_DEC, NULL, 0x0, "MD version", HFILL}}, {&hf_mq_md_report, {"Report...", "mq.md.report", FT_UINT32, BASE_DEC, NULL, 0x0, "MD report", HFILL}}, {&hf_mq_md_msgtype, {"Msg Type.", "mq.md.msgtype", FT_UINT32, BASE_DEC, VALS(GET_VALSV(MQMT)), 0x0, "MD message type", HFILL}}, @@ -4346,42 +4346,42 @@ void proto_register_mq(void) {&hf_mq_md_feedback, {"Feedback.", "mq.md.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "MD feedback", HFILL}}, {&hf_mq_md_encoding, {"Encoding.", "mq.md.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "MD encoding", HFILL}}, {&hf_mq_md_ccsid, {"CCSID....", "mq.md.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "MD character set", HFILL}}, - {&hf_mq_md_format, {"Format...", "mq.md.format", FT_STRING, STR_UNICODE, NULL, 0x0, "MD format", HFILL}}, + {&hf_mq_md_format, {"Format...", "mq.md.format", FT_STRING, BASE_NONE, NULL, 0x0, "MD format", HFILL}}, {&hf_mq_md_priority, {"Priority.", "mq.md.priority", FT_INT32, BASE_DEC, NULL, 0x0, "MD priority", HFILL}}, {&hf_mq_md_persistence, {"Persist..", "mq.md.persistence", FT_UINT32, BASE_DEC, VALS(GET_VALSV(MQPER)), 0x0, "MD persistence", HFILL}}, {&hf_mq_md_msgid, {"Msg ID...", "mq.md.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Message Id", HFILL}}, {&hf_mq_md_correlid, {"CorrelID.", "mq.md.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Correlation Id", HFILL}}, {&hf_mq_md_backoutcnt, {"BackoCnt.", "mq.md.backount", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Backout count", HFILL}}, - {&hf_mq_md_replytoq, {"ReplyToQ.", "mq.md.replytoq", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue", HFILL}}, - {&hf_mq_md_replytoqmgr, {"RepToQMgr", "mq.md.replytoqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue manager", HFILL}}, - {&hf_mq_md_userid, {"UserId...", "mq.md.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "MD UserId", HFILL}}, + {&hf_mq_md_replytoq, {"ReplyToQ.", "mq.md.replytoq", FT_STRING, BASE_NONE, NULL, 0x0, "MD ReplyTo queue", HFILL}}, + {&hf_mq_md_replytoqmgr, {"RepToQMgr", "mq.md.replytoqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "MD ReplyTo queue manager", HFILL}}, + {&hf_mq_md_userid, {"UserId...", "mq.md.userid", FT_STRING, BASE_NONE, NULL, 0x0, "MD UserId", HFILL}}, {&hf_mq_md_acttoken, {"AccntTok.", "mq.md.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MD accounting token", HFILL}}, - {&hf_mq_md_appliddata, {"AppIdData", "mq.md.appldata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put applicationId data", HFILL}}, + {&hf_mq_md_appliddata, {"AppIdData", "mq.md.appldata", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put applicationId data", HFILL}}, {&hf_mq_md_putappltype, {"PutAppTyp", "mq.md.appltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "MD Put application type", HFILL}}, - {&hf_mq_md_putapplname, {"PutAppNme", "mq.md.applname", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put application name", HFILL}}, - {&hf_mq_md_putdate, {"PutDatGMT", "mq.md.date", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put date", HFILL}}, - {&hf_mq_md_puttime, {"PutTimGMT", "mq.md.time", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put time", HFILL}}, - {&hf_mq_md_apporigdata, {"AppOriDat", "mq.md.origdata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Application original data", HFILL}}, + {&hf_mq_md_putapplname, {"PutAppNme", "mq.md.applname", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put application name", HFILL}}, + {&hf_mq_md_putdate, {"PutDatGMT", "mq.md.date", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put date", HFILL}}, + {&hf_mq_md_puttime, {"PutTimGMT", "mq.md.time", FT_STRING, BASE_NONE, NULL, 0x0, "MD Put time", HFILL}}, + {&hf_mq_md_apporigdata, {"AppOriDat", "mq.md.origdata", FT_STRING, BASE_NONE, NULL, 0x0, "MD Application original data", HFILL}}, {&hf_mq_md_groupid, {"GroupId..", "mq.md.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD GroupId", HFILL}}, {&hf_mq_md_msgseqnumber, {"MsgSeqNum", "mq.md.msgseqnumber", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Message sequence number", HFILL}}, {&hf_mq_md_offset, {"Offset...", "mq.md.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Offset", HFILL}}, {&hf_mq_md_msgflags, {"Msg flags", "mq.md.msgflags", FT_UINT32, BASE_HEX, NULL, 0x0, "MD Message flags", HFILL}}, {&hf_mq_md_origlen, {"Orig len.", "mq.md.origlength", FT_INT32, BASE_DEC, NULL, 0x0, "MD Original length", HFILL}}, - {&hf_mq_dlh_StructID, {"StructID.", "mq.dlh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_dlh_StructID, {"StructID.", "mq.dlh.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_dlh_version, {"Version..", "mq.dlh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH version", HFILL}}, {&hf_mq_dlh_reason, {"Reason...", "mq.dlh.reason", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH reason", HFILL}}, - {&hf_mq_dlh_destq, {"Dest Q...", "mq.dlh.destq", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue", HFILL}}, - {&hf_mq_dlh_destqmgr, {"DestQMgr.", "mq.dlh.destqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue manager", HFILL}}, + {&hf_mq_dlh_destq, {"Dest Q...", "mq.dlh.destq", FT_STRING, BASE_NONE, NULL, 0x0, "DLH destination queue", HFILL}}, + {&hf_mq_dlh_destqmgr, {"DestQMgr.", "mq.dlh.destqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "DLH destination queue manager", HFILL}}, {&hf_mq_dlh_encoding, {"Encoding.", "mq.dlh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH encoding", HFILL}}, {&hf_mq_dlh_ccsid, {"CCSID....", "mq.dlh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "DLH character set", HFILL}}, - {&hf_mq_dlh_format, {"Format...", "mq.dlh.format", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH format", HFILL}}, + {&hf_mq_dlh_format, {"Format...", "mq.dlh.format", FT_STRING, BASE_NONE, NULL, 0x0, "DLH format", HFILL}}, {&hf_mq_dlh_putappltype, {"PutAppTyp", "mq.dlh.putappltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "DLH put application type", HFILL}}, - {&hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put application name", HFILL}}, - {&hf_mq_dlh_putdate, {"PutDatGMT", "mq.dlh.putdate", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put date", HFILL}}, - {&hf_mq_dlh_puttime, {"PutTimGMT", "mq.dlh.puttime", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put time", HFILL}}, + {&hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put application name", HFILL}}, + {&hf_mq_dlh_putdate, {"PutDatGMT", "mq.dlh.putdate", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put date", HFILL}}, + {&hf_mq_dlh_puttime, {"PutTimGMT", "mq.dlh.puttime", FT_STRING, BASE_NONE, NULL, 0x0, "DLH put time", HFILL}}, - {&hf_mq_gmo_StructID, {"StructID.", "mq.gmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_gmo_StructID, {"StructID.", "mq.gmo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_gmo_version, {"Version..", "mq.gmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "GMO version", HFILL}}, {&hf_mq_gmo_options, {"GetMsgOpt", "mq.gmo.getmsgopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO Get Message Options", HFILL}}, @@ -4417,7 +4417,7 @@ void proto_register_mq(void) {&hf_mq_gmo_waitinterval, {"WaitIntv.", "mq.gmo.waitint", FT_INT32, BASE_DEC, NULL, 0x0, "GMO wait interval", HFILL}}, {&hf_mq_gmo_signal1, {"Signal 1.", "mq.gmo.signal1", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 1", HFILL}}, {&hf_mq_gmo_signal2, {"Signal 2.", "mq.gmo.signal2", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 2", HFILL}}, - {&hf_mq_gmo_resolvqname, {"ResQName.", "mq.gmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "GMO resolved queue name", HFILL}}, + {&hf_mq_gmo_resolvqname, {"ResQName.", "mq.gmo.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "GMO resolved queue name", HFILL}}, {&hf_mq_gmo_matchoptions, {"MatchOpt.", "mq.gmo.matchopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO match options", HFILL}}, {&hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN, {"MATCH_MSG_TOKEN", "mq.gmo.matchoptions.MATCH_MSG_TOKEN", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_TOKEN, "GMO matchoptions MATCH_MSG_TOKEN", HFILL}}, @@ -4436,7 +4436,7 @@ void proto_register_mq(void) {&hf_mq_gmo_reserved2, {"Reserved2", "mq.gmo.reserved2", FT_INT32, BASE_DEC, NULL, 0x0, "GMO reserved2", HFILL}}, {&hf_mq_gmo_msghandle, {"MsgHandle", "mq.gmo.msghandle", FT_UINT64, BASE_DEC | BASE_HEX, NULL, 0x0, "GMO Message Handle", HFILL}}, - {&hf_mq_lpoo_StructID, {"StructID......", "mq.lpoo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_lpoo_StructID, {"StructID......", "mq.lpoo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_lpoo_version, {"version.......", "mq.lpoo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "LPOO version", HFILL}}, {&hf_mq_lpoo_lpiopts, {"lpiopts.......", "mq.lpoo.lpioopts", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Lpi Options", HFILL}}, @@ -4448,11 +4448,11 @@ void proto_register_mq(void) {&hf_mq_lpoo_defputresptype, {"DefPutRespType", "mq.lpoo.defputresptype", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPRT)), 0x0, "LPOO Default Put Response Type", HFILL}}, {&hf_mq_lpoo_defreadahead, {"DefReadAHead..", "mq.lpoo.defreadahead", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQREADA)), 0x0, "LPOO Default Read AHead", HFILL}}, {&hf_mq_lpoo_propertyctl, {"PropertyCtl...", "mq.lpoo.propertyctl", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO Property Control", HFILL}}, - {&hf_mq_lpoo_qprotect, {"qprotect......", "mq.lpoo.qprotect", FT_STRING, STR_UNICODE, NULL, 0x0, "LPOO queue protection", HFILL}}, + {&hf_mq_lpoo_qprotect, {"qprotect......", "mq.lpoo.qprotect", FT_STRING, BASE_NONE, NULL, 0x0, "LPOO queue protection", HFILL}}, {&hf_mq_lpoo_qprotect_val1, {"qprotect_val1.", "mq.lpoo.qprotect.val2", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO queue protection val1", HFILL}}, {&hf_mq_lpoo_qprotect_val2, {"qprotect_val2.", "mq.lpoo.qprotect.val1", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO queue protection val2", HFILL}}, - {&hf_mq_pmo_StructID, {"StructID...", "mq.pmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_mq_pmo_StructID, {"StructID...", "mq.pmo.structid", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_mq_pmo_version, {"Version....", "mq.pmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO version", HFILL}}, {&hf_mq_pmo_options, {"Options....", "mq.pmo.options", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO options", HFILL}}, {&hf_mq_pmo_options_NOT_OWN_SUBS, {"NOT_OWN_SUBS", "mq.pmo.options.NOT_OWN_SUBS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NOT_OWN_SUBS, "PMO options NOT_OWN_SUBS", HFILL}}, @@ -4483,8 +4483,8 @@ void proto_register_mq(void) {&hf_mq_pmo_knowndstcnt, {"KnDstCnt...", "mq.pmo.kdstcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO known destination count", HFILL}}, {&hf_mq_pmo_unkndstcnt, {"UkDstCnt...", "mq.pmo.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO unknown destination count", HFILL}}, {&hf_mq_pmo_invaldstcnt, {"InDstCnt...", "mq.pmo.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO invalid destination count", HFILL}}, - {&hf_mq_pmo_resolvqname, {"ResQName...", "mq.pmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue name", HFILL}}, - {&hf_mq_pmo_resolvqmgr, {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue manager name", HFILL}}, + {&hf_mq_pmo_resolvqname, {"ResQName...", "mq.pmo.resolvq", FT_STRING, BASE_NONE, NULL, 0x0, "PMO resolved queue name", HFILL}}, + {&hf_mq_pmo_resolvqmgr, {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRING, BASE_NONE, NULL, 0x0, "PMO resolved queue manager name", HFILL}}, {&hf_mq_pmo_recspresent, {"NumRecs....", "mq.pmo.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO number of records", HFILL}}, {&hf_mq_pmo_putmsgrecfld, {"PMR Flag...", "mq.pmo.flagspmr", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO flags PMR fields", HFILL}}, {&hf_mq_pmo_putmsgrecofs, {"Ofs1stPMR..", "mq.pmo.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO offset of first PMR", HFILL}}, @@ -4510,27 +4510,27 @@ void proto_register_mq(void) {&hf_mq_xa_tmflags_fail, {"FAIL", "mq.xa.tmflags.fail", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMFAIL, "XA TM Flags FAIL", HFILL}}, {&hf_mq_xa_tmflags_onephase, {"ONEPHASE", "mq.xa.tmflags.onephase", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMONEPHASE, "XA TM Flags ONEPHASE", HFILL}}, - {&hf_mq_xa_xid_formatid, {"Format ID....", "mq.xa.xid.formatid", FT_STRING, STR_UNICODE, NULL, 0x0, "XA Xid Format ID", HFILL}}, + {&hf_mq_xa_xid_formatid, {"Format ID....", "mq.xa.xid.formatid", FT_STRING, BASE_NONE, NULL, 0x0, "XA Xid Format ID", HFILL}}, {&hf_mq_xa_xid_glbxid_len, {"GlbTransIDLen", "mq.xa.xid.gxidl", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Global TransactionId Length", HFILL}}, {&hf_mq_xa_xid_brq_length, {"BranchQualLen", "mq.xa.xid.bql", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier Length", HFILL}}, {&hf_mq_xa_xid_globalxid, {"GlbTransactID", "mq.xa.xid.gxid", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Global TransactionId", HFILL}}, {&hf_mq_xa_xid_brq, {"BranchQualif.", "mq.xa.xid.bq", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Branch Qualifier", HFILL}}, {&hf_mq_xa_xainfo_length, {"Length.......", "mq.xa.xainfo.length", FT_UINT8, BASE_DEC, NULL, 0x0, "XA XA_info Length", HFILL}}, - {&hf_mq_xa_xainfo_value, {"Value........", "mq.xa.xainfo.value", FT_STRING, STR_UNICODE, NULL, 0x0, "XA XA_info Value", HFILL}}, + {&hf_mq_xa_xainfo_value, {"Value........", "mq.xa.xainfo.value", FT_STRING, BASE_NONE, NULL, 0x0, "XA XA_info Value", HFILL}}, {&hf_mq_charv_vsptr, {"VLStr Addr.", "mq.charv.vsptr", FT_UINT32, BASE_HEX, NULL, 0x0, "VS Address", HFILL}}, {&hf_mq_charv_vsoffset, {"VLStr Offs.", "mq.charv.vsoffset", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Offset", HFILL}}, {&hf_mq_charv_vsbufsize, {"VLStr BufSz", "mq.charv.vsbufsize", FT_UINT32, BASE_DEC, NULL, 0x0, "VS BufSize", HFILL}}, {&hf_mq_charv_vslength, {"VLStr Len..", "mq.charv.vslength", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Length", HFILL}}, {&hf_mq_charv_vsccsid, {"VLStr Ccsid", "mq.charv.vsccsid", FT_INT32, BASE_DEC, NULL, 0x0, "VS CCSID", HFILL}}, - {&hf_mq_charv_vsvalue, {"VLStr Value", "mq.charv.vsvalue", FT_STRING, STR_UNICODE, NULL, 0x0, "VS value", HFILL}}, + {&hf_mq_charv_vsvalue, {"VLStr Value", "mq.charv.vsvalue", FT_STRING, BASE_NONE, NULL, 0x0, "VS value", HFILL}}, - {&hf_mq_head_StructID, {"Structid", "mq.head.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "Header structid", HFILL}}, + {&hf_mq_head_StructID, {"Structid", "mq.head.structid", FT_STRING, BASE_NONE, NULL, 0x0, "Header structid", HFILL}}, {&hf_mq_head_version, {"version.", "mq.head.version", FT_UINT32, BASE_DEC, NULL, 0x0, "Header version", HFILL}}, {&hf_mq_head_length, {"Length..", "mq.head.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Header length", HFILL}}, {&hf_mq_head_encoding, {"Encoding", "mq.head.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "Header encoding", HFILL}}, {&hf_mq_head_ccsid, {"CCSID...", "mq.head.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "Header character set", HFILL}}, - {&hf_mq_head_format, {"Format..", "mq.head.format", FT_STRING, STR_UNICODE, NULL, 0x0, "Header format", HFILL}}, + {&hf_mq_head_format, {"Format..", "mq.head.format", FT_STRING, BASE_NONE, NULL, 0x0, "Header format", HFILL}}, {&hf_mq_head_flags, {"Flags...", "mq.head.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "Header flags", HFILL}}, {&hf_mq_head_struct, {"Struct..", "mq.head.struct", FT_BYTES, BASE_NONE, NULL, 0x0, "Header struct", HFILL}}, @@ -4547,15 +4547,15 @@ void proto_register_mq(void) {&hf_mq_iih_flags_replyfmtnone, {"REPL_FMT_NONE", "mq.iih.flags.replyfmtnone", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_REPLY_FORMAT_NONE, "MQ IIH Flags REPLY_FORMAT_NONE", HFILL}}, {&hf_mq_iih_flags_passexpir, {"PASS_EXPIR...", "mq.iih.flags.passexpir", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_PASS_EXPIRATION, "MQ IIH Flags PASS_EXPIRATION", HFILL}}, - {&hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid", FT_STRING, STR_UNICODE, NULL, 0x0, "Logical Terminal Override", HFILL}}, - {&hf_mq_iih_mfsmapname, {"MFS Map Name..", "mq.iih.mfsmapname", FT_STRING, STR_UNICODE, NULL, 0x0, "MFS Map Name", HFILL}}, - {&hf_mq_iih_replytofmt, {"ReplyToFormat.", "mq.iih.replytofmt", FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL}}, - {&hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL}}, + {&hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid", FT_STRING, BASE_NONE, NULL, 0x0, "Logical Terminal Override", HFILL}}, + {&hf_mq_iih_mfsmapname, {"MFS Map Name..", "mq.iih.mfsmapname", FT_STRING, BASE_NONE, NULL, 0x0, "MFS Map Name", HFILL}}, + {&hf_mq_iih_replytofmt, {"ReplyToFormat.", "mq.iih.replytofmt", FT_STRING, BASE_NONE, NULL, 0x0, "Reply To Format", HFILL}}, + {&hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRING, BASE_NONE, NULL, 0x0, "Password or Passcode", HFILL}}, {&hf_mq_iih_transinstid, {"TransInstIdent", "mq.iih.transinstid", FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL}}, - {&hf_mq_iih_transstate, {"TransactState.", "mq.iih.transstate", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction State", HFILL}}, - {&hf_mq_iih_commimode, {"Commit Mode...", "mq.iih.commimode", FT_STRING, STR_UNICODE, NULL, 0x0, "Commit Mode", HFILL}}, - {&hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRING, STR_UNICODE, NULL, 0x0, "Security Scope", HFILL}}, - {&hf_mq_iih_reserved, {"Reserved......", "mq.iih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}}, + {&hf_mq_iih_transstate, {"TransactState.", "mq.iih.transstate", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction State", HFILL}}, + {&hf_mq_iih_commimode, {"Commit Mode...", "mq.iih.commimode", FT_STRING, BASE_NONE, NULL, 0x0, "Commit Mode", HFILL}}, + {&hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRING, BASE_NONE, NULL, 0x0, "Security Scope", HFILL}}, + {&hf_mq_iih_reserved, {"Reserved......", "mq.iih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}}, {&hf_mq_cih_flags_synconret, {"SYNC_ON_RETURN", "mq.iih.flags.synconret", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_SYNC_ON_RETURN, "MQ CIH Flags IGNORE_PURG", HFILL}}, {&hf_mq_cih_flags_replywonulls, {"REPLY_WO_NULLS", "mq.iih.flags.replywonulls", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_REPLY_WITHOUT_NULLS, "MQ CIH Flags REPLY_WITHOUT_NULLS", HFILL}}, @@ -4563,29 +4563,29 @@ void proto_register_mq(void) {&hf_mq_ims_ll, {"ll..", "mq.ims.ll", FT_UINT16, BASE_DEC, NULL, 0x0, "IMS ll", HFILL}}, {&hf_mq_ims_zz, {"zz..", "mq.ims.zz", FT_UINT16, BASE_DEC, NULL, 0x0, "IMS zz", HFILL}}, - {&hf_mq_ims_trx, {"trx.", "mq.ims.trx", FT_STRING, STR_UNICODE, NULL, 0x0, "IMS Transaction", HFILL}}, + {&hf_mq_ims_trx, {"trx.", "mq.ims.trx", FT_STRING, BASE_NONE, NULL, 0x0, "IMS Transaction", HFILL}}, {&hf_mq_ims_data, {"data", "mq.ims.data", FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL}}, - {&hf_mq_tm_StructID, {"Structid", "mq.tm.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM structid", HFILL}}, + {&hf_mq_tm_StructID, {"Structid", "mq.tm.structid", FT_STRING, BASE_NONE, NULL, 0x0, "TM structid", HFILL}}, {&hf_mq_tm_version, {"version.", "mq.tm.version", FT_UINT32, BASE_DEC, NULL, 0x0, "TM version", HFILL}}, - {&hf_mq_tm_QName, {"QName...", "mq.tm.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Queue Name", HFILL}}, - {&hf_mq_tm_ProcessNme, {"ProcName", "mq.tm.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Process Name", HFILL}}, - {&hf_mq_tm_TriggerData, {"TrigData", "mq.tm.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Trigger Data", HFILL}}, + {&hf_mq_tm_QName, {"QName...", "mq.tm.qname", FT_STRING, BASE_NONE, NULL, 0x0, "TM Queue Name", HFILL}}, + {&hf_mq_tm_ProcessNme, {"ProcName", "mq.tm.procname", FT_STRING, BASE_NONE, NULL, 0x0, "TM Process Name", HFILL}}, + {&hf_mq_tm_TriggerData, {"TrigData", "mq.tm.triggerdata", FT_STRING, BASE_NONE, NULL, 0x0, "TM Trigger Data", HFILL}}, {&hf_mq_tm_ApplType, {"ApplType", "mq.tm.appltype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "TM Application Type", HFILL}}, - {&hf_mq_tm_ApplId, {"ApplId..", "mq.tm.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Application ID", HFILL}}, - {&hf_mq_tm_EnvData, {"EnvData.", "mq.tm.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Environment Data", HFILL}}, - {&hf_mq_tm_UserData, {"UserData.", "mq.t2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM User Data", HFILL}}, + {&hf_mq_tm_ApplId, {"ApplId..", "mq.tm.applid", FT_STRING, BASE_NONE, NULL, 0x0, "TM Application ID", HFILL}}, + {&hf_mq_tm_EnvData, {"EnvData.", "mq.tm.envdaqta", FT_STRING, BASE_NONE, NULL, 0x0, "TM Environment Data", HFILL}}, + {&hf_mq_tm_UserData, {"UserData.", "mq.t2.userdata", FT_STRING, BASE_NONE, NULL, 0x0, "TM User Data", HFILL}}, - {&hf_mq_tmc2_StructID, {"Structid", "mq.tmc2.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 structid", HFILL}}, - {&hf_mq_tmc2_version, {"version.", "mq.tmc2.version", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 version", HFILL}}, - {&hf_mq_tmc2_QName, {"QName...", "mq.tmc2.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Name", HFILL}}, - {&hf_mq_tmc2_ProcessNme, {"ProcName", "mq.tmc2.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Process Name", HFILL}}, - {&hf_mq_tmc2_TriggerData, {"TrigData", "mq.tmc2.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Trigger Data", HFILL}}, - {&hf_mq_tmc2_ApplType, {"ApplType", "mq.tmc2.appltype", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application Type", HFILL}}, - {&hf_mq_tmc2_ApplId, {"ApplId..", "mq.tmc2.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application ID", HFILL}}, - {&hf_mq_tmc2_EnvData, {"EnvData.", "mq.tmc2.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Environment Data", HFILL}}, - {&hf_mq_tmc2_UserData, {"UserData", "mq.tmc2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 User Data", HFILL}}, - {&hf_mq_tmc2_QMgrName, {"QMgrName", "mq.tmc2.qmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}}, + {&hf_mq_tmc2_StructID, {"Structid", "mq.tmc2.structid", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 structid", HFILL}}, + {&hf_mq_tmc2_version, {"version.", "mq.tmc2.version", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 version", HFILL}}, + {&hf_mq_tmc2_QName, {"QName...", "mq.tmc2.qname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Queue Name", HFILL}}, + {&hf_mq_tmc2_ProcessNme, {"ProcName", "mq.tmc2.procname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Process Name", HFILL}}, + {&hf_mq_tmc2_TriggerData, {"TrigData", "mq.tmc2.triggerdata", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Trigger Data", HFILL}}, + {&hf_mq_tmc2_ApplType, {"ApplType", "mq.tmc2.appltype", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Application Type", HFILL}}, + {&hf_mq_tmc2_ApplId, {"ApplId..", "mq.tmc2.applid", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Application ID", HFILL}}, + {&hf_mq_tmc2_EnvData, {"EnvData.", "mq.tmc2.envdaqta", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Environment Data", HFILL}}, + {&hf_mq_tmc2_UserData, {"UserData", "mq.tmc2.userdata", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 User Data", HFILL}}, + {&hf_mq_tmc2_QMgrName, {"QMgrName", "mq.tmc2.qmgrname", FT_STRING, BASE_NONE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}}, {&hf_mq_cih_returncode, {"ReturnCode...", "mq.cih.returncode", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Return Code", HFILL}}, {&hf_mq_cih_compcode, {"ComplCode....", "mq.cih.compcode", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Completion Code", HFILL}}, @@ -4599,33 +4599,33 @@ void proto_register_mq(void) {&hf_mq_cih_converstask, {"ConversTask..", "mq.cih.converstask", FT_UINT32, BASE_DEC, VALS(GET_VALSV(ConvTaskOpt)), 0x0, "Conversational Task", HFILL}}, {&hf_mq_cih_taskendstatus, {"TaskEndStatus", "mq.cih.taskendstatus", FT_UINT32, BASE_DEC, VALS(GET_VALSV(TaskEndStatus)), 0x0, "Status at End of Task", HFILL}}, {&hf_mq_cih_bridgefactokn, {"BridgeFacTokn", "mq.cih.bridgefactokn", FT_BYTES, BASE_NONE, NULL, 0x0, "Bridge facility token", HFILL}}, - {&hf_mq_cih_function, {"Function.....", "mq.cih.function", FT_STRING, STR_UNICODE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL}}, - {&hf_mq_cih_abendcode, {"AbendCode....", "mq.cih.abendcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Abend Code", HFILL}}, - {&hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL}}, - {&hf_mq_cih_reserved, {"Reserved.....", "mq.cih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}}, - {&hf_mq_cih_replytofmt, {"ReplyToFormat", "mq.cih.replytofmt", FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL}}, - {&hf_mq_cih_remotesysid, {"RemoteSysId..", "mq.cih.remotesysid", FT_STRING, STR_UNICODE, NULL, 0x0, "Remote System Id", HFILL}}, - {&hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRING, STR_UNICODE, NULL, 0x0, "Remote Transaction Id", HFILL}}, - {&hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction to attach", HFILL}}, - {&hf_mq_cih_facilitylike, {"FacilityLike.", "mq.cih.facilitylike", FT_STRING, STR_UNICODE, NULL, 0x0, "Terminal emulated attributes", HFILL}}, - {&hf_mq_cih_attentionid, {"AttentionID..", "mq.cih.attentionid", FT_STRING, STR_UNICODE, NULL, 0x0, "Attention Id (AID) Key", HFILL}}, - {&hf_mq_cih_startcode, {"StartCode....", "mq.cih.startcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction Start Code", HFILL}}, - {&hf_mq_cih_cancelcode, {"CancelCode...", "mq.cih.cancelcode", FT_STRING, STR_UNICODE, NULL, 0x0, "Abend transaction code", HFILL}}, - {&hf_mq_cih_nexttransid, {"NextTransId..", "mq.cih.nexttransid", FT_STRING, STR_UNICODE, NULL, 0x0, "Next transaction to attach", HFILL}}, - {&hf_mq_cih_reserved2, {"Reserved3....", "mq.cih.reserved2", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 2", HFILL}}, - {&hf_mq_cih_reserved3, {"Reserved3....", "mq.cih.reserved3", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 3", HFILL}}, + {&hf_mq_cih_function, {"Function.....", "mq.cih.function", FT_STRING, BASE_NONE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL}}, + {&hf_mq_cih_abendcode, {"AbendCode....", "mq.cih.abendcode", FT_STRING, BASE_NONE, NULL, 0x0, "Abend Code", HFILL}}, + {&hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRING, BASE_NONE, NULL, 0x0, "Password or Passcode", HFILL}}, + {&hf_mq_cih_reserved, {"Reserved.....", "mq.cih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}}, + {&hf_mq_cih_replytofmt, {"ReplyToFormat", "mq.cih.replytofmt", FT_STRING, BASE_NONE, NULL, 0x0, "Reply To Format", HFILL}}, + {&hf_mq_cih_remotesysid, {"RemoteSysId..", "mq.cih.remotesysid", FT_STRING, BASE_NONE, NULL, 0x0, "Remote System Id", HFILL}}, + {&hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRING, BASE_NONE, NULL, 0x0, "Remote Transaction Id", HFILL}}, + {&hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction to attach", HFILL}}, + {&hf_mq_cih_facilitylike, {"FacilityLike.", "mq.cih.facilitylike", FT_STRING, BASE_NONE, NULL, 0x0, "Terminal emulated attributes", HFILL}}, + {&hf_mq_cih_attentionid, {"AttentionID..", "mq.cih.attentionid", FT_STRING, BASE_NONE, NULL, 0x0, "Attention Id (AID) Key", HFILL}}, + {&hf_mq_cih_startcode, {"StartCode....", "mq.cih.startcode", FT_STRING, BASE_NONE, NULL, 0x0, "Transaction Start Code", HFILL}}, + {&hf_mq_cih_cancelcode, {"CancelCode...", "mq.cih.cancelcode", FT_STRING, BASE_NONE, NULL, 0x0, "Abend transaction code", HFILL}}, + {&hf_mq_cih_nexttransid, {"NextTransId..", "mq.cih.nexttransid", FT_STRING, BASE_NONE, NULL, 0x0, "Next transaction to attach", HFILL}}, + {&hf_mq_cih_reserved2, {"Reserved3....", "mq.cih.reserved2", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 2", HFILL}}, + {&hf_mq_cih_reserved3, {"Reserved3....", "mq.cih.reserved3", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 3", HFILL}}, {&hf_mq_cih_cursorpos, {"CursorPos....", "mq.cih.cursorpos", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Cursor Posiution", HFILL}}, {&hf_mq_cih_erroroffset, {"ErrorOffset..", "mq.cih.erroroffset", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Offset of error in message", HFILL}}, {&hf_mq_cih_inputitem, {"InputItem....", "mq.cih.inputitem", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Input Item", HFILL}}, - {&hf_mq_cih_reserved4, {"Reserved4....", "mq.cih.reserved4", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 4", HFILL}}, + {&hf_mq_cih_reserved4, {"Reserved4....", "mq.cih.reserved4", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved 4", HFILL}}, {&hf_mq_rfh_ccsid, {"NmeValCCSID", "mq.rfh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "RFH NameValue CCSID", HFILL}}, {&hf_mq_rfh_length, {"Len.", "mq.rfh.length", FT_UINT32, BASE_DEC, NULL, 0x0, "RFH NameValue Length", HFILL}}, - {&hf_mq_rfh_string, {"Val.", "mq.rfh.string", FT_STRING, STR_UNICODE, NULL, 0x0, "RFH NameValue", HFILL}}, + {&hf_mq_rfh_string, {"Val.", "mq.rfh.string", FT_STRING, BASE_NONE, NULL, 0x0, "RFH NameValue", HFILL}}, {&hf_mq_rmh_flags_last, {"LAST", "mq.rmh.flags.last", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQRMHF_LAST, "MQ RMH LAST", HFILL}}, - {&hf_mq_rmh_objecttype, {"ObjectType...", "mq.rmh.objecttype", FT_STRING, STR_UNICODE, NULL, 0x0, "Object Type", HFILL}}, + {&hf_mq_rmh_objecttype, {"ObjectType...", "mq.rmh.objecttype", FT_STRING, BASE_NONE, NULL, 0x0, "Object Type", HFILL}}, {&hf_mq_rmh_objectinstid, {"ObjectInstId.", "mq.rmh.objectinstid", FT_BYTES, BASE_NONE, NULL, 0x0, "Object Instance Identifier", HFILL}}, {&hf_mq_rmh_srcenvlen, {"SrcEnvLen....", "mq.rmh.srcenvlen", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of source environment data", HFILL}}, {&hf_mq_rmh_srcenvofs, {"SrcEnvOfs....", "mq.rmh.srcenvofs", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Offset of source environment data", HFILL}}, @@ -4639,10 +4639,10 @@ void proto_register_mq(void) {&hf_mq_rmh_datalogicofsl, {"DataLogicOfsL", "mq.rmh.datalogicofsl", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "Low offset of bulk data", HFILL}}, {&hf_mq_rmh_datalogicofsh, {"DataLogicOfsH", "mq.rmh.datalogicofsh", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, "High offset of bulk data", HFILL}}, - {&hf_mq_wih_servicename, {"ServiceName..", "mq.wih.servicename", FT_STRING, STR_UNICODE, NULL, 0x0, "Service Name", HFILL}}, - {&hf_mq_wih_servicestep, {"ServiceStep..", "mq.wih.servicestep", FT_STRING, STR_UNICODE, NULL, 0x0, "Service Step Name", HFILL}}, + {&hf_mq_wih_servicename, {"ServiceName..", "mq.wih.servicename", FT_STRING, BASE_NONE, NULL, 0x0, "Service Name", HFILL}}, + {&hf_mq_wih_servicestep, {"ServiceStep..", "mq.wih.servicestep", FT_STRING, BASE_NONE, NULL, 0x0, "Service Step Name", HFILL}}, {&hf_mq_wih_msgtoken, {"MsgToken.....", "mq.wih.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "Message Token", HFILL}}, - {&hf_mq_wih_reserved, {"Reserved.....", "mq.wih.reserved", FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL}}, + {&hf_mq_wih_reserved, {"Reserved.....", "mq.wih.reserved", FT_STRING, BASE_NONE, NULL, 0x0, "Reserved", HFILL}}, }; static gint* ett[] = diff --git a/epan/dissectors/packet-nano.c b/epan/dissectors/packet-nano.c index 0d431f3fb8..41cd4c57f4 100644 --- a/epan/dissectors/packet-nano.c +++ b/epan/dissectors/packet-nano.c @@ -858,7 +858,7 @@ void proto_register_nano(void) static hf_register_info hf[] = { { &hf_nano_magic_number, { "Magic Number", "nano.magic_number", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "Nano Protocol Magic Number", HFILL } }, { &hf_nano_version_max, diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index b7b4ea7c25..7768af69e0 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -10788,7 +10788,7 @@ proto_register_nas_5gs(void) }, { &hf_nas_5gs_sm_dm_spec_id, { "DN-specific identity", "nas_5gs.sm.dm_spec_id", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_nas_5gs_sm_all_ssc_mode_b0, diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 19b318ca3d..f750fa831a 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -7426,7 +7426,7 @@ proto_register_nas_eps(void) }, { &hf_eps_emm_ext_emerg_num_list_emerg_num, { "Emergency number","nas_eps.emm.ext_emerg_num_list.emerg_num", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_eps_emm_ext_emerg_num_list_sub_serv_field_len, @@ -7436,7 +7436,7 @@ proto_register_nas_eps(void) }, { &hf_eps_emm_ext_emerg_num_list_sub_serv_field, { "Sub-services field","nas_eps.emm.ext_emerg_num_list.sub_serv_field", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_nas_eps_emm_prose_dd_cap, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 296d198b76..79c4343672 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -13359,17 +13359,17 @@ proto_register_netflow(void) }, {&hf_cflow_if_name, {"IfName", "cflow.if_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "SNMP Interface Name", HFILL} }, {&hf_cflow_if_descr, {"IfDescr", "cflow.if_descr", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "SNMP Interface Description", HFILL} }, {&hf_cflow_sampler_name, {"SamplerName", "cflow.sampler_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Sampler Name", HFILL} }, {&hf_cflow_forwarding_status, @@ -13399,7 +13399,7 @@ proto_register_netflow(void) }, {&hf_cflow_nbar_appl_desc, {"ApplicationDesc", "cflow.appl_desc", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Application Desc (NBAR)", HFILL} }, {&hf_cflow_nbar_appl_id_class_eng_id, @@ -13414,7 +13414,7 @@ proto_register_netflow(void) }, {&hf_cflow_nbar_appl_name, {"ApplicationName", "cflow.appl_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Application Name (NBAR)", HFILL} }, {&hf_cflow_peer_srcas, @@ -13690,7 +13690,7 @@ proto_register_netflow(void) }, {&hf_cflow_wlan_ssid, {"Wireless LAN SSId", "cflow.wlan_ssid", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_flow_id, @@ -13980,7 +13980,7 @@ proto_register_netflow(void) }, {&hf_cflow_vrfname, {"VRFname", "cflow.vrfname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_post_mpls_top_label_exp, @@ -14035,7 +14035,7 @@ proto_register_netflow(void) }, {&hf_cflow_metro_evc_id, {"Metro Evc Id", "cflow.metro_evc_id", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_metro_evc_type, @@ -14220,7 +14220,7 @@ proto_register_netflow(void) }, {&hf_cflow_nat_pool_name, {"Nat Pool Name", "cflow.nat_pool_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_anonymization_flags, @@ -14240,17 +14240,17 @@ proto_register_netflow(void) }, {&hf_cflow_p2p_technology, {"P2p Technology", "cflow.p2p_technology", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_tunnel_technology, {"Tunnel Technology", "cflow.tunnel_technology", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_encrypted_technology, {"Encrypted Technology", "cflow.encrypted_technology", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_subtemplate_list, @@ -14290,7 +14290,7 @@ proto_register_netflow(void) }, {&hf_cflow_observation_domain_name, {"Observation Domain Name", "cflow.observation_domain_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_selection_sequence_id, @@ -14470,7 +14470,7 @@ proto_register_netflow(void) }, {&hf_cflow_selector_name, {"Selector Name", "cflow.selector_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_upper_cilimit_float32, @@ -14511,12 +14511,12 @@ proto_register_netflow(void) }, {&hf_cflow_information_element_description, {"Information Element Description", "cflow.information_element_description", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_information_element_name, {"Information Element Name", "cflow.information_element_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_information_element_range_begin, @@ -14552,7 +14552,7 @@ proto_register_netflow(void) }, {&hf_cflow_virtual_station_interface_name, {"Virtual Station Interface Name", "cflow.virtual_station_interface_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_virtual_station_uuid, @@ -14562,7 +14562,7 @@ proto_register_netflow(void) }, {&hf_cflow_virtual_station_name, {"Virtual Station Name", "cflow.virtual_station_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_layer2_segment_id, @@ -14667,22 +14667,22 @@ proto_register_netflow(void) }, {&hf_cflow_user_name, {"User Name", "cflow.user_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_application_category_name, {"Application Category Name", "cflow.application_category_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_application_sub_category_name, {"Application Sub Category Name", "cflow.application_sub_category_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_application_group_name, {"Application Group Name", "cflow.application_group_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_original_flows_present, @@ -15052,37 +15052,37 @@ proto_register_netflow(void) }, {&hf_cflow_mib_context_name, {"mib Context Name", "cflow.mib_context_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mib_object_name, {"mib Object Name", "cflow.mib_object_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mib_object_description, {"mib Object Description", "cflow.mib_object_description", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mib_object_syntax, {"mib Object Syntax", "cflow.mib_object_syntax", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mib_module_name, {"mib Module Name", "cflow.mib_module_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mobile_imsi, {"mib Mobile IMSI", "cflow.mib_mobile_imsi", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_mobile_msisdn, {"mib Mobile MSISDN", "cflow.mib_mobile_msisdn", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_statuscode, @@ -15097,22 +15097,22 @@ proto_register_netflow(void) }, {&hf_cflow_http_request_method, {"HTTP Request Method", "cflow.http_request_method", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_request_host, {"HTTP Request Host", "cflow.http_request_host", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_request_target, {"HTTP Request Target", "cflow.http_request_target", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_message_version, {"HTTP Message Version", "cflow.http_message_version", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_nat_instanceid, @@ -15142,17 +15142,17 @@ proto_register_netflow(void) }, {&hf_cflow_http_user_agent, {"HTTP User Agent", "cflow.http_user_agent", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_content_type, {"HTTP Content Type", "cflow.http_content_type", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_http_reason_phrase, {"HTTP Reason Phrase", "cflow.http_reason_phrase", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_max_session_entries, @@ -15410,13 +15410,13 @@ proto_register_netflow(void) {&hf_cflow_cts_sgt_source_name, {"Source SGT Name", "cflow.source_sgt_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_cts_sgt_destination_name, {"Destination SGT Name", "cflow.destination_sgt_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_cflow_packets_dropped, @@ -15666,7 +15666,7 @@ proto_register_netflow(void) }, {&hf_cflow_nat_context_name, {"NAT Context Name", "cflow.nat_context_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Zero terminated context Name", HFILL} }, {&hf_cflow_nat_assign_time, @@ -15717,7 +15717,7 @@ proto_register_netflow(void) }, {&hf_cflow_aaa_username, {"AAA username", "cflow.aaa_username", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, @@ -15803,7 +15803,7 @@ proto_register_netflow(void) /* CACE Technologies, 32622 / 10 */ {&hf_pie_cace_local_username, {"Local User Name", "cflow.pie.cace.localusername", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Local User Name (caceLocalProcessUserName)", HFILL} }, /* CACE Technologies, 32622 / 11 */ @@ -15815,7 +15815,7 @@ proto_register_netflow(void) /* CACE Technologies, 32622 / 11 */ {&hf_pie_cace_local_cmd, {"Local Command", "cflow.pie.cace.localcmd", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Local Command (caceLocalProcessCommand)", HFILL} }, @@ -16017,25 +16017,25 @@ proto_register_netflow(void) /* ntop, 35632 / 101 */ {&hf_pie_ntop_src_ip_country, {"Country where the src IP is located", "cflow.pie.ntop.src_ip_country", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 102 */ {&hf_pie_ntop_src_ip_city, {"City where the src IP is located", "cflow.pie.ntop.src_ip_city", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 103 */ {&hf_pie_ntop_dst_ip_country, {"Country where the dst IP is located", "cflow.pie.ntop.dst_ip_country", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 104 */ {&hf_pie_ntop_dst_ip_city, {"City where the dst IP is located", "cflow.pie.ntop.dst_ip_city", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 105 */ @@ -16126,7 +16126,7 @@ proto_register_netflow(void) /* ntop, 35632 / 119 */ {&hf_pie_ntop_l7_proto_name, {"Layer 7 protocol name", "cflow.pie.ntop.l7_proto_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 120 */ @@ -16138,13 +16138,13 @@ proto_register_netflow(void) /* ntop, 35632 / 121 */ {&hf_pie_ntop_flow_user_name, {"Flow username of the tunnel (if known)", "cflow.pie.ntop.flow_user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 122 */ {&hf_pie_ntop_flow_server_name, {"Flow server name (if known)", "cflow.pie.ntop.flow_server_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 123 */ @@ -16168,7 +16168,7 @@ proto_register_netflow(void) /* ntop, 35632 / 126 */ {&hf_pie_ntop_plugin_name, {"Plugin name used by this flow (if any)", "cflow.pie.ntop.plugin_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 127 */ @@ -16186,25 +16186,25 @@ proto_register_netflow(void) /* ntop, 35632 / 130 */ {&hf_pie_ntop_sip_call_id, {"SIP call-id", "cflow.pie.ntop.sip_call_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 131 */ {&hf_pie_ntop_sip_calling_party, {"SIP Call initiator", "cflow.pie.ntop.sip_calling_party", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 132 */ {&hf_pie_ntop_sip_called_party, {"SIP Called party", "cflow.pie.ntop.sip_called_party", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 133 */ {&hf_pie_ntop_sip_rtp_codecs, {"SIP RTP codecs", "cflow.pie.ntop.sip_rtp_codecs", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 134 */ @@ -16378,13 +16378,13 @@ proto_register_netflow(void) /* ntop, 35632 / 169 */ {&hf_pie_ntop_src_proc_name, {"Src process name", "cflow.pie.ntop.src_proc_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 180 */ {&hf_pie_ntop_http_url, {"HTTP URL (IXIA URI)", "cflow.pie.ntop.http_url", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 181 */ @@ -16396,73 +16396,73 @@ proto_register_netflow(void) /* ntop, 35632 / 182 */ {&hf_pie_ntop_http_referer, {"HTTP Referer", "cflow.pie.ntop.http_referer", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 183 */ {&hf_pie_ntop_http_ua, {"HTTP User Agent", "cflow.pie.ntop.http_ua", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 184 */ {&hf_pie_ntop_http_mime, {"HTTP Mime Type", "cflow.pie.ntop.http_mime", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 185 */ {&hf_pie_ntop_smtp_mail_from, {"Mail sender", "cflow.pie.ntop.smtp_mail_from", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 186 */ {&hf_pie_ntop_smtp_rcpt_to, {"Mail recipient", "cflow.pie.ntop.smtp_rcpt_to", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 187 */ {&hf_pie_ntop_http_host, {"HTTP Host Name (IXIA Host Name)", "cflow.pie.ntop.http_host", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 188 */ {&hf_pie_ntop_ssl_server_name, {"SSL server name", "cflow.pie.ntop.ssl_server_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 189 */ {&hf_pie_ntop_bittorrent_hash, {"BITTORRENT hash", "cflow.pie.ntop.bittorrent_hash", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 195 */ {&hf_pie_ntop_mysql_srv_version, {"MySQL server version", "cflow.pie.ntop.mysql_server_version", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 196 */ {&hf_pie_ntop_mysql_username, {"MySQL username", "cflow.pie.ntop.mysql_username", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 197 */ {&hf_pie_ntop_mysql_db, {"MySQL database in use", "cflow.pie.ntop.mysql_db", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 198 */ {&hf_pie_ntop_mysql_query, {"MySQL Query", "cflow.pie.ntop.mysql_query", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 199 */ @@ -16474,13 +16474,13 @@ proto_register_netflow(void) /* ntop, 35632 / 200 */ {&hf_pie_ntop_oracle_username, {"Oracle Username", "cflow.pie.ntop.oracle_username", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 201 */ {&hf_pie_ntop_oracle_query, {"Oracle Query", "cflow.pie.ntop.oracle_query", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 202 */ @@ -16492,7 +16492,7 @@ proto_register_netflow(void) /* ntop, 35632 / 203 */ {&hf_pie_ntop_oracle_resp_string, {"Oracle Response String", "cflow.pie.ntop.oracle_resp_string", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 204 */ @@ -16504,7 +16504,7 @@ proto_register_netflow(void) /* ntop, 35632 / 205 */ {&hf_pie_ntop_dns_query, {"DNS query", "cflow.pie.ntop.dns_query", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 206 */ @@ -16534,7 +16534,7 @@ proto_register_netflow(void) /* ntop, 35632 / 210 */ {&df_pie_ntop_pop_user, {"POP3 user login", "cflow.pie.ntop.pop_user", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 220 */ @@ -16582,25 +16582,25 @@ proto_register_netflow(void) /* ntop, 35632 / 227 */ {&hf_pie_ntop_gtpv1_end_user_imsi, {"GTPv1 End User IMSI", "cflow.pie.ntop.gtpv1_end_user_imsi", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 228 */ {&hf_pie_ntop_gtpv1_end_user_msisdn, {"GTPv1 End User MSISDN", "cflow.pie.ntop.gtpv1_end_user_msisdn", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 229 */ {&hf_pie_ntop_gtpv1_end_user_imei, {"GTPv1 End User IMEI", "cflow.pie.ntop.gtpv1_end_user_imei", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 230 */ {&hf_pie_ntop_gtpv1_apn_name, {"GTPv1 APN Name", "cflow.pie.ntop.gtpv1_apn_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 231 */ @@ -16654,19 +16654,19 @@ proto_register_netflow(void) /* ntop, 35632 / 242 */ {&hf_pie_ntop_radius_user_name, {"RADIUS User Name (Access Only)", "cflow.pie.ntop.radius_user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 243 */ {&hf_pie_ntop_radius_calling_station_id, {"RADIUS Calling Station Id", "cflow.pie.ntop.radius_calling_station_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 244 */ {&hf_pie_ntop_radius_called_station_id, {"RADIUS Called Station Id", "cflow.pie.ntop.radius_called_station_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 245 */ @@ -16678,19 +16678,19 @@ proto_register_netflow(void) /* ntop, 35632 / 246 */ {&hf_pie_ntop_radius_nas_identifier, {"RADIUS NAS Identifier", "cflow.pie.ntop.radius_nas_identifier", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 247 */ {&hf_pie_ntop_radius_user_imsi, {"RADIUS User IMSI (Extension)", "cflow.pie.ntop.radius_user_imsi", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 248 */ {&hf_pie_ntop_radius_user_imei, {"RADIUS User MSISDN (Extension)", "cflow.pie.ntop.radius_user_imei", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 249 */ @@ -16702,13 +16702,13 @@ proto_register_netflow(void) /* ntop, 35632 / 250 */ {&hf_pie_ntop_radius_acct_session_id, {"RADIUS Accounting Session Name", "cflow.pie.ntop.radius_acct_session_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 251 */ {&hf_pie_ntop_radius_acct_status_type, {"RADIUS Accounting Status Type", "cflow.pie.ntop.radius_acct_status_type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 252 */ @@ -16738,7 +16738,7 @@ proto_register_netflow(void) /* ntop, 35632 / 260 */ {&hf_pie_ntop_imap_login, {"Mail sender", "cflow.pie.ntop.imap_login", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 270 */ @@ -16768,7 +16768,7 @@ proto_register_netflow(void) /* ntop, 35632 / 274 */ {&hf_pie_ntop_gtpv2_s2c_s1u_gtpu_teid, {"GTPv2 Srv->Client S1U GTPU TEID", "cflow.pie.ntop.gtpv2_s2c_s1u_gtpu_teid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 275 */ @@ -16780,19 +16780,19 @@ proto_register_netflow(void) /* ntop, 35632 / 276 */ {&hf_pie_ntop_gtpv2_end_user_imsi, {"GTPv2 End User IMSI", "cflow.pie.ntop.gtpv2_end_user_imsi", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 277 */ {&hf_pie_ntop_gtpv2_and_user_msisdn, {"GTPv2 End User MSISDN", "cflow.pie.ntop.gtpv2_and_user_msisdn", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 278 */ {&hf_pie_ntop_gtpv2_apn_name, {"GTPv2 APN Name", "cflow.pie.ntop.gtpv2_apn_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 279 */ @@ -16834,7 +16834,7 @@ proto_register_netflow(void) /* ntop, 35632 / 285 */ {&hf_pie_ntop_gtpv2_end_user_imei, {"GTPv2 End User IMEI", "cflow.pie.ntop.gtpv2_end_user_imei", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 290 */ @@ -16990,13 +16990,13 @@ proto_register_netflow(void) /* ntop, 35632 / 325 */ {&hf_pie_ntop_gtpv0_end_user_msisdn, {"GTPv0 End User MSISDN", "cflow.pie.ntop.gtpv0_end_user_msisdn", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 326 */ {&hf_pie_ntop_gtpv0_apn_name, {"GTPv0 APN Name", "cflow.pie.ntop.gtpv0_apn_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 327 */ @@ -17146,7 +17146,7 @@ proto_register_netflow(void) /* ntop, 35632 / 351 */ {&hf_pie_ntop_whois_das_domain, {"Whois/DAS Domain name", "cflow.pie.ntop.whois_das_domain", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 352 */ @@ -17170,25 +17170,25 @@ proto_register_netflow(void) /* ntop, 35632 / 355 */ {&hf_pie_ntop_dhcp_client_name, {"DHCP client name", "cflow.pie.ntop.dhcp_clien_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 356 */ {&hf_pie_ntop_ftp_login, {"FTP client login", "cflow.pie.ntop.ftp_login", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 357 */ {&hf_pie_ntop_ftp_password, {"FTP client password", "cflow.pie.ntop.ftp_password", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 358 */ {&hf_pie_ntop_ftp_command, {"FTP client command", "cflow.pie.ntop.ftp_command", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 359 */ @@ -17200,25 +17200,25 @@ proto_register_netflow(void) /* ntop, 35632 / 360 */ {&hf_pie_ntop_http_method, {"HTTP METHOD", "cflow.pie.ntop.http_method", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 361 */ {&hf_pie_ntop_http_site, {"HTTP server without host name", "cflow.pie.ntop.http_site", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 362 */ {&hf_pie_ntop_sip_c_ip, {"SIP C IP addresses", "cflow.pie.ntop.sip_c_ip", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 363 */ {&hf_pie_ntop_sip_call_state, {"SIP Call State", "cflow.pie.ntop.sip_call_state", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 370 */ @@ -17236,7 +17236,7 @@ proto_register_netflow(void) /* ntop, 35632 / 372 */ {&hf_pie_ntop_src_proc_user_name, {"Src process user name", "cflow.pie.ntop.src_proc_user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 373 */ @@ -17248,7 +17248,7 @@ proto_register_netflow(void) /* ntop, 35632 / 374 */ {&hf_pie_ntop_src_father_proc_name, {"Src father process name", "cflow.pie.ntop.src_father_proc_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 375 */ @@ -17260,13 +17260,13 @@ proto_register_netflow(void) /* ntop, 35632 / 376 */ {&hf_pie_ntop_dst_proc_name, {"Dst process name", "cflow.pie.ntop.dst_proc_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 377 */ {&hf_pie_ntop_dst_proc_user_name, {"Dst process user name", "cflow.pie.ntop.dst_proc_user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 378 */ @@ -17278,7 +17278,7 @@ proto_register_netflow(void) /* ntop, 35632 / 379 */ {&hf_pie_ntop_dst_father_proc_name, {"Dst father process name", "cflow.pie.ntop.dst_father_proc_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 380 */ @@ -17374,7 +17374,7 @@ proto_register_netflow(void) /* ntop, 35632 / 395 */ {&hf_pie_ntop_rtp_dtmf_tones, {"DTMF tones sent (if any) during the call", "cflow.pie.ntop.rtp_dtmf_tones", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 396 */ @@ -17392,7 +17392,7 @@ proto_register_netflow(void) /* ntop, 35632 / 398 */ {&hf_pie_ntop_dns_response, {"DNS response(s)", "cflow.pie.ntop.dns_response", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 399 */ @@ -17410,19 +17410,19 @@ proto_register_netflow(void) /* ntop, 35632 / 401 */ {&hf_pie_ntop_diameter_req_origin_host, {"DIAMETER Origin Host Request", "cflow.pie.ntop.diameter_req_origin_host", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 402 */ {&hf_pie_ntop_diameter_rsp_origin_host, {"DIAMETER Origin Host Response", "cflow.pie.ntop.diameter_rsp_origin_host", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 403 */ {&hf_pie_ntop_diameter_req_user_name, {"DIAMETER Request User Name", "cflow.pie.ntop.diameter_req_user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 404 */ @@ -17542,13 +17542,13 @@ proto_register_netflow(void) /* ntop, 35632 / 423 */ {&hf_pie_ntop_dhcp_remote_id, {"DHCP agent remote Id", "cflow.pie.ntop.dhcp_remote_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 424 */ {&hf_pie_ntop_dhcp_subscriber_id, {"DHCP subscribed Id", "cflow.pie.ntop.dhcp_subscriber_id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 425 */ @@ -17566,19 +17566,19 @@ proto_register_netflow(void) /* ntop, 35632 / 427 */ {&hf_pie_ntop_application_name, {"Palo Alto App-Id", "cflow.pie.ntop.application_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 428 */ {&hf_pie_ntop_user_name, {"Palo Alto User-Id", "cflow.pie.ntop.user_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 429 */ {&hf_pie_ntop_dhcp_message_type, {"DHCP message type", "cflow.pie.ntop.dhcp_message_type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 430 */ @@ -17614,7 +17614,7 @@ proto_register_netflow(void) /* ntop, 35632 / 435 */ {&hf_pie_ntop_gptv2_s5_s8_gtpc_teid, {"GTPv2 S5/S8 SGW GTPC TEIDs", "cflow.pie.ntop.gptv2_s5_s8_gtpc_teid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 436 */ @@ -17662,13 +17662,13 @@ proto_register_netflow(void) /* ntop, 35632 / 443 */ {&hf_pie_ntop_src_as_map, {"Organization name for SRC_AS", "cflow.pie.ntop.src_as_map", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 444 */ {&hf_pie_ntop_dst_as_map, {"Organization name for DST_AS", "cflow.pie.ntop.dst_as_map", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 445 */ @@ -17692,25 +17692,25 @@ proto_register_netflow(void) /* ntop, 35632 / 448 */ {&hf_pie_ntop_src_ip_long, {"Longitude where the src IP is located", "cflow.pie.ntop.src_ip_long", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 449 */ {&hf_pie_ntop_src_ip_lat, {"Latitude where the src IP is located", "cflow.pie.ntop.src_ip_lat", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 450 */ {&hf_pie_ntop_dst_ip_long, {"Longitude where the dst IP is located", "cflow.pie.ntop.dst_ip_long", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 451 */ {&hf_pie_ntop_dst_ip_lat, {"Latitude where the dst IP is located", "cflow.pie.ntop.dst_ip_lat", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 452 */ @@ -17764,67 +17764,67 @@ proto_register_netflow(void) /* ntop, 35632 / 460 */ {&hf_pie_ntop_http_x_forwarded_for, {"HTTP X-Forwarded-For", "cflow.pie.ntop.http_x_forwarded_for", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 461 */ {&hf_pie_ntop_http_via, {"HTTP Via", "cflow.pie.ntop.http_via", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 462 */ {&hf_pie_ntop_ssdp_host, {"SSDP Host", "cflow.pie.ntop.ssdp_host", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 463 */ {&hf_pie_ntop_ssdp_usn, {"SSDP USN", "cflow.pie.ntop.ssdp_usn", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 464 */ {&hf_pie_ntop_netbios_query_name, {"NETBIOS Query Name", "cflow.pie.ntop.netbios_query_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 465 */ {&hf_pie_ntop_netbios_query_type, {"NETBIOS Query Type", "cflow.pie.ntop.netbios_query_type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 466 */ {&hf_pie_ntop_netbios_response, {"NETBIOS Query Response", "cflow.pie.ntop.netbios_response", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 467 */ {&hf_pie_ntop_netbios_query_os, {"NETBIOS Query OS", "cflow.pie.ntop.netbios_query_os", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 468 */ {&hf_pie_ntop_ssdp_server, {"SSDP Server", "cflow.pie.ntop.ssdp_server", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 469 */ {&hf_pie_ntop_ssdp_type, {"SSDP Type", "cflow.pie.ntop.ssdp_type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 470 */ {&hf_pie_ntop_ssdp_method, {"SSDP Method", "cflow.pie.ntop.ssdp_method", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ntop, 35632 / 471 */ @@ -17849,19 +17849,19 @@ proto_register_netflow(void) {&hf_pie_plixer_client_hostname, /* plixer, 13745 / 101 */ {"client_hostname", "cflow.pie.plixer.client_hostname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 102 */ {&hf_pie_plixer_partner_name, {"Partner_name", "cflow.pie.plixer.partner_name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 103 */ {&hf_pie_plixer_server_hostname, {"Server_hostname", "cflow.pie.plixer.server_hostname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 104 */ @@ -17873,7 +17873,7 @@ proto_register_netflow(void) /* plixer, 13745 / 105 */ {&hf_pie_plixer_recipient_address, {"Recipient_address", "cflow.pie.plixer.recipient_address", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 106 */ @@ -17885,7 +17885,7 @@ proto_register_netflow(void) /* plixer, 13745 / 107 */ {&hf_pie_plixer_msgid, {"Msgid", "cflow.pie.plixer.msgid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 108 */ @@ -17921,25 +17921,25 @@ proto_register_netflow(void) /* plixer, 13745 / 113 */ {&hf_pie_plixer_service_version, {"Service_version", "cflow.pie.plixer.service_version", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 114 */ {&hf_pie_plixer_linked_msgid, {"Linked_msgid", "cflow.pie.plixer.linked_msgid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 115 */ {&hf_pie_plixer_message_subject, {"Message_subject", "cflow.pie.plixer.message_subject", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 116 */ {&hf_pie_plixer_sender_address, {"Sender_address", "cflow.pie.plixer.sender_address", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* plixer, 13745 / 117 */ @@ -17964,38 +17964,38 @@ proto_register_netflow(void) /* ixia, 3054 / 111 */ {&hf_pie_ixia_l7_application_name, {"L7 Application Name", "cflow.pie.ixia.l7-application-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ixia, 3054 / 120 */ {&hf_pie_ixia_source_ip_country_code, {"Source IP Country Code", "cflow.pie.ixia.source-ip-country-code", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "2 letter country code for the source IP address", HFILL} }, /* ixia, 3054 / 121 */ {&hf_pie_ixia_source_ip_country_name, {"Source IP Country Name", "cflow.pie.ixia.source-ip-country-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Country name for the source IP address", HFILL} }, /* ixia, 3054 / 122 */ {&hf_pie_ixia_source_ip_region_code, {"Source IP Region Code", "cflow.pie.ixia.source-ip-region-code", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "2 letter region code for the source IP address", HFILL} }, /* ixia, 3054 / 123 */ {&hf_pie_ixia_source_ip_region_name, {"Source IP Region Name", "cflow.pie.ixia.source-ip-region-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Region name for the source IP address", HFILL} }, /* ixia, 3054 / 125 */ {&hf_pie_ixia_source_ip_city_name, {"Source IP City Name", "cflow.pie.ixia.source-ip-city-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "City name for the source IP address", HFILL} }, /* ixia, 3054 / 126 */ @@ -18014,31 +18014,31 @@ proto_register_netflow(void) /* ixia, 3054 / 140 */ {&hf_pie_ixia_destination_ip_country_code, {"Destination IP Country Code", "cflow.pie.ixia.destination-ip-country-code", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "2 letter region code for the destination IP address", HFILL} }, /* ixia, 3054 / 141 */ {&hf_pie_ixia_destination_ip_country_name, {"Destination IP Country Name", "cflow.pie.ixia.destination-ip-country-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Country name for the destination IP address", HFILL} }, /* ixia, 3054 / 142 */ {&hf_pie_ixia_destination_ip_region_code, {"Destination IP Region Code", "cflow.pie.ixia.destination-ip-region-code", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "2 letter region code for the destination IP address", HFILL} }, /* ixia, 3054 / 143 */ {&hf_pie_ixia_destination_ip_region_name, {"Destination IP Region Name", "cflow.pie.ixia.destination-ip-region-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Region name for the destination IP address", HFILL} }, /* ixia, 3054 / 145 */ {&hf_pie_ixia_destination_ip_city_name, {"Destination IP City Name", "cflow.pie.ixia.destination-ip-city-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "City name for the destination IP address", HFILL} }, /* ixia, 3054 / 146 */ @@ -18063,7 +18063,7 @@ proto_register_netflow(void) /* ixia, 3054 / 161 */ {&hf_pie_ixia_os_device_name, {"OS Device Name", "cflow.pie.ixia.os-device-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "String containing OS name", HFILL} }, /* ixia, 3054 / 162 */ @@ -18075,7 +18075,7 @@ proto_register_netflow(void) /* ixia, 3054 / 163 */ {&hf_pie_ixia_browser_name, {"Browser Name", "cflow.pie.ixia.browser-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Unique Name for each browser type", HFILL} }, @@ -18095,14 +18095,14 @@ proto_register_netflow(void) /* ixia, 3054 / 178 */ {&hf_pie_ixia_conn_encryption_type, {"Connection Encryption Type", "cflow.pie.ixia.conn-encryption-type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Whether the connection is encrypted", HFILL} }, /* ixia, 3054 / 179 */ {&hf_pie_ixia_encryption_cipher, {"Encryption Cipher", "cflow.pie.ixia.encryption-cipher", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Cipher used in the encryption", HFILL} }, @@ -18116,49 +18116,49 @@ proto_register_netflow(void) /* ixia, 3054 / 181 */ {&hf_pie_ixia_imsi, {"IMSI", "cflow.pie.ixia.imsi", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "IMSI associated with a GTP tunneled flow", HFILL} }, /* ixia, 3054 / 182 */ {&hf_pie_ixia_user_agent, {"HTTP User Agent", "cflow.pie.ixia.http-user-agent", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "User-Agent string in HTTP requests", HFILL} }, /* ixia, 3054 / 183 */ {&hf_pie_ixia_host_name, {"Host Name", "cflow.pie.ixia.hostname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Hostname", HFILL} }, /* ixia, 3054 / 184 */ {&hf_pie_ixia_uri, {"HTTP URI", "cflow.pie.ixia.http-uri", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "URI in HTTP requests", HFILL} }, /* ixia, 3054 / 185 */ {&hf_pie_ixia_dns_txt, {"DNS TXT", "cflow.pie.ixia.dns-txt", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TXT record in DNS query", HFILL} }, /* ixia, 3054 / 186 */ {&hf_pie_ixia_source_as_name, {"Source AS Name", "cflow.pie.ixia.src-as-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* ixia, 3054 / 187 */ {&hf_pie_ixia_dest_as_name, {"Destination AS Name", "cflow.pie.ixia.dest-as-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, @@ -18172,28 +18172,28 @@ proto_register_netflow(void) /* ixia, 3054 / 189 */ {&hf_pie_ixia_dns_query_names, {"DNS Query Names", "cflow.pie.ixia.dns-query-names", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Names in the Query section of a DNS message (comma separated list)", HFILL} }, /* ixia, 3054 / 190 */ {&hf_pie_ixia_dns_answer_names, {"DNS Answer Names", "cflow.pie.ixia.dns-answer-names", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Names in the Answer section of a DNS message (comma separated list)", HFILL} }, /* ixia, 3054 / 191 */ {&hf_pie_ixia_dns_classes, {"DNS Classes", "cflow.pie.ixia.dns-classes", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Class types appearing in a DNS message (comma separated list)", HFILL} }, /* ixia, 3054 / 192 */ {&hf_pie_ixia_threat_type, {"Threat Type", "cflow.pie.ixia.threat-type", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Potential threat type associated with the source/destination IP", HFILL} }, @@ -18235,7 +18235,7 @@ proto_register_netflow(void) /* ixia, 3054 / 198 */ {&hf_pie_ixia_dns_name, {"DNS Name", "cflow.pie.ixia.dns-name", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Name in DNS Records", HFILL} }, @@ -18256,7 +18256,7 @@ proto_register_netflow(void) /* ixia, 3054 / 201 */ {&hf_pie_ixia_tls_sni, {"TLS SNI", "cflow.pie.ixia.tls-sni", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Extension Server Name Indication", HFILL} }, @@ -18305,7 +18305,7 @@ proto_register_netflow(void) /* ixia, 3054 / 208 */ {&hf_pie_ixia_dhcp_servername, {"DHCP Servername", "cflow.pie.ixia.dhcp-servername", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DHCP header Servername", HFILL} }, @@ -18333,7 +18333,7 @@ proto_register_netflow(void) /* ixia, 3054 / 212 */ {&hf_pie_ixia_radius_username, {"RADIUS Username", "cflow.pie.ixia.radius-username", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Username (Attr 1)", HFILL} }, @@ -18361,70 +18361,70 @@ proto_register_netflow(void) /* ixia, 3054 / 216 */ {&hf_pie_ixia_radius_filter_id, {"RADIUS Filter ID", "cflow.pie.ixia.radius-filter-id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Filter ID (Attr 11)", HFILL} }, /* ixia, 3054 / 217 */ {&hf_pie_ixia_radius_reply_message, {"RADIUS Reply Message", "cflow.pie.ixia.radius-reply-msg", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Reply Message (Attr 18)", HFILL} }, /* ixia, 3054 / 218 */ {&hf_pie_ixia_radius_called_station_id, {"RADIUS Called Station ID", "cflow.pie.ixia.radius-called-station", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Called Station ID (Attr 30)", HFILL} }, /* ixia, 3054 / 219 */ {&hf_pie_ixia_http_connection, {"HTTP Connection", "cflow.pie.ixia.http-connection", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Connection header value", HFILL} }, /* ixia, 3054 / 220 */ {&hf_pie_ixia_http_accept, {"HTTP Accept", "cflow.pie.ixia.http-accept", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Accept header value", HFILL} }, /* ixia, 3054 / 221 */ {&hf_pie_ixia_http_accept_language, {"HTTP Accept-Language", "cflow.pie.ixia.http-accept-language", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Accept-Language header value", HFILL} }, /* ixia, 3054 / 222 */ {&hf_pie_ixia_http_accept_encoding, {"HTTP Accept-Encoding", "cflow.pie.ixia.http-accept-encoding", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Accept-Encoding header value", HFILL} }, /* ixia, 3054 / 223 */ {&hf_pie_ixia_http_reason, {"HTTP Reason", "cflow.pie.ixia.http-reason", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Status Reason", HFILL} }, /* ixia, 3054 / 224 */ {&hf_pie_ixia_http_server, {"HTTP Server", "cflow.pie.ixia.http-server", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Server header value", HFILL} }, /* ixia, 3054 / 218 */ {&hf_pie_ixia_radius_calling_station_id, {"RADIUS Calling Station ID", "cflow.pie.ixia.radius-calling-station", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Calling Station ID (Attr 31)", HFILL} }, @@ -18438,14 +18438,14 @@ proto_register_netflow(void) /* ixia, 3054 / 227 */ {&hf_pie_ixia_http_referer, {"HTTP Referer", "cflow.pie.ixia.http-referer", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Referer header value", HFILL} }, /* ixia, 3054 / 228 */ {&hf_pie_ixia_http_useragent_cpu, {"HTTP UA-CPU", "cflow.pie.ixia.http-ua-cpu", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "HTTP UA-CPU header value", HFILL} }, @@ -18459,56 +18459,56 @@ proto_register_netflow(void) /* ixia, 3054 / 230 */ {&hf_pie_ixia_email_msg_id, {"Email Msg ID", "cflow.pie.ixia.email-msg-id", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message ID", HFILL} }, /* ixia, 3054 / 231 */ {&hf_pie_ixia_email_msg_date, {"Email Msg Date", "cflow.pie.ixia.email-msg-date", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message Date", HFILL} }, /* ixia, 3054 / 232 */ {&hf_pie_ixia_email_msg_subject, {"Email Msg Subject", "cflow.pie.ixia.email-msg-subject", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message Subject", HFILL} }, /* ixia, 3054 / 233 */ {&hf_pie_ixia_email_msg_to, {"Email Msg To", "cflow.pie.ixia.email-msg-to", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message To", HFILL} }, /* ixia, 3054 / 234 */ {&hf_pie_ixia_email_msg_from, {"Email Msg From", "cflow.pie.ixia.email-msg-from", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message From", HFILL} }, /* ixia, 3054 / 235 */ {&hf_pie_ixia_email_msg_cc, {"Email Msg CC", "cflow.pie.ixia.email-msg-cc", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message CC", HFILL} }, /* ixia, 3054 / 236 */ {&hf_pie_ixia_email_msg_bcc, {"Email Msg BCC", "cflow.pie.ixia.email-msg-bcc", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message BCC", HFILL} }, /* ixia, 3054 / 237 */ {&hf_pie_ixia_email_msg_attachments, {"Email Msg Attachments", "cflow.pie.ixia.email-msg-attachments", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Email Message attachments", HFILL} }, @@ -18529,14 +18529,14 @@ proto_register_netflow(void) /* ixia, 3054 / 240 */ {&hf_pie_ixia_tls_srvr_cert_issuer_attr, {"TLS Server Cert Issuer Attr", "cflow.pie.ixia.tls-server-cert-issuer.attr", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Issuer Attribute", HFILL} }, /* ixia, 3054 / 241 */ {&hf_pie_ixia_tls_srvr_cert_issuer_val, {"TLS Server Cert Issuer Value", "cflow.pie.ixia.tls-server-cert-issuer.val", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Issuer Value", HFILL} }, @@ -18550,49 +18550,49 @@ proto_register_netflow(void) /* ixia, 3054 / 243 */ {&hf_pie_ixia_tls_srvr_cert_subject_attr, {"TLS Server Cert Subject Attr", "cflow.pie.ixia.tls-server-cert-subject.attr", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Subject Attribute", HFILL} }, /* ixia, 3054 / 244 */ {&hf_pie_ixia_tls_srvr_cert_subject_val, {"TLS Server Cert Subject Value", "cflow.pie.ixia.tls-server-cert-subject.val", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Subject Value", HFILL} }, /* ixia, 3054 / 245 */ {&hf_pie_ixia_tls_srvr_cert_vld_nt_bfr, {"TLS Server Cert Valid Not Before", "cflow.pie.ixia.tls-server-cert-vld-notbefore", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Valid Not Before", HFILL} }, /* ixia, 3054 / 246 */ {&hf_pie_ixia_tls_srvr_cert_vld_nt_aftr, {"TLS Server Cert Valid Not After", "cflow.pie.ixia.tls-server-cert-vld-notafter", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Valid Not After", HFILL} }, /* ixia, 3054 / 247 */ {&hf_pie_ixia_tls_srvr_cert_srl_num, {"TLS Server Cert Serial Number", "cflow.pie.ixia.tls-server-cert-srlnum", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Serial Number", HFILL} }, /* ixia, 3054 / 248 */ {&hf_pie_ixia_tls_srvr_cert_sign_algo, {"TLS Server Cert Sign Algo", "cflow.pie.ixia.tls-server-cert-sign-algo", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Signature Algorithm", HFILL} }, /* ixia, 3054 / 249 */ {&hf_pie_ixia_tls_srvr_cert_subj_pki_algo, {"TLS Server Cert Subject PKI Algo", "cflow.pie.ixia.tls-server-cert-sub-pki-algo", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates Subject PKI Algorithm", HFILL} }, @@ -18606,14 +18606,14 @@ proto_register_netflow(void) /* ixia, 3054 / 251 */ {&hf_pie_ixia_tls_srvr_cert_altnames_attr, {"TLS Server Cert AltNames Attr", "cflow.pie.ixia.tls-server-cert-altnames.attr", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates AltNames Attribute", HFILL} }, /* ixia, 3054 / 252 */ {&hf_pie_ixia_tls_srvr_cert_altnames_val, {"TLS Server Cert AltNames Value", "cflow.pie.ixia.tls-server-cert-altnames.val", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "TLS Server Certificates AltNames Value", HFILL} }, @@ -18662,7 +18662,7 @@ proto_register_netflow(void) /* ixia, 3054 / 259 */ {&hf_pie_ixia_dns_raw_rdata, {"DNS Rec Raw rdata", "cflow.pie.ixia.dns-rec-raw-rdata", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DNS Record Raw Rdata", HFILL} }, @@ -18676,7 +18676,7 @@ proto_register_netflow(void) /* ixia, 3054 / 261 */ {&hf_pie_ixia_radius_framed_ip, {"RADIUS Framed IP", "cflow.pie.ixia.radius-framedip", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "RADIUS Framed IP (Attr 8/168)", HFILL} }, @@ -18760,7 +18760,7 @@ proto_register_netflow(void) /* ixia, 3054 / 273 */ {&hf_pie_ixia_dns_query_name, {"DNS Query Name", "cflow.pie.ixia.dns-qname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DNS Question Qname", HFILL} }, @@ -18781,28 +18781,28 @@ proto_register_netflow(void) /* ixia, 3054 / 276 */ {&hf_pie_ixia_dns_canonical_name, {"DNS Cname", "cflow.pie.ixia.dns-cname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DNS Canonical Name", HFILL} }, /* ixia, 3054 / 277 */ {&hf_pie_ixia_dns_mx_domain, {"DNS MX Domain", "cflow.pie.ixia.dns-mx-domain", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DNS Mail Exchange Domain", HFILL} }, /* ixia, 3054 / 278 */ {&hf_pie_ixia_dhcp_agent_circuit_id, {"DHCP Agent Circuit ID", "cflow.pie.ixia.dhcp-agent-circuitid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "DHCP Agent Circuit ID (Option 82 Sub 1)", HFILL} }, /* ixia, 3054 / 279 */ {&hf_pie_ixia_ja3_fingerprint_string, {"JA3 fingerprint", "cflow.pie.ixia.ja3-fingerprint", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "JA3 fingerprint string", HFILL} }, @@ -18855,13 +18855,13 @@ proto_register_netflow(void) /* netscaler, 5951 / 130 */ {&hf_pie_netscaler_httprequrl, {"HTTP Request Url", "cflow.pie.netscaler.http-req-url", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 131 */ {&hf_pie_netscaler_httpreqcookie, {"HTTP Request Cookie", "cflow.pie.netscaler.http-req-cookie", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 132 */ @@ -18885,7 +18885,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 135 */ {&hf_pie_netscaler_syslogmessage, {"Syslog Message", "cflow.pie.netscaler.syslog-message", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 136 */ @@ -18897,25 +18897,25 @@ proto_register_netflow(void) /* netscaler, 5951 / 140 */ {&hf_pie_netscaler_httpreqreferer, {"HTTP Request Referer", "cflow.pie.netscaler.http-req-referer", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 141 */ {&hf_pie_netscaler_httpreqmethod, {"HTTP Request Method", "cflow.pie.netscaler.http-req-method", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 142 */ {&hf_pie_netscaler_httpreqhost, {"HTTP Request Host", "cflow.pie.netscaler.http-req-host", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 143 */ {&hf_pie_netscaler_httprequseragent, {"HTTP Request UserAgent", "cflow.pie.netscaler.http-req-useragent", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 144 */ @@ -18957,7 +18957,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 152 */ {&hf_pie_netscaler_appname, {"AppName", "cflow.pie.netscaler.appname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 153 */ @@ -19011,31 +19011,31 @@ proto_register_netflow(void) /* netscaler, 5951 / 163 */ {&hf_pie_netscaler_httpclientinteractionstarttime, {"HTTP Client Interaction Start Time", "cflow.pie.netscaler.http-client-interaction-starttime", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Timestamp when the page starts loading", HFILL} }, /* netscaler, 5951 / 164 */ {&hf_pie_netscaler_httpclientrenderendtime, {"HTTP Client Render End Time", "cflow.pie.netscaler.http-client-render-endtime", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Timestamp when the page completely renders", HFILL} }, /* netscaler, 5951 / 165 */ {&hf_pie_netscaler_httpclientrenderstarttime, {"HTTP Client Render Start Time", "cflow.pie.netscaler.http-client-render-starttime", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Timestamp when page rendering begins", HFILL} }, /* netscaler, 5951 / 167 */ {&hf_pie_netscaler_apptemplatename, {"App Template Name", "cflow.pie.netscaler.app-template-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 168 */ {&hf_pie_netscaler_httpclientinteractionendtime, {"HTTP Client Interaction End Time", "cflow.pie.netscaler.http-client-interaction-endtime", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 169 */ @@ -19077,31 +19077,31 @@ proto_register_netflow(void) /* netscaler, 5951 / 175 */ {&hf_pie_netscaler_dbusername, {"DB User Name", "cflow.pie.netscaler.db-user-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 176 */ {&hf_pie_netscaler_dbdatabasename, {"DB Database Name", "cflow.pie.netscaler.db-database-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 177 */ {&hf_pie_netscaler_dbclthostname, {"DB Client Host Name", "cflow.pie.netscaler.db-clt-hostname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 178 */ {&hf_pie_netscaler_dbreqstring, {"DB Request String", "cflow.pie.netscaler.db-req-string", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 179 */ {&hf_pie_netscaler_dbrespstatusstring, {"DB Response Status String", "cflow.pie.netscaler.db-resp-status-string", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Database response status", HFILL} }, /* netscaler, 5951 / 180 */ @@ -19125,43 +19125,43 @@ proto_register_netflow(void) /* netscaler, 5951 / 183 */ {&hf_pie_netscaler_httpcontenttype, {"HTTP Content-Type", "cflow.pie.netscaler.http-contenttype", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 185 */ {&hf_pie_netscaler_httpreqauthorization, {"HTTP Request Authorization", "cflow.pie.netscaler.http-req-authorization", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 186 */ {&hf_pie_netscaler_httpreqvia, {"HTTP Request Via", "cflow.pie.netscaler.http-req-via", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 187 */ {&hf_pie_netscaler_httpreslocation, {"HTTP Response Location", "cflow.pie.netscaler.http-res-location", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 188 */ {&hf_pie_netscaler_httpressetcookie, {"HTTP Response Set-Cookie", "cflow.pie.netscaler.http-res-setcookie", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 189 */ {&hf_pie_netscaler_httpressetcookie2, {"HTTP Response Set-Cookie2", "cflow.pie.netscaler.http-res-setcookie2", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 190 */ {&hf_pie_netscaler_httpreqxforwardedfor, {"HTTP Request X-Forwarded-For", "cflow.pie.netscaler.http-reqx-forwardedfor", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 192 */ @@ -19185,7 +19185,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 201 */ {&hf_pie_netscaler_icaclientversion, {"ICA Client Version", "cflow.pie.netscaler.ica-client-version", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Version of the ICA client", HFILL} }, /* netscaler, 5951 / 202 */ @@ -19203,19 +19203,19 @@ proto_register_netflow(void) /* netscaler, 5951 / 204 */ {&hf_pie_netscaler_icaclienthostname, {"ICA Client Host Name", "cflow.pie.netscaler.ica-client-hostname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 205 */ {&hf_pie_netscaler_aaausername, {"AAA Username", "cflow.pie.netscaler.aaa-username", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 207 */ {&hf_pie_netscaler_icadomainname, {"ICA Domain Name", "cflow.pie.netscaler.ica-domain-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 208 */ @@ -19233,7 +19233,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 210 */ {&hf_pie_netscaler_icaservername, {"ICA Server Name", "cflow.pie.netscaler.ica-servername", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 214 */ @@ -19377,7 +19377,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 238 */ {&hf_pie_netscaler_icaapplicationname, {"ICA Application Name", "cflow.pie.netscaler.ica-application-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 239 */ @@ -19425,7 +19425,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 246 */ {&hf_pie_netscaler_icaappmodulepath, {"ICA AppModule Path", "cflow.pie.netscaler.ica-appmodule-path", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 247 */ @@ -19449,7 +19449,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 250 */ {&hf_pie_netscaler_icausername, {"ICA Username", "cflow.pie.netscaler.icau-sername", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 251 */ @@ -19551,7 +19551,7 @@ proto_register_netflow(void) /* netscaler, 5951 / 267 */ {&hf_pie_netscaler_httpdomainname, {"HTTP Domain Name", "cflow.pie.netscaler.http-domain-name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* netscaler, 5951 / 268 */ @@ -19594,13 +19594,13 @@ proto_register_netflow(void) /* Barracuda, 10704 / 4 */ {&hf_pie_barracuda_fwrule, {"FW Rule", "cflow.pie.barracuda.fwrule", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Name of FW Rule", HFILL} }, /* Barracuda, 10704 / 5 */ {&hf_pie_barracuda_servicename, {"Service Name", "cflow.pie.barracuda.servicename", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Barracuda, 10704 / 6 */ @@ -19612,7 +19612,7 @@ proto_register_netflow(void) /* Barracuda, 10704 / 7 */ {&hf_pie_barracuda_reasontext, {"Reason Text", "cflow.pie.barracuda.reasontext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Barracuda, 10704 / 8 */ @@ -19655,7 +19655,7 @@ proto_register_netflow(void) /* gigamon, 26866 / 1 */ {&hf_pie_gigamon_httprequrl, {"HttpReqUrl", "cflow.pie.gigamon.httprequrl", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 2 */ @@ -19667,37 +19667,37 @@ proto_register_netflow(void) /* gigamon, 26866 / 101 */ {&hf_pie_gigamon_sslcertificateissuercommonname, {"SslCertificateIssuerCommonName", "cflow.pie.gigamon.sslcertificateissuercommonname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 102 */ {&hf_pie_gigamon_sslcertificatesubjectcommonname, {"SslCertificateSubjectCommonName", "cflow.pie.gigamon.sslcertificatesubjectcommonname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 103 */ {&hf_pie_gigamon_sslcertificateissuer, {"SslCertificateIssuer", "cflow.pie.gigamon.sslcertificateissuer", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 104 */ {&hf_pie_gigamon_sslcertificatesubject, {"SslCertificateSubject", "cflow.pie.gigamon.sslcertificatesubject", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 105 */ {&hf_pie_gigamon_sslcertificatevalidnotbefore, {"SslCertificateValidNotBefore", "cflow.pie.gigamon.sslcertificatevalidnotbefore", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 106 */ {&hf_pie_gigamon_sslcertificatevalidnotafter, {"SslCertificateValidNotAfter", "cflow.pie.gigamon.sslcertificatevalidnotafter", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 107 */ @@ -19728,13 +19728,13 @@ proto_register_netflow(void) /* gigamon, 26866 / 111 */ {&hf_pie_gigamon_sslcertificatesubjectaltname, {"SslCertificateSubjectAltName", "cflow.pie.gigamon.sslcertificatesubjectaltname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 112 */ {&hf_pie_gigamon_sslservernameindication, {"SslServerNameIndication", "cflow.pie.gigamon.sslservernameindication", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 113 */ @@ -19782,13 +19782,13 @@ proto_register_netflow(void) /* gigamon, 26866 / 204 */ {&hf_pie_gigamon_dnsqueryname, {"DnsQueryName", "cflow.pie.gigamon.dnsqueryname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 205 */ {&hf_pie_gigamon_dnsresponsename, {"DnsResponseName", "cflow.pie.gigamon.dnsresponsename", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 206 */ @@ -19812,7 +19812,7 @@ proto_register_netflow(void) /* gigamon, 26866 / 209 */ {&hf_pie_gigamon_dnsbits, {"DnsBits", "cflow.pie.gigamon.dnsbits", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 210 */ @@ -19872,13 +19872,13 @@ proto_register_netflow(void) /* gigamon, 26866 / 219 */ {&hf_pie_gigamon_dnsresponserdata, {"DnsResponseRdata", "cflow.pie.gigamon.dnsresponserdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 220 */ {&hf_pie_gigamon_dnsauthorityname, {"DnsAuthorityName", "cflow.pie.gigamon.dnsauthorityname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 221 */ @@ -19908,13 +19908,13 @@ proto_register_netflow(void) /* gigamon, 26866 / 225 */ {&hf_pie_gigamon_dnsauthorityrdata, {"DnsAuthorityRdata", "cflow.pie.gigamon.dnsauthorityrdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 226 */ {&hf_pie_gigamon_dnsadditionalname, {"DnsAdditionalName", "cflow.pie.gigamon.dnsadditionalname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* gigamon, 26866 / 227 */ @@ -19944,7 +19944,7 @@ proto_register_netflow(void) /* gigamon, 26866 / 231 */ {&hf_pie_gigamon_dnsadditionalrdata, {"DnsAdditionalRdata", "cflow.pie.gigamon.dnsadditionalrdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks root (a hidden item to allow filtering) */ @@ -19956,7 +19956,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 100 */ {&hf_pie_niagara_networks_sslservernameindication, {"SslServerNameIndication", "cflow.pie.niagaranetworks.sslservernameindication", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 101 */ @@ -19968,7 +19968,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 102 */ {&hf_pie_niagara_networks_sslserverversiontext, {"SslServerVersionText", "cflow.pie.niagaranetworks.sslserverversiontext", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 103 */ @@ -19980,19 +19980,19 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 104 */ {&hf_pie_niagara_networks_sslserverciphertext, {"SslServerCipherText", "cflow.pie.niagaranetworks.sslserverciphertext", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 105 */ {&hf_pie_niagara_networks_sslconnectionencryptiontype, {"SslConnectionEncryptionType", "cflow.pie.niagaranetworks.sslconnectionencryptiontype", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 106 */ {&hf_pie_niagara_networks_sslservercompressionmethod, {"SslServerCompressionMethod", "cflow.pie.niagaranetworks.sslservercompressionmethod", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 107 */ @@ -20004,55 +20004,55 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 108 */ {&hf_pie_niagara_networks_sslcertificateissuer, {"SslCertificateIssuer", "cflow.pie.niagaranetworks.sslcertificateissuer", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 109 */ {&hf_pie_niagara_networks_sslcertificateissuername, {"SslCertificateIssuerName", "cflow.pie.niagaranetworks.sslcertificateissuername", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 110 */ {&hf_pie_niagara_networks_sslcertificatesubject, {"SslCertificateSubject", "cflow.pie.niagaranetworks.sslcertificatesubject", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 111 */ {&hf_pie_niagara_networks_sslcertificatesubjectname, {"SslCertificateSubjectName", "cflow.pie.niagaranetworks.sslcertificatesubjectname", - FT_STRING, STR_UNICODE, NULL, 0X0, + FT_STRING, BASE_NONE, NULL, 0X0, NULL, HFILL} }, /* Niagara Networks, 47729 / 112 */ {&hf_pie_niagara_networks_sslcertificatevalidnotbefore, {"SslCertificateValidNotBefore", "cflow.pie.niagaranetworks.sslcertificatevalidnotbefore", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 113 */ {&hf_pie_niagara_networks_sslcertificatevalidnotafter, {"SslCertificateValidNotAfter", "cflow.pie.niagaranetworks.sslcertificatevalidnotafter", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 114 */ {&hf_pie_niagara_networks_sslcertificateserialnumber, {"SslCertificateSerialNumber", "cflow.pie.niagaranetworks.sslcertificateserialnumber", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 115 */ {&hf_pie_niagara_networks_sslcertificatesignaturealgorithm, {"SslCertificateSignatureAlgorithm", "cflow.pie.niagaranetworks.sslcertificatesignaturealgorithm", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 116 */ {&hf_pie_niagara_networks_sslcertificatesignaturealgorithmtext, {"SslCertificateSignatureAlgorithmText", "cflow.pie.niagaranetworks.sslcertificatesignaturealgorithmtext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 117 */ @@ -20064,25 +20064,25 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 118 */ {&hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithm, {"SslCertificateSubjectPublicAlgorithm", "cflow.pie.niagaranetworks.sslcertificatesubjectpublicalgorithm", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 119 */ {&hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithmtext, {"SslCertificateSubjectPublicAlgorithmText", "cflow.pie.niagaranetworks.sslcertificatesubjectpublicalgorithmtext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 120 */ {&hf_pie_niagara_networks_sslcertificatesubjectalgorithmtext, {"SslCertificateSubjectAlgorithmText", "cflow.pie.niagaranetworks.sslcertificatesubjectalgorithmtext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 121 */ {&hf_pie_niagara_networks_sslcertificatesubjectalternativename, {"SslCertificateSubjectAlternativeName", "cflow.pie.niagaranetworks.sslcertificatesubjectalternativename", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 122 */ @@ -20112,13 +20112,13 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 203 */ {&hf_pie_niagara_networks_dnsqueryname, {"DnsQueryName", "cflow.pie.niagaranetworks.dnsqueryname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 204 */ {&hf_pie_niagara_networks_dnsresponsename, {"DnsResponseName", "cflow.pie.niagaranetworks.dnsresponsename", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 205 */ @@ -20130,31 +20130,31 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 206 */ {&hf_pie_niagara_networks_dnsresponseipv4addr, {"DnsResponseIPv4Addr", "cflow.pie.niagaranetworks.dnsresponseipv4addr", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 207 */ {&hf_pie_niagara_networks_dnsresponseipv4addrtext, {"DnsResponseIPv4AddrText", "cflow.pie.niagaranetworks.dnsresponseipv4addrtext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 208 */ {&hf_pie_niagara_networks_dnsresponseipv6addr, {"DnsResponseIPv6Addr", "cflow.pie.niagaranetworks.dnsresponseipv6addr", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 209 */ {&hf_pie_niagara_networks_dnsresponseipv6addrtext, {"DnsResponseIPv6AddrText", "cflow.pie.niagaranetworks.dnsresponseipv6addrtext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 210 */ {&hf_pie_niagara_networks_dnsbits, {"DnsBits", "cflow.pie.niagaranetworks.dnsbits", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 211 */ @@ -20190,7 +20190,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 216 */ {&hf_pie_niagara_networks_dnsquerytypetext, {"DnsQueryTypeText", "cflow.pie.niagaranetworks.dnsquerytypetext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 217 */ @@ -20202,7 +20202,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 218 */ {&hf_pie_niagara_networks_dnsqueryclasstext, {"DnsQueryClassText", "cflow.pie.niagaranetworks.dnsqueryclasstext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 219 */ @@ -20214,7 +20214,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 220 */ {&hf_pie_niagara_networks_dnsresponsetypetext, {"DnsResponseTypeText", "cflow.pie.niagaranetworks.dnsresponsetypetext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 221 */ @@ -20226,7 +20226,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 222 */ {&hf_pie_niagara_networks_dnsresponseclasstext, {"DnsResponseClassText", "cflow.pie.niagaranetworks.dnsresponseclasstext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 223 */ @@ -20238,13 +20238,13 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 224 */ {&hf_pie_niagara_networks_dnsresponserdata, {"DnsResponseRData", "cflow.pie.niagaranetworks.dnsresponserdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 225 */ {&hf_pie_niagara_networks_dnsauthorityname, {"DnsAuthorityName", "cflow.pie.niagaranetworks.dnsauthorityname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 226 */ @@ -20256,7 +20256,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 227 */ {&hf_pie_niagara_networks_dnsauthoritytypetext, {"DnsAuthorityTypeText", "cflow.pie.niagaranetworks.dnsauthoritytypetext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 228 */ @@ -20268,7 +20268,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 229 */ {&hf_pie_niagara_networks_dnsauthorityclasstext, {"DnsAuthorityClassText", "cflow.pie.niagaranetworks.dnsauthorityclasstext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 230 */ @@ -20286,13 +20286,13 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 232 */ {&hf_pie_niagara_networks_dnsauthorityrdata, {"DnsAuthorityRData", "cflow.pie.niagaranetworks.dnsauthorityrdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 233 */ {&hf_pie_niagara_networks_dnsadditionalname, {"DnsAdditionalName", "cflow.pie.niagaranetworks.dnsadditionalname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 234 */ @@ -20304,7 +20304,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 235 */ {&hf_pie_niagara_networks_dnsadditionaltypetext, {"DnsAdditionalTypeText", "cflow.pie.niagaranetworks.dnsadditionaltypetext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 236 */ @@ -20316,7 +20316,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 237 */ {&hf_pie_niagara_networks_dnsadditionalclasstext, {"DnsAdditionalClassText", "cflow.pie.niagaranetworks.dnsadditionalclasstext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 238 */ @@ -20334,7 +20334,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 240 */ {&hf_pie_niagara_networks_dnsadditionalrdata, {"DnsAdditionalRData", "cflow.pie.niagaranetworks.dnsadditionalrdata", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 300 */ @@ -20346,7 +20346,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 301 */ {&hf_pie_niagara_networks_radiuspackettypecodetext, {"RadiusPacketTypeCodeText", "cflow.pie.niagaranetworks.radiuspackettypecodetext", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 302 */ @@ -20364,19 +20364,19 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 304 */ {&hf_pie_niagara_networks_radiususername, {"RadiusUserName", "cflow.pie.niagaranetworks.radiususername", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 305 */ {&hf_pie_niagara_networks_radiuscallingstationid, {"RadiusCallingStationId", "cflow.pie.niagaranetworks.radiuscallingstationid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 306 */ {&hf_pie_niagara_networks_radiuscalledstationid, {"RadiusCalledStationId", "cflow.pie.niagaranetworks.radiuscalledstationid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 307 */ @@ -20394,7 +20394,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 309 */ {&hf_pie_niagara_networks_radiusnasidentifier, {"RadiusNasIdentifier", "cflow.pie.niagaranetworks.radiusnasidentifier", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 310 */ @@ -20412,13 +20412,13 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 312 */ {&hf_pie_niagara_networks_radiusacctsessionid, {"RadiusAcctSessionId", "cflow.pie.niagaranetworks.radiusacctsessionid", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 313 */ {&hf_pie_niagara_networks_radiusacctstatustype, {"RadiusAcctStatusType", "cflow.pie.niagaranetworks.radiusacctstatustype", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 314 */ @@ -20454,7 +20454,7 @@ proto_register_netflow(void) /* Niagara Networks, 47729 / 319 */ {&hf_pie_niagara_networks_radiusvsaname, {"RadiusVsaName", "cflow.pie.niagaranetworks.radiusvsaname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Niagara Networks, 47729 / 320 */ @@ -20515,7 +20515,7 @@ proto_register_netflow(void) /* Cisco, 9 / 8234 */ {&hf_pie_cisco_c3pl_class_name, {"C3PL Class Name", "cflow.pie.cisco.c3pl_class_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 8235 */ @@ -20533,7 +20533,7 @@ proto_register_netflow(void) /* Cisco, 9 / 8237 */ {&hf_pie_cisco_c3pl_policy_name, {"C3PL Policy Name", "cflow.pie.cisco.c3pl_policy_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 8238 */ @@ -20629,7 +20629,7 @@ proto_register_netflow(void) /* Cisco, 9 / 9357 */ {&hf_pie_cisco_application_http_uri_statistics, {"Application HTTP URI Statistics", "cflow.pie.cisco.application_http_uri_statistics", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 9357 */ @@ -20641,25 +20641,25 @@ proto_register_netflow(void) /* Cisco, 9 / 12232 */ {&hf_pie_cisco_application_category_name, {"Application Category Name", "cflow.pie.cisco.application_category_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 12233 */ {&hf_pie_cisco_application_sub_category_name, {"Application Sub Category Name", "cflow.pie.cisco.application_sub_category_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 12234 */ {&hf_pie_cisco_application_group_name, {"Application Group Name", "cflow.pie.cisco.application_group_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 12235 */ {&hf_pie_cisco_application_http_host, {"Application HTTP Host", "cflow.pie.cisco.application_http_host", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, /* Cisco, 9 / 12235 */ diff --git a/epan/dissectors/packet-netlink-generic.c b/epan/dissectors/packet-netlink-generic.c index 4c35b138a6..113d1006a2 100644 --- a/epan/dissectors/packet-netlink-generic.c +++ b/epan/dissectors/packet-netlink-generic.c @@ -214,7 +214,7 @@ dissect_genl_ctrl_ops_attrs(tvbuff_t *tvb, void *data _U_, struct packet_netlink static header_field_info hfi_genl_ctrl_group_name NETLINK_GENERIC_HFI_INIT = - { "Group Name", "genl.ctrl.group_name", FT_STRINGZ, STR_ASCII, + { "Group Name", "genl.ctrl.group_name", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_genl_ctrl_group_id NETLINK_GENERIC_HFI_INIT = @@ -257,7 +257,7 @@ static header_field_info hfi_genl_ctrl_family_id NETLINK_GENERIC_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_genl_ctrl_family_name NETLINK_GENERIC_HFI_INIT = - { "Family Name", "genl.ctrl.family_name", FT_STRINGZ, STR_ASCII, + { "Family Name", "genl.ctrl.family_name", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_genl_ctrl_version NETLINK_GENERIC_HFI_INIT = diff --git a/epan/dissectors/packet-netlink-net_dm.c b/epan/dissectors/packet-netlink-net_dm.c index 4d2d77bf81..a82c7138fc 100644 --- a/epan/dissectors/packet-netlink-net_dm.c +++ b/epan/dissectors/packet-netlink-net_dm.c @@ -198,7 +198,7 @@ static header_field_info hfi_net_dm_pc NETLINK_NET_DM_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_symbol NETLINK_NET_DM_HFI_INIT = - { "Symbol", "net_dm.symbol", FT_STRINGZ, STR_ASCII, + { "Symbol", "net_dm.symbol", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_attrs_port NETLINK_NET_DM_HFI_INIT = @@ -235,11 +235,11 @@ static header_field_info hfi_net_dm_origin NETLINK_NET_DM_HFI_INIT = static header_field_info hfi_net_dm_hw_trap_group_name NETLINK_NET_DM_HFI_INIT = { "Hardware trap group name", "net_dm.hw_trap_group_name", FT_STRINGZ, - STR_ASCII, NULL, 0x00, NULL, HFILL }; + BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_hw_trap_name NETLINK_NET_DM_HFI_INIT = { "Hardware trap name", "net_dm.hw_trap_name", FT_STRINGZ, - STR_ASCII, NULL, 0x00, NULL, HFILL }; + BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_hw_trap_count NETLINK_NET_DM_HFI_INIT = { "Hardware trap count", "net_dm.hw_trap_count", FT_UINT32, BASE_DEC, @@ -258,7 +258,7 @@ static header_field_info hfi_net_dm_port_netdev_index NETLINK_NET_DM_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_port_netdev_name NETLINK_NET_DM_HFI_INIT = - { "Port net device name", "net_dm.port.netdev_name", FT_STRINGZ, STR_ASCII, + { "Port net device name", "net_dm.port.netdev_name", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_net_dm_stats_dropped NETLINK_NET_DM_HFI_INIT = diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c index fcb6e6a2be..509ec8a06f 100644 --- a/epan/dissectors/packet-netlink-netfilter.c +++ b/epan/dissectors/packet-netlink-netfilter.c @@ -708,7 +708,7 @@ static header_field_info hfi_nfct_attr_status NETLINK_NETFILTER_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nfct_help_attr_help_name NETLINK_NETFILTER_HFI_INIT = - { "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, STR_UNICODE, + { "Helper name", "netlink-netfilter.ct_help_attr.help_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_nfct_help_attr NETLINK_NETFILTER_HFI_INIT = @@ -917,7 +917,7 @@ static header_field_info hfi_nfexp_attr_zone NETLINK_NETFILTER_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nfexp_attr_fn NETLINK_NETFILTER_HFI_INIT = - { "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, STR_UNICODE, + { "Name", "netlink-netfilter.nfexp.fn", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; /* CTA_EXPECT_FLAGS bitfield */ @@ -1610,11 +1610,11 @@ static header_field_info hfi_ipset_cadt_attr_cadt_flags NETLINK_NETFILTER_HFI_IN NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_setname NETLINK_NETFILTER_HFI_INIT = - { "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, STR_UNICODE, + { "Setname", "netlink-netfilter.ipset.setname", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_typename NETLINK_NETFILTER_HFI_INIT = - { "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, STR_UNICODE, + { "Typename", "netlink-netfilter.ipset.typename", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_attr_family NETLINK_NETFILTER_HFI_INIT = @@ -1630,7 +1630,7 @@ static header_field_info hfi_ipset_adt_attr NETLINK_NETFILTER_HFI_INIT = VALS(ipset_adt_attr_vals), NLA_TYPE_MASK, NULL, HFILL }; static header_field_info hfi_ipset_adt_attr_comment NETLINK_NETFILTER_HFI_INIT = - { "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, STR_UNICODE, + { "Comment", "netlink-netfilter.ipset.comment", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_ipset_ip_attr NETLINK_NETFILTER_HFI_INIT = diff --git a/epan/dissectors/packet-netlink-nl80211.c b/epan/dissectors/packet-netlink-nl80211.c index 0159788d4c..7b2d359a4b 100644 --- a/epan/dissectors/packet-netlink-nl80211.c +++ b/epan/dissectors/packet-netlink-nl80211.c @@ -3714,11 +3714,11 @@ static header_field_info hfi_nl80211_attr_value64 NETLINK_NL80211_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nl80211_wiphy_name NETLINK_NL80211_HFI_INIT = - { "Wiphy Name", "nl80211.wiphy_name", FT_STRINGZ, STR_ASCII, + { "Wiphy Name", "nl80211.wiphy_name", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nl80211_ifname NETLINK_NL80211_HFI_INIT = - { "Interface Name", "nl80211.ifname", FT_STRINGZ, STR_ASCII, + { "Interface Name", "nl80211.ifname", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nl80211_mac NETLINK_NL80211_HFI_INIT = @@ -3726,7 +3726,7 @@ static header_field_info hfi_nl80211_mac NETLINK_NL80211_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nl80211_alpha2 NETLINK_NL80211_HFI_INIT = - { "Alpha2", "nl80211.alpha2", FT_STRINGZ, STR_ASCII, + { "Alpha2", "nl80211.alpha2", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_nl80211_dbm NETLINK_NL80211_HFI_INIT = diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index b8c51f4b32..59153105a2 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -592,7 +592,7 @@ static header_field_info hfi_netlink_route_ifla_attr_type NETLINK_ROUTE_HFI_INIT VALS(netlink_route_ifla_attr_vals), 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifla_ifname NETLINK_ROUTE_HFI_INIT = - { "Device name", "netlink-route.ifla_ifname", FT_STRINGZ, STR_ASCII, + { "Device name", "netlink-route.ifla_ifname", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifla_mtu NETLINK_ROUTE_HFI_INIT = @@ -636,7 +636,7 @@ static header_field_info hfi_netlink_route_ifla_carrier NETLINK_ROUTE_HFI_INIT = TFS(&tfs_restricted_not_restricted), 0x01, NULL, HFILL }; static header_field_info hfi_netlink_route_ifla_qdisc NETLINK_ROUTE_HFI_INIT = - { "Queueing discipline", "netlink-route.ifla_qdisc", FT_STRINGZ, STR_ASCII, + { "Queueing discipline", "netlink-route.ifla_qdisc", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifla_carrier_changes NETLINK_ROUTE_HFI_INIT = @@ -1045,7 +1045,7 @@ static header_field_info hfi_netlink_route_ifa_attr_type NETLINK_ROUTE_HFI_INIT VALS(netlink_route_ifa_attr_vals), 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifa_label NETLINK_ROUTE_HFI_INIT = - { "Interface name", "netlink-route.ifa_label", FT_STRINGZ, STR_ASCII, + { "Interface name", "netlink-route.ifa_label", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifa_flags32 NETLINK_ROUTE_HFI_INIT = diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c index 698c7ad652..cfdc321d72 100644 --- a/epan/dissectors/packet-netlink-sock_diag.c +++ b/epan/dissectors/packet-netlink-sock_diag.c @@ -358,7 +358,7 @@ static header_field_info hfi_netlink_sock_diag_unix_attr NETLINK_SOCK_DIAG_HFI_I VALS(netlink_sock_diag_unix_attr_vals), NLA_TYPE_MASK, NULL, HFILL }; static header_field_info hfi_netlink_sock_diag_unix_name NETLINK_SOCK_DIAG_HFI_INIT = - { "Name", "netlink-sock_diag.unix_name", FT_STRINGZ, STR_ASCII, + { "Name", "netlink-sock_diag.unix_name", FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_sock_diag_unix_peer_inode NETLINK_SOCK_DIAG_HFI_INIT = diff --git a/epan/dissectors/packet-netmon.c b/epan/dissectors/packet-netmon.c index 1f31d89314..25636443b4 100644 --- a/epan/dissectors/packet-netmon.c +++ b/epan/dissectors/packet-netmon.c @@ -2056,11 +2056,11 @@ void proto_register_netmon(void) }, { &hf_netmon_filter_app_name, { "Application Name", "netmon_filter.app_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_filter_filter, { "Filter", "netmon_filter.filter", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, }; @@ -2075,19 +2075,19 @@ void proto_register_netmon(void) }, { &hf_netmon_network_info_computer_name, { "Computer name", "netmon_network_info.computer_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_network_info_friendly_name, { "Friendly name", "netmon_network_info.friendly_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_network_info_description, { "Description", "netmon_network_info.description", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_network_info_miniport_guid, { "Miniport GUID", "netmon_network_info.miniport_guid", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_network_info_media_type, { "Media type", "netmon_network_info.media_type", @@ -2246,11 +2246,11 @@ void proto_register_netmon(void) }, { &hf_netmon_system_trace_session_name, { "Session name", "netmon_system_trace.session_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_trace_log_file_name, { "Log file name", "netmon_system_trace.log_file_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_trace_group_mask1, { "Group Mask1", "netmon_system_trace.group_mask1", @@ -2313,11 +2313,11 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_computer_name, { "Computer name", "netmon_system_config.computer_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_domain_name, { "Domain name", "netmon_system_config.domain_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_hyper_threading_flag, { "Hyper threading flag", "netmon_system_config.hyper_threading_flag", @@ -2361,7 +2361,7 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_manufacturer, { "Manufacturer", "netmon_system_config.manufacturer", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_partition_count, { "Partition count", "netmon_system_config.partition_count", @@ -2377,11 +2377,11 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_boot_drive_letter, { "Boot drive letter", "netmon_system_config.boot_drive_letter", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_spare, { "Spare", "netmon_system_config.spare", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_start_offset, { "Start offset", "netmon_system_config.start_offset", @@ -2401,7 +2401,7 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_drive_letter, { "Drive letter", "netmon_system_config.drive_letter", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_partition_number, { "Partition number", "netmon_system_config.partition_number", @@ -2421,7 +2421,7 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_file_system, { "File system", "netmon_system_config.file_system", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_volume_ext, { "Volume ext", "netmon_system_config.volume_ext", @@ -2445,15 +2445,15 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_nic_description, { "File system", "netmon_system_config.file_system", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_ipaddresses, { "IP addresses", "netmon_system_config.ipaddresses", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_dns_server_addresses, { "DNS server addresses", "netmon_system_config.dns_server_addresses", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_memory_size, { "Memory size", "netmon_system_config.memory_size", @@ -2477,23 +2477,23 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_chip_type, { "Chip type", "netmon_system_config.chip_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_dac_type, { "DAC type", "netmon_system_config.dac_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_adapter_string, { "Adapter string", "netmon_system_config.adapter_string", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_bios_string, { "BIOS string", "netmon_system_config.bios_string", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_device_id, { "Device ID", "netmon_system_config.device_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_state_flags, { "State flags", "netmon_system_config.state_flags", @@ -2513,15 +2513,15 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_service_name, { "Service name", "netmon_system_config.service_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_display_name, { "Display name", "netmon_system_config.display_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_process_name, { "Process name", "netmon_system_config.process_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_s1, { "S1", "netmon_system_config.s1", @@ -2573,11 +2573,11 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_device_desc, { "Device description", "netmon_system_config.device_desc", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_friendly_name, { "Friendly name", "netmon_system_config.friendly_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_device_id_len, { "Device ID length", "netmon_system_config.device_id_len", @@ -2605,31 +2605,31 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_location_information, { "Location information", "netmon_system_config.location_information", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_system_manufacturer, { "System manufacturer", "netmon_system_config.system_manufacturer", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_system_product_name, { "System product name", "netmon_system_config.system_product_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_bios_date, { "BIOS date", "netmon_system_config.bios_date", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_bios_version, { "BIOS version", "netmon_system_config.bios_version", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_load_order_group, { "Load order group", "netmon_system_config.load_order_group", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_svc_host_group, { "svchost group", "netmon_system_config.svc_host_group", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_irq_group, { "IRQ group", "netmon_system_config.irq_group", @@ -2637,11 +2637,11 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_pdo_name, { "PDO name", "netmon_system_config.pdo_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_nic_name, { "NIC name", "netmon_system_config.nic_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_index, { "Index", "netmon_system_config.index", @@ -2649,7 +2649,7 @@ void proto_register_netmon(void) }, { &hf_netmon_system_config_physical_addr_str, { "Physical address", "netmon_system_config.physical_addr_str", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_system_config_ip_address, { "IP address", "netmon_system_config.ip_address", @@ -2744,11 +2744,11 @@ void proto_register_netmon(void) }, { &hf_netmon_process_image_file_name, { "Image file name", "netmon_process.image_file_name", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_process_command_line, { "Commandline", "netmon_process.command_line", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_netmon_process_page_directory_base, { "Page directory base", "netmon_process.page_directory_base", diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index 27ce25a5f8..eeecc2fbd7 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -22679,7 +22679,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_WarningMessageContents_decoded_page, { "Decoded Page", "ngap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_NGRANTraceID_TraceID, { "TraceID", "ngap.NGRANTraceID.TraceID", @@ -24762,7 +24762,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_bluetoothName, { "bluetoothName", "ngap.bluetoothName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_CancelledCellsInEAI_EUTRA_item, { "CancelledCellsInEAI-EUTRA-Item", "ngap.CancelledCellsInEAI_EUTRA_Item_element", @@ -27230,7 +27230,7 @@ void proto_register_ngap(void) { NULL, HFILL }}, { &hf_ngap_wLANName, { "wLANName", "ngap.wLANName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ngap_pagingProbabilityInformation, { "pagingProbabilityInformation", "ngap.pagingProbabilityInformation", diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c index fd25781d62..9484f9e267 100644 --- a/epan/dissectors/packet-nr-rrc.c +++ b/epan/dissectors/packet-nr-rrc.c @@ -114424,7 +114424,7 @@ proto_register_nr_rrc(void) { "WLAN_RTT_r16", HFILL }}, { &hf_nr_rrc_ssid_r16, { "ssid-r16", "nr-rrc.ssid_r16", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nr_rrc_bssid_r16, { "bssid-r16", "nr-rrc.bssid_r16", @@ -116424,7 +116424,7 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, { &hf_nr_rrc_warningMessageSegment_decoded_page, { "Decoded Page", "nr-rrc.warningMessageSegment.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_nr_rrc_sib7_fragments, { "Fragments", "nr-rrc.warningMessageSegment.fragments", diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 4ba17feb2f..c953576b94 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -1717,7 +1717,7 @@ proto_register_ns(void) { &hf_ns_inforec_info, { "info", "nstrace.inforec.info", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, @@ -1753,13 +1753,13 @@ proto_register_ns(void) { &hf_ns_vmnamerec_srcvmname, { "SrcVmName", "nstrace.vmnames.srcvmname", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_ns_vmnamerec_dstvmname, { "DstVmName", "nstrace.vmnames.dstvmnames", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL} }, diff --git a/epan/dissectors/packet-nvme.c b/epan/dissectors/packet-nvme.c index 5b49b255af..c93212d29a 100644 --- a/epan/dissectors/packet-nvme.c +++ b/epan/dissectors/packet-nvme.c @@ -5295,11 +5295,11 @@ proto_register_nvme(void) }, { &hf_nvme_identify_ns_nguid, { "Namespace Globally Unique Identifier (NGUID)", "nvme.cmd.identify.ns.nguid", - FT_BYTES, STR_ASCII, NULL, 0x0, NULL, HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ns_eui64, { "IEEE Extended Unique Identifier (EUI64)", "nvme.cmd.identify.ns.eui64", - FT_BYTES, STR_ASCII, NULL, 0x0, NULL, HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ns_lbafs, { "LBA Formats", "nvme.cmd.identify.ns.lbafs", diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 484e5c04e8..9e349a33e1 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -3553,12 +3553,12 @@ proto_register_obex(void) }, { &hf_ctn_application_parameter_data_filter_period_begin, { "Filter Period Begin", "obex.parameter.ctn.filter_period_begin", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_ctn_application_parameter_data_filter_period_end, { "Filter Period End", "obex.parameter.ctn.filter_period_end", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_ctn_application_parameter_data_parameter_mask, @@ -3638,12 +3638,12 @@ proto_register_obex(void) }, { &hf_ctn_application_parameter_data_email_uri, { "Email URI", "obex.parameter.ctn.email_uri", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_ctn_application_parameter_data_cse_time, { "CSE Time", "obex.parameter.ctn.cse_time", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_ctn_application_parameter_data_recurrent, @@ -3658,7 +3658,7 @@ proto_register_obex(void) }, { &hf_ctn_application_parameter_data_last_update, { "Last Update", "obex.parameter.ctn.last_update", - FT_STRING, STR_ASCII, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL} }, /* for fragmentation */ @@ -3707,15 +3707,15 @@ proto_register_obex(void) "Bluetooth Profile used in this OBEX session", HFILL } }, { &hf_type, - { "Type", "obex.type", FT_STRINGZ, STR_ASCII, NULL, 0x0, + { "Type", "obex.type", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_object_class, - { "Object Class", "obex.object_class", FT_STRINGZ, STR_ASCII, NULL, 0x0, + { "Object Class", "obex.object_class", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_time_iso8601, - { "Time", "obex.time", FT_STRINGZ, STR_ASCII, NULL, 0x0, + { "Time", "obex.time", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_hdr_val_action, diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c index 8165213b82..d8a084aa6b 100644 --- a/epan/dissectors/packet-opa-mad.c +++ b/epan/dissectors/packet-opa-mad.c @@ -9248,7 +9248,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_NodeDescription_NodeString, { "NodeString", "opa.nodedescription.nodestring", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /************ @@ -10423,7 +10423,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_CableInfo_DataStream, { "Data", "opa.cableinfo.datastream", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /************ @@ -10881,7 +10881,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_ServiceRecord_ServiceName, { "ServiceName", "opa.servicerecord.servicename", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_ServiceRecord_ServiceData, { "ServiceData", "opa.servicerecord.servicedata", @@ -10895,7 +10895,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_ServiceAssociationRecord_ServiceName, { "ServiceName", "opa.serviceassociationrecord.servicename", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /************** @@ -12099,7 +12099,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetGroupList_groupName, { "Group Name", "opa.pa.getgrouplist.groupname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /* GetGroupInfo */ @@ -12109,7 +12109,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetGroupInfo_groupName, { "Group Name", "opa.pa.getgroupinfo.groupname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetGroupInfo_numInternalPorts, { "numInternalPorts", "opa.pa.getgroupinfo.numinternalports", @@ -12231,7 +12231,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetGroupConfig_groupName, { "Group Name", "opa.pa.getgroupconfig.groupname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetGroupConfig_Port_NodeGUID, { "NodeGUID", "opa.pa.getgroupconfig.port.nodeguid", @@ -12239,7 +12239,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetGroupConfig_Port_nodeDesc, { "nodeDesc", "opa.pa.getgroupconfig.port.nodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetGroupConfig_Port_NodeLID, { "NodeLID", "opa.pa.getgroupconfig.port.nodelid", @@ -12799,7 +12799,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetFocusPorts_groupName, { "Group Name", "opa.pa.getfocusports.groupname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetFocusPorts_select, { "select", "opa.pa.getfocusports.select", @@ -12847,7 +12847,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetFocusPorts_nodeDesc, { "nodeDesc", "opa.pa.getfocusports.nodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetFocusPorts_neighborLid, { "neighborLid", "opa.pa.getfocusports.neighborlid", @@ -12867,7 +12867,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetFocusPorts_neighborNodeDesc, { "neighborNodeDesc", "opa.pa.getfocusports.neighbornodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /* GetImageInfo */ @@ -12949,7 +12949,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetImageInfo_smNodeDesc, { "nodeDesc", "opa.pa.getimageinfo.sminfo.nodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /* GetVFList */ @@ -12959,7 +12959,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFList_vfName, { "VF Name", "opa.pa.getvflist.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /* GetVFInfo */ @@ -12969,7 +12969,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFInfo_vfName, { "VF Name", "opa.pa.getvfinfo.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFInfo_numPorts, { "numPorts", "opa.pa.getvfinfo.numports", @@ -13075,7 +13075,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFConfig_vfName, { "VF Name", "opa.pa.getvfconfig.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFConfig_Port_NodeGUID, { "NodeGUID", "opa.pa.getvfconfig.port.nodeguid", @@ -13083,7 +13083,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFConfig_Port_nodeDesc, { "nodeDesc", "opa.pa.getvfconfig.port.nodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFConfig_Port_NodeLID, { "NodeLID", "opa.pa.getvfconfig.port.nodelid", @@ -13101,7 +13101,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFPortCounters_vfName, { "VF Name", "opa.pa.getvfportcounters.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFPortCounters_nodeLID, { "nodeLID", "opa.pa.getvfportcounters.nodelid", @@ -13179,7 +13179,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_ClearVFPortCounters_vfName, { "VF Name", "opa.pa.clearvfportcounters.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_ClearVFPortCounters_nodeLID, { "nodeLID", "opa.pa.clearvfportcounters.nodelid", @@ -13261,7 +13261,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFFocusPorts_vfName, { "VF Name", "opa.pa.getvffocusports.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFFocusPorts_select, { "select", "opa.pa.getvffocusports.select", @@ -13309,7 +13309,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFFocusPorts_nodeDesc, { "nodeDesc", "opa.pa.getvffocusports.nodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_GetVFFocusPorts_neighborLid, { "neighborLid", "opa.pa.getvffocusports.neighborlid", @@ -13329,7 +13329,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_GetVFFocusPorts_neighborNodeDesc, { "neighborNodeDesc", "opa.pa.getvffocusports.neighbornodedesc", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, /* VFInfoRecord */ @@ -13347,7 +13347,7 @@ void proto_register_opa_mad(void) }, { &hf_opa_VFInfoRecord_vfName, { "VF Name", "opa.vfinforecord.vfname", - FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_opa_VFInfoRecord_MGID, { "M GID", "opa.vfinforecord.mgid", diff --git a/epan/dissectors/packet-oran.c b/epan/dissectors/packet-oran.c index 39d25d0c5c..55790a3e69 100755 --- a/epan/dissectors/packet-oran.c +++ b/epan/dissectors/packet-oran.c @@ -2489,14 +2489,14 @@ proto_register_oran(void) { &hf_oran_c_eAxC_ID, { "c_eAxC_ID", "oran_fh_cus.c_eaxc_id", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, "This is a calculated field for the c_eAxC ID, which identifies the message stream", HFILL } }, { &hf_oran_refa, { "RefA", "oran_fh_cus.refa", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, "This is a calculated field for the RefA ID, which provides a " "reference in time.", diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 3604f88fc2..d9592072a9 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -9012,7 +9012,7 @@ void proto_register_p1(void) { NULL, HFILL }}, { &hf_p1_RecipientNumberForAdvice_PDU, { "RecipientNumberForAdvice", "p1.RecipientNumberForAdvice", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p1_PhysicalRenditionAttributes_PDU, { "PhysicalRenditionAttributes", "p1.PhysicalRenditionAttributes", @@ -9148,7 +9148,7 @@ void proto_register_p1(void) { NULL, HFILL }}, { &hf_p1_TeletexCommonName_PDU, { "TeletexCommonName", "p1.TeletexCommonName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p1_UniversalCommonName_PDU, { "UniversalCommonName", "p1.UniversalCommonName_element", @@ -9156,7 +9156,7 @@ void proto_register_p1(void) { NULL, HFILL }}, { &hf_p1_TeletexOrganizationName_PDU, { "TeletexOrganizationName", "p1.TeletexOrganizationName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p1_UniversalOrganizationName_PDU, { "UniversalOrganizationName", "p1.UniversalOrganizationName_element", @@ -10304,19 +10304,19 @@ void proto_register_p1(void) { NULL, HFILL }}, { &hf_p1_teletex_surname, { "surname", "p1.surname", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_teletex_surname", HFILL }}, { &hf_p1_teletex_given_name, { "given-name", "p1.given_name", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_teletex_given_name", HFILL }}, { &hf_p1_teletex_initials, { "initials", "p1.initials", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_teletex_initials", HFILL }}, { &hf_p1_teletex_generation_qualifier, { "generation-qualifier", "p1.generation_qualifier", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_teletex_generation_qualifier", HFILL }}, { &hf_p1_universal_surname, { "surname", "p1.surname_element", @@ -10336,7 +10336,7 @@ void proto_register_p1(void) { "UniversalOrBMPString", HFILL }}, { &hf_p1_TeletexOrganizationalUnitNames_item, { "TeletexOrganizationalUnitName", "p1.TeletexOrganizationalUnitName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p1_UniversalOrganizationalUnitNames_item, { "UniversalOrganizationalUnitName", "p1.UniversalOrganizationalUnitName_element", @@ -10384,7 +10384,7 @@ void proto_register_p1(void) { "PrintableString_SIZE_1_ub_pds_parameter_length", HFILL }}, { &hf_p1_teletex_string, { "teletex-string", "p1.teletex_string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString_SIZE_1_ub_unformatted_address_length", HFILL }}, { &hf_p1_printable_string, { "printable-string", "p1.printable_string", @@ -10392,7 +10392,7 @@ void proto_register_p1(void) { "PrintableString_SIZE_1_ub_pds_parameter_length", HFILL }}, { &hf_p1_pds_teletex_string, { "teletex-string", "p1.teletex_string", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString_SIZE_1_ub_pds_parameter_length", HFILL }}, { &hf_p1_e163_4_address, { "e163-4-address", "p1.e163_4_address_element", @@ -10416,11 +10416,11 @@ void proto_register_p1(void) { NULL, HFILL }}, { &hf_p1_type, { "type", "p1.type", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p1_teletex_value, { "value", "p1.value", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "T_teletex_value", HFILL }}, { &hf_p1_UniversalDomainDefinedAttributes_item, { "UniversalDomainDefinedAttribute", "p1.UniversalDomainDefinedAttribute_element", @@ -10448,11 +10448,11 @@ void proto_register_p1(void) { "TeletexNonBasicParameters", HFILL }}, { &hf_p1_graphic_character_sets, { "graphic-character-sets", "p1.graphic_character_sets", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_p1_control_character_sets, { "control-character-sets", "p1.control_character_sets", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_p1_page_formats, { "page-formats", "p1.page_formats", @@ -10460,7 +10460,7 @@ void proto_register_p1(void) { "OCTET_STRING", HFILL }}, { &hf_p1_miscellaneous_terminal_capabilities, { "miscellaneous-terminal-capabilities", "p1.miscellaneous_terminal_capabilities", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_p1_private_use, { "private-use", "p1.private_use", diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 9dabd29c91..b139426c05 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -4745,7 +4745,7 @@ void proto_register_p22(void) { NULL, HFILL }}, { &hf_p22_SubjectField_PDU, { "SubjectField", "p22.SubjectField", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p22_ExpiryTimeField_PDU, { "ExpiryTimeField", "p22.ExpiryTimeField", @@ -4813,7 +4813,7 @@ void proto_register_p22(void) { NULL, HFILL }}, { &hf_p22_VideotexData_PDU, { "VideotexData", "p22.VideotexData", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_p22_EncryptedParameters_PDU, { "EncryptedParameters", "p22.EncryptedParameters_element", @@ -5089,7 +5089,7 @@ void proto_register_p22(void) { "RelatedIPMsField", HFILL }}, { &hf_p22_subject, { "subject", "p22.subject", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "SubjectField", HFILL }}, { &hf_p22_expiry_time, { "expiry-time", "p22.expiry_time", @@ -5149,7 +5149,7 @@ void proto_register_p22(void) { "ORName", HFILL }}, { &hf_p22_free_form_name, { "free-form-name", "p22.free_form_name", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "FreeFormName", HFILL }}, { &hf_p22_telephone_number, { "telephone-number", "p22.telephone_number", @@ -5309,7 +5309,7 @@ void proto_register_p22(void) { "TeletexNonBasicParameters", HFILL }}, { &hf_p22_TeletexData_item, { "TeletexData item", "p22.TeletexData_item", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_p22_videotex_parameters, { "parameters", "p22.parameters_element", @@ -5317,7 +5317,7 @@ void proto_register_p22(void) { "VideotexParameters", HFILL }}, { &hf_p22_videotex_data, { "data", "p22.videotex.data", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "VideotexData", HFILL }}, { &hf_p22_syntax, { "syntax", "p22.syntax", diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 114ea207e1..da74a829d6 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -980,11 +980,11 @@ void proto_register_pkix1explicit(void) { NULL, HFILL }}, { &hf_pkix1explicit_type_02, { "type", "pkix1explicit.type", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_pkix1explicit_value_01, { "value", "pkix1explicit.value", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "TeletexString", HFILL }}, { &hf_pkix1explicit_Features_item, { "Features item", "pkix1explicit.Features_item", diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 961f0ad0c6..d15deee8d7 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -659,7 +659,7 @@ proto_register_pktc(void) "Server Kerberos Principal Identifier", "pktc.server_principal", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_pktc_timestamp, { - "Timestamp", "pktc.timestamp", FT_STRING, STR_UNICODE, + "Timestamp", "pktc.timestamp", FT_STRING, BASE_NONE, NULL, 0, "Timestamp (UTC)", HFILL }}, { &hf_pktc_app_spec_data, { "Application Specific Data", "pktc.asd", FT_NONE, BASE_NONE, diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index cca1f8afdb..fd38a0c21b 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1196,7 +1196,7 @@ void proto_register_pnrp(void) { "Entry Length", "pnrp.segment.classifier.entryLength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_message_classifier_string, - { "Classifier", "pnrp.segment.classifier.string", FT_STRING, STR_UNICODE, NULL, 0x0, + { "Classifier", "pnrp.segment.classifier.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* Ack Flags */ { &hf_pnrp_message_ack_flags_reserved, diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 167b8054de..d342d97de6 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -743,12 +743,12 @@ void proto_register_pppoed(void) } }, { &hf_pppoed_tag_service_name, - { "Service-Name", "pppoed.tags.service_name", FT_STRING, STR_ASCII, + { "Service-Name", "pppoed.tags.service_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_pppoed_tag_ac_name, - { "AC-Name", "pppoed.tags.ac_name", FT_STRING, STR_ASCII, + { "AC-Name", "pppoed.tags.ac_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -783,12 +783,12 @@ void proto_register_pppoed(void) } }, { &hf_pppoed_tag_vspec_circuit_id, - { "Circuit ID", "pppoed.tags.circuit_id", FT_STRING, STR_ASCII, + { "Circuit ID", "pppoed.tags.circuit_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_pppoed_tag_vspec_remote_id, - { "Remote ID", "pppoed.tags.remote_id", FT_STRING, STR_ASCII, + { "Remote ID", "pppoed.tags.remote_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -978,17 +978,17 @@ void proto_register_pppoed(void) } }, { &hf_pppoed_tag_service_name_error, - { "Service-Name-Error", "pppoed.tags.service_name_error", FT_STRING, STR_ASCII, + { "Service-Name-Error", "pppoed.tags.service_name_error", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_pppoed_tag_ac_system_error, - { "AC-System-Error", "pppoed.tags.ac_system_error", FT_STRING, STR_ASCII, + { "AC-System-Error", "pppoed.tags.ac_system_error", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_pppoed_tag_generic_error, - { "Generic-Error", "pppoed.tags.generic_error", FT_STRING, STR_ASCII, + { "Generic-Error", "pppoed.tags.generic_error", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index 990e8bd528..e9600114ac 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -1042,7 +1042,7 @@ void proto_register_ptpip( void ) "GUID", "ptpip.guid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ptpIP_name, { - "Host Name", "ptpip.name", FT_STRINGZ, STR_UNICODE, + "Host Name", "ptpip.name", FT_STRINGZ, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ptpIP_version, { "Version", "ptpip.version", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 38d072b477..cf6ec1d5a1 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -205502,7 +205502,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_hNBName, { "hNBName", "rrc.hNBName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_rrc_nonCriticalExtensions_266, { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element", diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 28a24d7dc6..b52bd1a312 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -968,11 +968,11 @@ void proto_register_rtse(void) { NULL, HFILL }}, { &hf_rtse_additionalReferenceInformation, { "additionalReferenceInformation", "rtse.additionalReferenceInformation", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_rtse_t61String, { "t61String", "rtse.t61String", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_rtse_octetString, { "octetString", "rtse.octetString", diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index c6bac26466..9526a9177c 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -18436,7 +18436,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, { &hf_s1ap_WarningMessageContents_decoded_page, { "Decoded Page", "s1ap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_s1ap_measurementsToActivate_M1, { "M1", "s1ap.measurementsToActivate.M1", @@ -18903,7 +18903,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, { &hf_s1ap_LHN_ID_PDU, { "LHN-ID", "s1ap.LHN_ID", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_s1ap_LoggedMBSFNMDT_PDU, { "LoggedMBSFNMDT", "s1ap.LoggedMBSFNMDT_element", @@ -20199,7 +20199,7 @@ void proto_register_s1ap(void) { "T_bt_rssi", HFILL }}, { &hf_s1ap_BluetoothMeasConfigNameList_item, { "BluetoothName", "s1ap.BluetoothName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_s1ap_BPLMNs_item, { "PLMNidentity", "s1ap.PLMNidentity", @@ -21603,7 +21603,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, { &hf_s1ap_WLANMeasConfigNameList_item, { "WLANName", "s1ap.WLANName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_s1ap_pagingProbabilityInformation, { "pagingProbabilityInformation", "s1ap.pagingProbabilityInformation", diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 471ad777ab..e457d2c121 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -1865,7 +1865,7 @@ void proto_register_sabp(void) { NULL, HFILL }}, { &hf_sabp_cbs_page_content, { "CBS Page Content", "sabp.cb_page_content", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_sabp_cb_inf_len, { "CBS-Message-Information-Length", "sabp.cb_inf_len", diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index f54081dff9..ccab05f663 100644 --- a/epan/dissectors/packet-sametime.c +++ b/epan/dissectors/packet-sametime.c @@ -738,7 +738,7 @@ proto_register_sametime(void) }, { &hf_sametime_field_text, { "text", "sametime.field_text", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -824,43 +824,43 @@ proto_register_sametime(void) /*type location*/ { &hf_sametime_location_name, { "name", "sametime.location.name", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_city, { "city", "sametime.location.city", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_province, { "province", "sametime.location.province", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_postalcode, { "postal code", "sametime.location.postalcode", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_country, { "country", "sametime.location.country", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_phone, { "phone", "sametime.location.phone", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sametime_location_timezone, { "time zone", "sametime.location.timezone", - FT_STRING, STR_ASCII, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 984f344531..572659d9b9 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -2944,7 +2944,7 @@ void proto_register_sbc_ap(void) { NULL, HFILL }}, { &hf_sbc_ap_Warning_Message_Contents_decoded_page, { "Decoded Page", "sbc-ap.WarningMessageContents.decoded_page", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, /*--- Included file: packet-sbc-ap-hfarr.c ---*/ diff --git a/epan/dissectors/packet-shicp.c b/epan/dissectors/packet-shicp.c index 61070d124a..535130fed8 100644 --- a/epan/dissectors/packet-shicp.c +++ b/epan/dissectors/packet-shicp.c @@ -468,7 +468,7 @@ proto_register_shicp(void) }, { &hf_shicp_error_string, { "Error", "shicp.error.string", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -480,19 +480,19 @@ proto_register_shicp(void) }, { &hf_shicp_module_version, { "Module version", "shicp.moduleversion", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_shicp_module_desc, { "Module description", "shicp.moduledesc", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_shicp_supported_msg, { "Supported messages", "shicp.supportedmsg", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -534,7 +534,7 @@ proto_register_shicp(void) }, { &hf_shicp_hn, { "Hostname", "shicp.hn", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -570,7 +570,7 @@ proto_register_shicp(void) }, { &hf_shicp_pswd, { "Password", "shicp.pswd", - FT_STRINGZ, STR_ASCII, + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 50e8b1169c..6cb64e6c91 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -18699,11 +18699,11 @@ proto_register_smb(void) VALS(buffer_format_vals), 0x0, "Buffer Format, type of buffer", HFILL }}, { &hf_smb_dialect, - { "Dialect", "smb.dialect", FT_STRING, STR_UNICODE, + { "Dialect", "smb.dialect", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_smb_dialect_name, - { "Name", "smb.dialect.name", FT_STRING, STR_UNICODE, + { "Name", "smb.dialect.name", FT_STRING, BASE_NONE, NULL, 0, "Name of dialect", HFILL }}, { &hf_smb_dialect_index, @@ -18739,11 +18739,11 @@ proto_register_smb(void) NULL, 0, "Challenge Data (for LM2.1 dialect)", HFILL }}, { &hf_smb_primary_domain, - { "Primary Domain", "smb.primary_domain", FT_STRING, STR_UNICODE, + { "Primary Domain", "smb.primary_domain", FT_STRING, BASE_NONE, NULL, 0, "The server's primary domain", HFILL }}, { &hf_smb_server, - { "Server", "smb.server", FT_STRING, STR_UNICODE, + { "Server", "smb.server", FT_STRING, BASE_NONE, NULL, 0, "The name of the DC/server", HFILL }}, { &hf_smb_max_raw_buf_size, @@ -18913,7 +18913,7 @@ proto_register_smb(void) NULL, 0, "Unknown Data. Should be implemented by someone", HFILL }}, { &hf_smb_dir_name, - { "Directory", "smb.dir_name", FT_STRING, STR_UNICODE, + { "Directory", "smb.dir_name", FT_STRING, BASE_NONE, NULL, 0, "SMB Directory Name", HFILL }}, { &hf_smb_echo_count, @@ -18933,11 +18933,11 @@ proto_register_smb(void) NULL, 0, "Max client buffer size", HFILL }}, { &hf_smb_path, - { "Path", "smb.path", FT_STRING, STR_UNICODE, + { "Path", "smb.path", FT_STRING, BASE_NONE, NULL, 0, "Path. Server name and share name", HFILL }}, { &hf_smb_service, - { "Service", "smb.service", FT_STRING, STR_UNICODE, + { "Service", "smb.service", FT_STRING, BASE_NONE, NULL, 0, "Service name", HFILL }}, { &hf_smb_password, @@ -19017,7 +19017,7 @@ proto_register_smb(void) NULL, 0, "Count number of items/bytes, High 16 bits", HFILL }}, { &hf_smb_file_name, - { "File Name", "smb.file", FT_STRING, STR_UNICODE, + { "File Name", "smb.file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_smb_open_function, @@ -19275,7 +19275,7 @@ proto_register_smb(void) NULL, 0, "Last Write Time, SMB_TIME format", HFILL }}, { &hf_smb_old_file_name, - { "Old File Name", "smb.old_file", FT_STRING, STR_UNICODE, + { "Old File Name", "smb.old_file", FT_STRING, BASE_NONE, NULL, 0, "Old File Name (When renaming a file)", HFILL }}, { &hf_smb_offset, @@ -19573,15 +19573,15 @@ proto_register_smb(void) NULL, 0, "Length of Unicode password", HFILL }}, { &hf_smb_account, - { "Account", "smb.account", FT_STRING, STR_UNICODE, + { "Account", "smb.account", FT_STRING, BASE_NONE, NULL, 0, "Account, username", HFILL }}, { &hf_smb_os, - { "Native OS", "smb.native_os", FT_STRING, STR_UNICODE, + { "Native OS", "smb.native_os", FT_STRING, BASE_NONE, NULL, 0, "Which OS we are running", HFILL }}, { &hf_smb_lanman, - { "Native LAN Manager", "smb.native_lanman", FT_STRING, STR_UNICODE, + { "Native LAN Manager", "smb.native_lanman", FT_STRING, BASE_NONE, NULL, 0, "Which LANMAN protocol we are running", HFILL }}, { &hf_smb_setup_action, @@ -19593,7 +19593,7 @@ proto_register_smb(void) TFS(&tfs_setup_action_guest), 0x0001, "Client logged in as GUEST?", HFILL }}, { &hf_smb_fs, - { "Native File System", "smb.native_fs", FT_STRING, STR_UNICODE, + { "Native File System", "smb.native_fs", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_smb_connect_flags, @@ -19814,7 +19814,7 @@ proto_register_smb(void) NULL, 0, NULL, HFILL }}, { &hf_smb_ea_name, - { "EA Name", "smb.ea.name", FT_STRING, STR_UNICODE, + { "EA Name", "smb.ea.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_smb_ea_data, @@ -20178,7 +20178,7 @@ proto_register_smb(void) NULL, 0, "Length of target file name", HFILL }}, { &hf_smb_target_name, - { "Target name", "smb.target_name", FT_STRING, STR_UNICODE, + { "Target name", "smb.target_name", FT_STRING, BASE_NONE, NULL, 0, "Target file name", HFILL }}, { &hf_smb_device_type, @@ -20206,7 +20206,7 @@ proto_register_smb(void) VALS(print_mode_vals), 0, "Text or Graphics mode", HFILL }}, { &hf_smb_print_identifier, - { "Identifier", "smb.print.identifier", FT_STRING, STR_UNICODE, + { "Identifier", "smb.print.identifier", FT_STRING, BASE_NONE, NULL, 0, "Identifier string for this print job", HFILL }}, { &hf_smb_restart_index, @@ -20238,7 +20238,7 @@ proto_register_smb(void) NULL, 0, "Number of bytes in spool file", HFILL }}, { &hf_smb_print_spool_file_name, - { "Name", "smb.print.spool.name", FT_STRINGZ, STR_UNICODE, + { "Name", "smb.print.spool.name", FT_STRINGZ, BASE_NONE, NULL, 0, "Name of client that submitted this job", HFILL }}, { &hf_smb_start_index, @@ -20246,11 +20246,11 @@ proto_register_smb(void) NULL, 0, "First queue entry to return", HFILL }}, { &hf_smb_originator_name, - { "Originator Name", "smb.originator_name", FT_STRINGZ, STR_UNICODE, + { "Originator Name", "smb.originator_name", FT_STRINGZ, BASE_NONE, NULL, 0, "Name of sender of message", HFILL }}, { &hf_smb_destination_name, - { "Destination Name", "smb.destination_name", FT_STRINGZ, STR_UNICODE, + { "Destination Name", "smb.destination_name", FT_STRINGZ, BASE_NONE, NULL, 0, "Name of recipient of message", HFILL }}, { &hf_smb_message_len, @@ -20258,7 +20258,7 @@ proto_register_smb(void) NULL, 0, "Length of message", HFILL }}, { &hf_smb_message, - { "Message", "smb.message", FT_STRING, STR_UNICODE, + { "Message", "smb.message", FT_STRING, BASE_NONE, NULL, 0, "Message text", HFILL }}, { &hf_smb_mgid, @@ -20266,11 +20266,11 @@ proto_register_smb(void) NULL, 0, "Message group ID for multi-block messages", HFILL }}, { &hf_smb_forwarded_name, - { "Forwarded Name", "smb.forwarded_name", FT_STRINGZ, STR_UNICODE, + { "Forwarded Name", "smb.forwarded_name", FT_STRINGZ, BASE_NONE, NULL, 0, "Recipient name being forwarded", HFILL }}, { &hf_smb_machine_name, - { "Machine Name", "smb.machine_name", FT_STRINGZ, STR_UNICODE, + { "Machine Name", "smb.machine_name", FT_STRINGZ, BASE_NONE, NULL, 0, "Name of target machine", HFILL }}, { &hf_smb_cancel_to, @@ -20278,7 +20278,7 @@ proto_register_smb(void) NULL, 0, "This packet is a cancellation of the packet in this frame", HFILL }}, { &hf_smb_trans_name, - { "Transaction Name", "smb.trans_name", FT_STRING, STR_UNICODE, + { "Transaction Name", "smb.trans_name", FT_STRING, BASE_NONE, NULL, 0, "Name of transaction", HFILL }}, { &hf_smb_transaction_flags, @@ -20298,7 +20298,7 @@ proto_register_smb(void) NULL, 0, "Maximum number of search entries to return", HFILL }}, { &hf_smb_search_pattern, - { "Search Pattern", "smb.search_pattern", FT_STRING, STR_UNICODE, + { "Search Pattern", "smb.search_pattern", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_smb_ff2, @@ -20414,7 +20414,7 @@ proto_register_smb(void) NULL, 0, "Size of the stream in number of bytes", HFILL }}, { &hf_smb_t2_stream_name, - { "Stream Name", "smb.stream_name", FT_STRING, STR_UNICODE, + { "Stream Name", "smb.stream_name", FT_STRING, BASE_NONE, NULL, 0, "Name of the stream", HFILL }}, { &hf_smb_t2_compressed_file_size, @@ -20490,7 +20490,7 @@ proto_register_smb(void) NULL, 0, "Offset of name of entity to visit next", HFILL }}, { &hf_smb_dfs_referral_node, - { "Node", "smb.dfs.referral.node", FT_STRING, STR_UNICODE, + { "Node", "smb.dfs.referral.node", FT_STRING, BASE_NONE, NULL, 0, "Name of entity to visit next", HFILL }}, { &hf_smb_dfs_referral_proximity, @@ -20506,7 +20506,7 @@ proto_register_smb(void) NULL, 0, "Offset of Dfs Path that matched pathconsumed", HFILL }}, { &hf_smb_dfs_referral_path, - { "Path", "smb.dfs.referral.path", FT_STRING, STR_UNICODE, + { "Path", "smb.dfs.referral.path", FT_STRING, BASE_NONE, NULL, 0, "Dfs Path that matched pathconsumed", HFILL }}, { &hf_smb_dfs_referral_alt_path_offset, @@ -20514,7 +20514,7 @@ proto_register_smb(void) NULL, 0, "Offset of alternative(8.3) Path that matched pathconsumed", HFILL }}, { &hf_smb_dfs_referral_alt_path, - { "Alt Path", "smb.dfs.referral.alt_path", FT_STRING, STR_UNICODE, + { "Alt Path", "smb.dfs.referral.alt_path", FT_STRING, BASE_NONE, NULL, 0, "Alternative(8.3) Path that matched pathconsumed", HFILL }}, { &hf_smb_dfs_referral_domain_offset, @@ -20530,11 +20530,11 @@ proto_register_smb(void) NULL, 0, "Offset of Dfs Path that matched pathconsumed", HFILL }}, { &hf_smb_dfs_referral_domain_name, - { "Domain Name", "smb.dfs.referral.domain_name", FT_STRING, STR_UNICODE, + { "Domain Name", "smb.dfs.referral.domain_name", FT_STRING, BASE_NONE, NULL, 0, "Dfs referral domain name", HFILL }}, { &hf_smb_dfs_referral_expname, - { "Expanded Name", "smb.dfs.referral.expname", FT_STRING, STR_UNICODE, + { "Expanded Name", "smb.dfs.referral.expname", FT_STRING, BASE_NONE, NULL, 0, "Dfs expanded name", HFILL }}, { &hf_smb_dfs_referral_server_guid, @@ -20566,7 +20566,7 @@ proto_register_smb(void) NULL, 0, NULL, HFILL }}, { &hf_smb_short_file_name, - { "Short File Name", "smb.short_file", FT_STRING, STR_UNICODE, + { "Short File Name", "smb.short_file", FT_STRING, BASE_NONE, NULL, 0, "Short (8.3) File Name", HFILL }}, { &hf_smb_short_file_name_len, @@ -20602,7 +20602,7 @@ proto_register_smb(void) NULL, 0, "Length of volume label", HFILL }}, { &hf_smb_volume_label, - { "Label", "smb.volume.label", FT_STRING, STR_UNICODE, + { "Label", "smb.volume.label", FT_STRING, BASE_NONE, NULL, 0, "Volume label", HFILL }}, { &hf_smb_free_alloc_units64, @@ -20638,7 +20638,7 @@ proto_register_smb(void) NULL, 0, "Length of filesystem name in bytes", HFILL }}, { &hf_smb_fs_name, - { "FS Name", "smb.fs_name", FT_STRING, STR_UNICODE, + { "FS Name", "smb.fs_name", FT_STRING, BASE_NONE, NULL, 0, "Name of filesystem", HFILL }}, { &hf_smb_device_char, @@ -21099,7 +21099,7 @@ proto_register_smb(void) { &hf_smb_unix_file_name, { "File name", "smb.unix.file.name", FT_STRING, - STR_UNICODE, NULL, 0, NULL, HFILL }}, + BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_smb_unix_find_file_nextoffset, { "Next entry offset", "smb.unix.find_file.next_offset", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index d1cd8a5bc3..1122a4cbc8 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -11397,12 +11397,12 @@ proto_register_smb2(void) }, { &hf_smb2_tree, - { "Tree", "smb2.tree", FT_STRING, STR_UNICODE, + { "Tree", "smb2.tree", FT_STRING, BASE_NONE, NULL, 0, "Name of the Tree/Share", HFILL } }, { &hf_smb2_filename, - { "Filename", "smb2.filename", FT_STRING, STR_UNICODE, + { "Filename", "smb2.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -11431,7 +11431,7 @@ proto_register_smb2(void) }, { &hf_smb2_find_pattern, - { "Search Pattern", "smb2.find.pattern", FT_STRING, STR_UNICODE, + { "Search Pattern", "smb2.find.pattern", FT_STRING, BASE_NONE, NULL, 0, "Find pattern", HFILL } }, @@ -12113,7 +12113,7 @@ proto_register_smb2(void) { &hf_smb2_netname_neg_id, { "Netname", "smb2.negotiate_context.netname", FT_STRING, - STR_UNICODE, NULL, 0x0, NULL, HFILL } + BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_smb2_transport_ctx_flags, @@ -12222,7 +12222,7 @@ proto_register_smb2(void) }, { &hf_smb2_ea_name, - { "EA Name", "smb2.ea.name", FT_STRING, STR_UNICODE, + { "EA Name", "smb2.ea.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -12262,7 +12262,7 @@ proto_register_smb2(void) }, { &hf_smb2_fsctl_pipe_wait_name, - { "Name", "smb2.fsctl.wait.name", FT_STRING, STR_UNICODE, + { "Name", "smb2.fsctl.wait.name", FT_STRING, BASE_NONE, NULL, 0, "Pipe name", HFILL } }, @@ -12407,12 +12407,12 @@ proto_register_smb2(void) }, { &hf_smb2_ioctl_sqos_initiator_name, - { "InitiatorName", "smb2.ioctl.sqos.initiator_name", FT_STRING, STR_UNICODE, + { "InitiatorName", "smb2.ioctl.sqos.initiator_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_smb2_ioctl_sqos_initiator_node_name, - { "InitiatorNodeName", "smb2.ioctl.sqos.initiator_node_name", FT_STRING, STR_UNICODE, + { "InitiatorNodeName", "smb2.ioctl.sqos.initiator_node_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -12563,7 +12563,7 @@ proto_register_smb2(void) }, { &hf_smb2_ioctl_enumerate_snapshots_snapshot, - { "Snapshot", "smb2.ioctl.enumerate_snapshots.snapshot", FT_STRINGZ, STR_UNICODE, + { "Snapshot", "smb2.ioctl.enumerate_snapshots.snapshot", FT_STRINGZ, BASE_NONE, NULL, 0, "Time stamp of previous version", HFILL } }, @@ -12683,22 +12683,22 @@ proto_register_smb2(void) }, { &hf_smb2_tag, - { "Tag", "smb2.tag", FT_STRING, STR_UNICODE, + { "Tag", "smb2.tag", FT_STRING, BASE_NONE, NULL, 0, "Tag of chain entry", HFILL } }, { &hf_smb2_acct_name, - { "Account", "smb2.acct", FT_STRING, STR_UNICODE, + { "Account", "smb2.acct", FT_STRING, BASE_NONE, NULL, 0, "Account Name", HFILL } }, { &hf_smb2_domain_name, - { "Domain", "smb2.domain", FT_STRING, STR_UNICODE, + { "Domain", "smb2.domain", FT_STRING, BASE_NONE, NULL, 0, "Domain Name", HFILL } }, { &hf_smb2_host_name, - { "Host", "smb2.host", FT_STRING, STR_UNICODE, + { "Host", "smb2.host", FT_STRING, BASE_NONE, NULL, 0, "Host Name", HFILL } }, @@ -13068,7 +13068,7 @@ proto_register_smb2(void) }, { &hf_smb2_short_name, - { "Short Name", "smb2.shortname", FT_STRING, STR_UNICODE, + { "Short Name", "smb2.shortname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -13183,7 +13183,7 @@ proto_register_smb2(void) }, { &hf_smb2_error_redir_res_name, - { "Resource Name", "smb2.error.share_redirect.res_name", FT_STRING, STR_UNICODE, + { "Resource Name", "smb2.error.share_redirect.res_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -13288,7 +13288,7 @@ proto_register_smb2(void) }, { &hf_smb2_svhdx_open_device_context_initiator_host_name, - { "HostName", "smb2.svhdx_open_device_context.host_name", FT_STRING, STR_UNICODE, + { "HostName", "smb2.svhdx_open_device_context.host_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -13423,12 +13423,12 @@ proto_register_smb2(void) }, { &hf_smb2_aapl_server_query_model_string, - { "Model string", "smb2.aapl.model_string", FT_UINT_STRING, STR_UNICODE, + { "Model string", "smb2.aapl.model_string", FT_UINT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_smb2_aapl_server_query_server_path, - { "Server path", "smb2.aapl.server_path", FT_UINT_STRING, STR_UNICODE, + { "Server path", "smb2.aapl.server_path", FT_UINT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -13650,7 +13650,7 @@ proto_register_smb2(void) }, { &hf_smb2_nfs_symlink_target, { "Symlink Target", "smb2.nfs.symlink.target", FT_STRING, - STR_UNICODE, NULL, 0x0, NULL, HFILL } + BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_smb2_nfs_chr_major, { "Major", "smb2.nfs.char.major", FT_UINT32, @@ -13685,11 +13685,11 @@ proto_register_smb2(void) NULL, 0x0, NULL, HFILL } }, { &hf_smb2_symlink_substitute_name, - { "Substitute Name", "smb2.symlink.substitute_name", FT_STRING, STR_UNICODE, + { "Substitute Name", "smb2.symlink.substitute_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_smb2_symlink_print_name, - { "Print Name", "smb2.symlink.print_name", FT_STRING, STR_UNICODE, + { "Print Name", "smb2.symlink.print_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_smb2_symlink_flags, diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index c07424c23f..19da36072e 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2978,7 +2978,7 @@ proto_register_smpp(void) }, { &hf_smpp_short_message, { "Message", "smpp.message_text", - FT_STRING, STR_UNICODE, NULL, 0x00, + FT_STRING, BASE_NONE, NULL, 0x00, "The actual message or data.", HFILL } diff --git a/epan/dissectors/packet-steam-ihs-discovery.c b/epan/dissectors/packet-steam-ihs-discovery.c index c75c156bc4..50744340f9 100644 --- a/epan/dissectors/packet-steam-ihs-discovery.c +++ b/epan/dissectors/packet-steam-ihs-discovery.c @@ -1194,7 +1194,7 @@ proto_register_steam_ihs_discovery(void) }, { &hf_steam_ihs_discovery_body_status_hostname, { "Hostname", "steam_ihs_discovery.body_status_hostname", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_steam_ihs_discovery_body_status_enabledservices, @@ -1234,7 +1234,7 @@ proto_register_steam_ihs_discovery(void) }, { &hf_steam_ihs_discovery_body_status_macaddresses, { "MAC Addresses", "steam_ihs_discovery.body_status_macaddresses", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, /* CMsgRemoteClientBroadcastStatus.User */ @@ -1256,7 +1256,7 @@ proto_register_steam_ihs_discovery(void) }, { &hf_steam_ihs_discovery_body_authrequest_devicename, { "Device Name", "steam_ihs_discovery.body_authrequest_devicename", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_steam_ihs_discovery_body_authrequest_encryptedrequest, @@ -1293,7 +1293,7 @@ proto_register_steam_ihs_discovery(void) }, { &hf_steam_ihs_discovery_body_streamingrequest_deviceversion, { "Device Version", "steam_ihs_discovery.body_streamingrequest_deviceversion", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_steam_ihs_discovery_body_streamingrequest_streamdesktop, diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 5a424e3eeb..d27e5c78bd 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -393,7 +393,7 @@ void proto_register_syslog(void) }, { &hf_syslog_msgid_utf8, { "Syslog message id", "syslog.msgid", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-systemd-journal.c b/epan/dissectors/packet-systemd-journal.c index 3d4938887c..4b954d11a7 100644 --- a/epan/dissectors/packet-systemd-journal.c +++ b/epan/dissectors/packet-systemd-journal.c @@ -437,11 +437,11 @@ proto_register_systemd_journal(void) static hf_register_info hf[] = { { &hf_sj_message, { "Message", "systemd_journal.message", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_message_id, { "Message ID", "systemd_journal.message_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_priority, { "Priority", "systemd_journal.priority", @@ -449,7 +449,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_code_file, { "Code file", "systemd_journal.code_file", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_code_line, { "Code line", "systemd_journal.code_line", @@ -457,7 +457,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_code_func, { "Code func", "systemd_journal.code_func", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_errno, { "Errno", "systemd_journal.errno", @@ -469,7 +469,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_syslog_identifier, { "Syslog identifier", "systemd_journal.syslog_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_syslog_pid, { "Syslog PID", "systemd_journal.syslog_pid", @@ -490,19 +490,19 @@ proto_register_systemd_journal(void) }, { &hf_sj_comm, { "Command name", "systemd_journal.comm", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_exe, { "Executable path", "systemd_journal.exe", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_cmdline, { "Command line", "systemd_journal.cmdline", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_cap_effective, { "Effective capability", "systemd_journal.cap_effective", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_audit_session, { "Audit session", "systemd_journal.audit_session", @@ -515,19 +515,19 @@ proto_register_systemd_journal(void) { &hf_sj_systemd_cgroup, { "Systemd cgroup", "systemd_journal.systemd_cgroup", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_slice, { "Systemd slice", "systemd_journal.systemd_slice", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_unit, { "Systemd unit", "systemd_journal.systemd_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_user_unit, { "Systemd user unit", "systemd_journal.systemd_user_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_session, { "Systemd session", "systemd_journal.systemd_session", @@ -540,7 +540,7 @@ proto_register_systemd_journal(void) { &hf_sj_selinux_context, { "SELinux context", "systemd_journal.selinux_context", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_source_realtime_timestamp, { "Source realtime timestamp", "systemd_journal.source_realtime_timestamp", @@ -548,61 +548,61 @@ proto_register_systemd_journal(void) }, { &hf_sj_boot_id, { "Boot ID", "systemd_journal.boot_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_machine_id, { "Machine ID", "systemd_journal.machine_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_invocation_id, { "Systemd invocation ID", "systemd_journal.systemd_invocation_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_hostname, { "Hostname", "systemd_journal.hostname", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_transport, { "Transport", "systemd_journal.transport", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_stream_id, { "Stream ID", "systemd_journal.stream_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_line_break, { "Line break", "systemd_journal.line_break", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_kernel_device, { "Kernel device", "systemd_journal.kernel_device", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_kernel_subsystem, { "Kernel subsystem", "systemd_journal.kernel_subsystem", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_udev_sysname, { "Device tree name", "systemd_journal.udev_sysname", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_udev_devnode, { "Device tree node", "systemd_journal.udev_devnode", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_udev_devlink, { "Device tree symlink", "systemd_journal.udev_devlink", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_coredump_unit, { "Coredump unit", "systemd_journal.coredump_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_coredump_user_unit, { "Coredump user unit", "systemd_journal.coredump_user_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_pid, { "Object PID", "systemd_journal.object_pid", @@ -618,15 +618,15 @@ proto_register_systemd_journal(void) }, { &hf_sj_object_comm, { "Object command name", "systemd_journal.object_comm", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_exe, { "Object executable path", "systemd_journal.object_exe", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_cmdline, { "Object command line", "systemd_journal.object_cmdline", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_audit_session, { "Object audit session", "systemd_journal.object_audit_session", @@ -642,11 +642,11 @@ proto_register_systemd_journal(void) }, { &hf_sj_object_selinux_context, { "Object SELinux context", "systemd_journal.object_selinux_context", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_cgroup, { "Object systemd cgroup", "systemd_journal.object_systemd_cgroup", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_session, { "Object systemd session", "systemd_journal.object_systemd_session", @@ -658,28 +658,28 @@ proto_register_systemd_journal(void) }, { &hf_sj_object_systemd_unit, { "Object systemd unit", "systemd_journal.object_systemd_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_user_unit, { "Object systemd user unit", "systemd_journal.object_systemd_user_unit", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_slice, { "Object systemd slice", "systemd_journal.object_systemd_slice", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_user_slice, { "Object systemd user slice", "systemd_journal.object_systemd_user_slice", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_object_systemd_invocation_id, { "Object systemd invocation ID", "systemd_journal.object_systemd_invocation_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_cursor, { "Cursor", "systemd_journal.cursor", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_realtime_timestamp, { "Realtime Timestamp", "systemd_journal.realtime_timestamp", @@ -692,11 +692,11 @@ proto_register_systemd_journal(void) { &hf_sj_journal_name, { "Journal name", "systemd_journal.journal_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_journal_path, { "Journal path", "systemd_journal.journal_path", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_current_use, { "Current use", "systemd_journal.current_use", @@ -704,7 +704,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_current_use_pretty, { "Human readable current use", "systemd_journal.current_use_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_max_use, { "Max use", "systemd_journal.max_use", @@ -712,7 +712,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_max_use_pretty, { "Human readable max use", "systemd_journal.max_use_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_disk_keep_free, { "Disk keep free", "systemd_journal.disk_keep_free", @@ -720,7 +720,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_disk_keep_free_pretty, { "Human readable disk keep free", "systemd_journal.disk_keep_free_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_disk_available, { "Disk available", "systemd_journal.disk_available", @@ -728,7 +728,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_disk_available_pretty, { "Human readable disk available", "systemd_journal.disk_available_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_limit, { "Limit", "systemd_journal.limit", @@ -736,7 +736,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_limit_pretty, { "Human readable limit", "systemd_journal.limit_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_available, { "Available", "systemd_journal.available", @@ -744,11 +744,11 @@ proto_register_systemd_journal(void) }, { &hf_sj_available_pretty, { "Human readable available", "systemd_journal.available_pretty", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_result, { "Result", "systemd_journal.result", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_source_monotonic_timestamp, { "Source monotonic timestamp", "systemd_journal.source_monotonic_timestamp", @@ -764,23 +764,23 @@ proto_register_systemd_journal(void) }, { &hf_sj_audit_field_apparmor, { "Audit field AppArmor", "systemd_journal.audit_field_apparmor", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_audit_field_operation, { "Audit field operation", "systemd_journal.audit_field_operation", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_audit_field_profile, { "Audit field profile", "systemd_journal.audit_field_profile", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_audit_field_name, { "Audit field name", "systemd_journal.audit_field_name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_seat_id, { "Seat ID", "systemd_journal.seat_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_kernel_usec, { "Kernel microseconds", "systemd_journal.kernel_usec", @@ -796,7 +796,7 @@ proto_register_systemd_journal(void) }, { &hf_sj_user_id, { "User ID", "systemd_journal.user_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_leader, { "Leader", "systemd_journal.leader", @@ -804,19 +804,19 @@ proto_register_systemd_journal(void) }, { &hf_sj_job_type, { "Job type", "systemd_journal.job_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_job_result, { "Job result", "systemd_journal.job_result", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_user_invocation_id, { "User invocation ID", "systemd_journal.user_invocation_id", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_systemd_user_slice, { "Systemd user slice", "systemd_journal.systemd_user_slice", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_binary_data_len, @@ -829,19 +829,19 @@ proto_register_systemd_journal(void) }, { &hf_sj_unknown_field_name, { "Field name", "systemd_journal.field.name", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_unknown_field_value, { "Field value", "systemd_journal.field.value", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_unknown_field_data, { "Field data", "systemd_journal.field.data", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sj_unhandled_field_type, { "Field data", "systemd_journal.unhandled_field_type", - FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index c58aa566dc..8fc7238781 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -7558,7 +7558,7 @@ proto_register_tcp(void) NULL, HFILL }}, { &hf_tcp_flags_str, - { "TCP Flags", "tcp.flags.str", FT_STRING, STR_UNICODE, NULL, 0x0, + { "TCP Flags", "tcp.flags.str", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tcp_window_size_value, diff --git a/epan/dissectors/packet-tcpcl.c b/epan/dissectors/packet-tcpcl.c index c05d7821a9..a25efc2097 100644 --- a/epan/dissectors/packet-tcpcl.c +++ b/epan/dissectors/packet-tcpcl.c @@ -368,7 +368,7 @@ static hf_register_info hf_tcpcl[] = { {&hf_tcpclv4_sess_init_seg_mru, {"Segment MRU", "tcpcl.v4.sess_init.seg_mru", FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, {&hf_tcpclv4_sess_init_xfer_mru, {"Transfer MRU", "tcpcl.v4.sess_init.xfer_mru", FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, {&hf_tcpclv4_sess_init_nodeid_len, {"Node ID Length", "tcpcl.v4.sess_init.nodeid_len", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, - {&hf_tcpclv4_sess_init_nodeid_data, {"Node ID Data (UTF8)", "tcpcl.v4.sess_init.nodeid_data", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL}}, + {&hf_tcpclv4_sess_init_nodeid_data, {"Node ID Data (UTF8)", "tcpcl.v4.sess_init.nodeid_data", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_tcpclv4_sess_init_extlist_len, {"Extension Items Length", "tcpcl.v4.sess_init.extlist_len", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, {&hf_tcpclv4_sess_init_related, {"Related SESS_INIT", "tcpcl.v4.sess_init.related", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL}}, // Session negotiation results @@ -410,7 +410,7 @@ static hf_register_info hf_tcpcl[] = { // Specific extensions {&hf_tcpclv4_xferext_transferlen_total_len, {"Total Length", "tcpcl.v4.xferext.transfer_length.total_len", FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_octet_octets, 0x0, NULL, HFILL}}, // PKIX other name form - {&hf_othername_bundleeid, {"BundleEID", "tcpcl.v4.BundleEID", FT_STRING, STR_ASCII, NULL, 0x0, NULL, HFILL}}, + {&hf_othername_bundleeid, {"BundleEID", "tcpcl.v4.BundleEID", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_xfer_fragments, {"Transfer fragments", "tcpcl.xfer.fragments", diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index ea3a679369..235fefee78 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -8093,7 +8093,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_colname, { "Column Name", "tds.colmetadata.colname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_table_name_parts, @@ -8103,7 +8103,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_table_name, { "Table name", "tds.colmetadata.table_name", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_table_name_length, @@ -8188,7 +8188,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_dbname, { "Database name length", "tds.colmetadata.dbname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_schemaname_length, @@ -8198,7 +8198,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_schemaname, { "Schema name", "tds.colmetadata.schemaname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_typename_length, @@ -8208,7 +8208,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_typename, { "Type name", "tds.colmetadata.typename", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_assemblyqualifiedname_length, @@ -8218,7 +8218,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_assemblyqualifiedname, { "Assembly qualified name", "tds.colmetadata.assemblyqualifiedname", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_owningschema_length, @@ -8228,7 +8228,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_owningschema, { "Owning schema name", "tds.colmetadata.owningschema", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_tds_colmetadata_xmlschemacollection_length, @@ -8238,7 +8238,7 @@ proto_register_tds(void) }, { &hf_tds_colmetadata_xmlschemacollection, { "XML schema collection", "tds.colmetadata.xmlschemacollection", - FT_STRING, STR_UNICODE, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index e93485711d..27272b822d 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -638,15 +638,15 @@ proto_register_tzsp(void) NULL, 0, "Sensor MAC", HFILL }}, { &hf_device_name, { - "Device Name", "tzsp.device_name", FT_STRING, STR_ASCII, + "Device Name", "tzsp.device_name", FT_STRING, BASE_NONE, NULL, 0, "DeviceName", HFILL }}, { &hf_capture_location, { - "Capture Location", "tzsp.capture_location", FT_STRING, STR_ASCII, + "Capture Location", "tzsp.capture_location", FT_STRING, BASE_NONE, NULL, 0, "CaptureLocation", HFILL }}, { &hf_capture_info, { - "Capture Information", "tzsp.device_info", FT_STRING, STR_ASCII, + "Capture Information", "tzsp.device_info", FT_STRING, BASE_NONE, NULL, 0, "CaptureInformation", HFILL }}, { &hf_capture_id, { diff --git a/epan/dissectors/packet-ubdp.c b/epan/dissectors/packet-ubdp.c index f41632a800..2da94a4736 100644 --- a/epan/dissectors/packet-ubdp.c +++ b/epan/dissectors/packet-ubdp.c @@ -271,18 +271,18 @@ proto_register_ubdp(void) { &hf_ubdp_len, {"Length","ubdp.len",FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_mac, {"MAC","ubdp.mac",FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_ip, {"IP","ubdp.ip",FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_firmware_full, {"Firmware Path","ubdp.firmware_full",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_username, {"Username", "ubdp.username", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_firmware_full, {"Firmware Path","ubdp.firmware_full",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_username, {"Username", "ubdp.username", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_uptime, {"Uptime","ubdp.uptime",FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_hostname, {"Hostname","ubdp.hostname",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_product, {"Product","ubdp.product",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_ssid, {"SSID","ubdp.ssid",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_hostname, {"Hostname","ubdp.hostname",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_product, {"Product","ubdp.product",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_ssid, {"SSID","ubdp.ssid",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_wlan_mode, {"Wireless Mode","ubdp.wlan_mode",FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_seq_num, {"Counter","ubdp.seq_num",FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_model, {"Model","ubdp.model",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_model, {"Model","ubdp.model",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_system_id, {"System ID","ubdp.system_id",FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_firmware, {"Version","ubdp.firmware",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, - { &hf_ubdp_platform_vers, {"Platform Version","ubdp.platform_vers",FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_firmware, {"Version","ubdp.firmware",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_ubdp_platform_vers, {"Platform Version","ubdp.platform_vers",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ubdp_generic, {"Unknown Field","ubdp.unk",FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index 253bc253b9..b40fdb2392 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -8066,7 +8066,7 @@ void proto_register_ulp(void) { NULL, HFILL }}, { &hf_ulp_requestorId, { "requestorId", "ulp.requestorId", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ulp_requestorIdType, { "requestorIdType", "ulp.requestorIdType", @@ -8074,7 +8074,7 @@ void proto_register_ulp(void) { "FormatIndicator", HFILL }}, { &hf_ulp_clientName, { "clientName", "ulp.clientName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ulp_clientNameType, { "clientNameType", "ulp.clientNameType", @@ -10082,7 +10082,7 @@ void proto_register_ulp(void) { "INTEGER_0_255", HFILL }}, { &hf_ulp_apSSID_01, { "apSSID", "ulp.apSSID", - FT_STRING, STR_ASCII, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ulp_apPHYType_01, { "apPHYType", "ulp.apPHYType", diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 1df618caa7..265955d88e 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -6490,17 +6490,17 @@ proto_register_usb(void) NULL, 0x0, NULL, HFILL }}, { &hf_usb_src, { "Source", "usb.src", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_usb_dst, { "Destination", "usb.dst", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_usb_addr, { "Source or Destination", "usb.addr", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index c183b83e6f..326d356447 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -1945,15 +1945,15 @@ proto_register_usbll(void) "USB Packet ID", HFILL }}, { &hf_usbll_src, { "Source", "usbll.src", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_usbll_dst, { "Destination", "usbll.dst", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_usbll_addr, { "Source or Destination", "usbll.addr", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* Token header fields */ diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 408586b999..d8149029fd 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -168,7 +168,7 @@ static header_field_info hfi_vlan_id VLAN_HFI_INIT = { NULL, 0x0FFF, "VLAN ID", HFILL }; static header_field_info hfi_vlan_id_name VLAN_HFI_INIT = { - "Name", "vlan.id_name", FT_STRING, STR_UNICODE, + "Name", "vlan.id_name", FT_STRING, BASE_NONE, NULL, 0x0, "VLAN ID Name", HFILL }; static header_field_info hfi_vlan_etype VLAN_HFI_INIT = { diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 50f86e0f07..9af2cfd6af 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -3618,12 +3618,12 @@ proto_register_vnc(void) }, { &hf_vnc_tight_tunnel_type_vendor, { "Tunnel type vendor", "vnc.tunnel_type_vendor", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Tunnel type vendor specific to TightVNC", HFILL } }, { &hf_vnc_tight_tunnel_type_signature, { "Tunnel type signature", "vnc.tunnel_type_signature", - FT_STRING, STR_ASCII, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Tunnel type signature specific to TightVNC", HFILL } }, { &hf_vnc_tight_num_auth_types, diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index cf0d153bf5..378e0eb048 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -7954,7 +7954,7 @@ proto_register_wbxml(void) { &hf_wbxml_string_table_item_string, { "String", "wbxml.string_table_item_string", - FT_STRINGZ, STR_UNICODE, + FT_STRINGZ, BASE_NONE, NULL, 0x00, NULL, HFILL } }, diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c index 68c42f67bb..6244e77847 100644 --- a/epan/dissectors/packet-wifi-nan.c +++ b/epan/dissectors/packet-wifi-nan.c @@ -3150,7 +3150,7 @@ proto_register_nan(void) { "Condensed Country String", "nan.country_code", - FT_STRINGZ, STR_ASCII, NULL, 0x0, NULL, HFILL + FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_nan_attr_ranging_protocol, @@ -3647,7 +3647,7 @@ proto_register_nan(void) { "Channel Bitmap - Channel Set", "nan.ava.chan.set", - FT_STRING, STR_ASCII, NULL, 0x00, NULL, HFILL + FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_nan_attr_availability_entry_entries_start_freq, diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c index c0b2336787..c1b9eb150b 100644 --- a/epan/dissectors/packet-wisun.c +++ b/epan/dissectors/packet-wisun.c @@ -1389,7 +1389,7 @@ void proto_register_wisun(void) }, { &hf_wisun_netnameie_name, - { "Network Name", "wisun.netnameie.name", FT_STRING, STR_ASCII, NULL, 0x0, + { "Network Name", "wisun.netnameie.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index f50efbedfe..e9bea885ae 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -22523,7 +22523,7 @@ void proto_register_x2ap(void) { NULL, HFILL }}, { &hf_x2ap_LHN_ID_PDU, { "LHN-ID", "x2ap.LHN_ID", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x2ap_LocationInformationSgNB_PDU, { "LocationInformationSgNB", "x2ap.LocationInformationSgNB_element", @@ -24175,7 +24175,7 @@ void proto_register_x2ap(void) { "T_bt_rssi", HFILL }}, { &hf_x2ap_BluetoothMeasConfigNameList_item, { "BluetoothName", "x2ap.BluetoothName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x2ap_BPLMN_ID_Info_EUTRA_item, { "BPLMN-ID-Info-EUTRA-Item", "x2ap.BPLMN_ID_Info_EUTRA_Item_element", @@ -25959,7 +25959,7 @@ void proto_register_x2ap(void) { NULL, HFILL }}, { &hf_x2ap_WLANMeasConfigNameList_item, { "WLANName", "x2ap.WLANName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x2ap_wTID_Type1, { "wTID-Type1", "x2ap.wTID_Type1_element", diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 1589aa448c..c7dbd3d34f 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -2039,15 +2039,15 @@ void proto_register_x509sat(void) { NULL, HFILL }}, { &hf_x509sat_SyntaxTeletexString_PDU, { "TeletexString", "x509sat.TeletexString", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x509sat_SyntaxT61String_PDU, { "T61String", "x509sat.T61String", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x509sat_SyntaxVideotexString_PDU, { "VideotexString", "x509sat.VideotexString", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x509sat_SyntaxGraphicString_PDU, { "GraphicString", "x509sat.GraphicString", @@ -2071,7 +2071,7 @@ void proto_register_x509sat(void) { NULL, HFILL }}, { &hf_x509sat_teletexString, { "teletexString", "x509sat.teletexString", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x509sat_printableString, { "printableString", "x509sat.printableString", diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c index d995143cf4..6a945e5144 100644 --- a/epan/dissectors/packet-xnap.c +++ b/epan/dissectors/packet-xnap.c @@ -21936,7 +21936,7 @@ void proto_register_xnap(void) { "T_bt_rssi", HFILL }}, { &hf_xnap_BluetoothMeasConfigNameList_item, { "BluetoothName", "xnap.BluetoothName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_xnap_BPLMN_ID_Info_EUTRA_item, { "BPLMN-ID-Info-EUTRA-Item", "xnap.BPLMN_ID_Info_EUTRA_Item_element", @@ -24948,7 +24948,7 @@ void proto_register_xnap(void) { NULL, HFILL }}, { &hf_xnap_WLANMeasConfigNameList_item, { "WLANName", "xnap.WLANName", - FT_STRING, STR_UNICODE, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_xnap_protocolIEs, { "protocolIEs", "xnap.protocolIEs", diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index f85d44822a..dfa61a1c7a 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -3397,7 +3397,7 @@ proto_register_zbee_zcl_price(void) /* end Tariff Information Type/Charging Scheme fields */ { &hf_zbee_zcl_price_tariff_information_tariff_label, - { "Tariff Label", "zbee_zcl_se.price.tariff_information.tariff_label", FT_UINT_STRING, STR_UNICODE, NULL, + { "Tariff Label", "zbee_zcl_se.price.tariff_information.tariff_label", FT_UINT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_zbee_zcl_price_tariff_information_number_of_price_tiers_in_use, @@ -13959,11 +13959,11 @@ proto_register_zbee_zcl_device_management(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_name, - { "Proposed Provider Name", "zbee_zcl_se.device_management.publish_change_of_supplier.provider_proposed_provider_name", FT_UINT_STRING, STR_UNICODE, NULL, + { "Proposed Provider Name", "zbee_zcl_se.device_management.publish_change_of_supplier.provider_proposed_provider_name", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_contact_details, - { "Proposed Provider Contact Details", "zbee_zcl_se.device_management.publish_change_of_supplier.provider_proposed_provider_contact_details", FT_UINT_STRING, STR_UNICODE, NULL, + { "Proposed Provider Contact Details", "zbee_zcl_se.device_management.publish_change_of_supplier.provider_proposed_provider_contact_details", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_request_new_password_issuer_event_id, @@ -13979,7 +13979,7 @@ proto_register_zbee_zcl_device_management(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_request_new_password_password, - { "Password", "zbee_zcl_se.device_management.request_new_password.password", FT_UINT_STRING, STR_UNICODE, NULL, + { "Password", "zbee_zcl_se.device_management.request_new_password.password", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_update_site_id_issuer_event_id, @@ -13995,7 +13995,7 @@ proto_register_zbee_zcl_device_management(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_update_site_id_site_id, - { "SiteID", "zbee_zcl_se.device_management.update_site_id.site_id", FT_UINT_STRING, STR_UNICODE, NULL, + { "SiteID", "zbee_zcl_se.device_management.update_site_id.site_id", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_get_event_configuration_event_id, @@ -14015,7 +14015,7 @@ proto_register_zbee_zcl_device_management(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_update_cin_customerid_number, - { "CustomerID Number", "zbee_zcl_se.device_management.update_cin.customerid_number", FT_UINT_STRING, STR_UNICODE, NULL, + { "CustomerID Number", "zbee_zcl_se.device_management.update_cin.customerid_number", FT_UINT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_device_management_set_event_configuration_issuer_event_id, diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 61a965204c..49fcfe50ae 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -1358,7 +1358,7 @@ proto_register_zvt(void) FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_zvt_text_lines_line, { "Text line", "zvt.tlv.text_lines.line", - FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, + FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_zvt_permitted_cmd, { "Permitted command", "zvt.tlv.permitted_command", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }, diff --git a/epan/introspection-enums.c b/epan/introspection-enums.c index 23fc859690..aecacc360d 100644 --- a/epan/introspection-enums.c +++ b/epan/introspection-enums.c @@ -423,7 +423,5 @@ static ws_enum_t all_enums[] = { ENUM(SEP_DASH), ENUM(SEP_DOT), ENUM(SEP_SPACE), - ENUM(STR_ASCII), - ENUM(STR_UNICODE), { NULL, 0 }, }; diff --git a/epan/proto.c b/epan/proto.c index 1099c51e94..0d86c4a74f 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1068,21 +1068,10 @@ proto_registrar_get_id_byname(const char *field_name) static char * -hfinfo_format_text(wmem_allocator_t *scope, const header_field_info *hfinfo, +hfinfo_format_text(wmem_allocator_t *scope, const header_field_info *hfinfo _U_, const guchar *string) { - switch (hfinfo->display) { - case STR_ASCII: - return format_text(scope, string, strlen(string)); -/* - case STR_ASCII_WSP - return format_text_wsp(string, strlen(string)); - */ - case STR_UNICODE: - return format_text(scope, string, strlen(string)); - } - - return format_text(scope, string, strlen(string)); + return format_text_string(scope, string); } static char * @@ -8225,8 +8214,6 @@ static const value_string hf_display[] = { { BASE_HEX_DEC|BASE_VAL64_STRING, "BASE_HEX_DEC|BASE_VAL64_STRING" }, { BASE_CUSTOM|BASE_VAL64_STRING, "BASE_CUSTOM|BASE_VAL64_STRING" }, /* Alias: BASE_NONE { BASE_FLOAT, "BASE_FLOAT" }, */ - /* Alias: BASE_NONE { STR_ASCII, "STR_ASCII" }, */ - { STR_UNICODE, "STR_UNICODE" }, { ABSOLUTE_TIME_LOCAL, "ABSOLUTE_TIME_LOCAL" }, { ABSOLUTE_TIME_UTC, "ABSOLUTE_TIME_UTC" }, { ABSOLUTE_TIME_DOY_UTC, "ABSOLUTE_TIME_DOY_UTC" }, @@ -8635,8 +8622,7 @@ tmp_fld_check_assert(header_field_info *hfinfo) case FT_STRINGZPAD: case FT_STRINGZTRUNC: switch (hfinfo->display) { - case STR_ASCII: - case STR_UNICODE: + case BASE_NONE: break; default: @@ -12962,10 +12948,6 @@ proto_tree_add_ts_23_038_7bits_packed_item(proto_tree *tree, const int hfindex, string = tvb_get_ts_23_038_7bits_string_packed(PNODE_POOL(tree), tvb, bit_offset, no_of_chars); - if (hfinfo->display == STR_UNICODE) { - DISSECTOR_ASSERT(g_utf8_validate(string, -1, NULL)); - } - pi = proto_tree_add_pi(tree, hfinfo, tvb, byte_offset, &byte_length); DISSECTOR_ASSERT(byte_length >= 0); proto_tree_set_string(PNODE_FINFO(pi), string); @@ -12994,10 +12976,6 @@ proto_tree_add_ascii_7bits_item(proto_tree *tree, const int hfindex, tvbuff_t *t string = tvb_get_ascii_7bits_string(PNODE_POOL(tree), tvb, bit_offset, no_of_chars); - if (hfinfo->display == STR_UNICODE) { - DISSECTOR_ASSERT(g_utf8_validate(string, -1, NULL)); - } - pi = proto_tree_add_pi(tree, hfinfo, tvb, byte_offset, &byte_length); DISSECTOR_ASSERT(byte_length >= 0); proto_tree_set_string(PNODE_FINFO(pi), string); diff --git a/epan/proto.h b/epan/proto.h index b058edef81..e409c80d4d 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -656,8 +656,9 @@ void proto_report_dissector_bug(const char *format, ...) * any changes here still makes valid entries in init.lua. */ typedef enum { -/* Integral types */ BASE_NONE = 0, /**< none */ + +/* Integral types */ BASE_DEC = 1, /**< decimal */ BASE_HEX = 2, /**< hexadecimal */ BASE_OCT = 3, /**< octal */ @@ -668,11 +669,6 @@ typedef enum { /* Float types */ BASE_FLOAT = BASE_NONE, /**< decimal-format float */ -/* String types */ - STR_ASCII = 0, /**< shows non-printable ASCII characters as C-style escapes */ - /* XXX, support for format_text_wsp() ? */ - STR_UNICODE = 7, /**< shows non-printable UNICODE characters as \\uXXXX (XXX for now non-printable characters display depends on UI) */ - /* Byte separators */ SEP_DOT = 8, /**< hexadecimal bytes with a period (.) between each byte */ SEP_DASH = 9, /**< hexadecimal bytes with a dash (-) between each byte */ diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index 77eedbf332..e177674546 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -158,7 +158,7 @@ my $skip_this = 0; while() { $skip_this = 0; - if (/^\s+(?:BASE|STR|SEP)_([A-Z_]+)[ ]*=[ ]*([0-9]+)[,\s]+(?:\/\*\*< (.*?) \*\/)?/) { + if (/^\s+(?:BASE|SEP)_([A-Z_]+)[ ]*=[ ]*([0-9]+)[,\s]+(?:\/\*\*< (.*?) \*\/)?/) { $bases_table .= "\t[\"$1\"] = $2, -- $3\n"; } diff --git a/epan/wslua/wslua_proto_field.c b/epan/wslua/wslua_proto_field.c index 558858389e..523458faf7 100644 --- a/epan/wslua/wslua_proto_field.c +++ b/epan/wslua/wslua_proto_field.c @@ -99,9 +99,6 @@ static const struct field_display_string_t base_displays[] = { {"base.DEC_HEX", BASE_DEC_HEX}, {"base.HEX_DEC", BASE_HEX_DEC}, {"base.UNIT_STRING", BASE_UNIT_STRING}, - /* String types */ - {"base.ASCII", STR_ASCII}, - {"base.UNICODE", STR_UNICODE}, /* Byte separators */ {"base.DOT", SEP_DOT}, {"base.DASH", SEP_DASH}, @@ -678,8 +675,8 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { break; case FT_STRING: case FT_STRINGZ: - if (base != STR_ASCII && base != STR_UNICODE) { - WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Display must be either base.ASCII or base.UNICODE"); + if (base != BASE_NONE) { + WSLUA_OPTARG_ERROR(ProtoField_new,BASE,"Display must be base.NONE"); return 0; } if (mask) { @@ -1256,8 +1253,8 @@ static int ProtoField_other_display(lua_State* L,enum ftenum type) { if (lua_isnumber(L, 3)) { base = (unsigned)luaL_optinteger(L,3,BASE_NONE); if (type == FT_STRING || type == FT_STRINGZ) { - if (base != STR_ASCII && base != STR_UNICODE) { - luaL_argerror(L, 3, "Display must be either base.ASCII or base.UNICODE"); + if (base != BASE_NONE) { + luaL_argerror(L, 3, "Display must be base.NONE"); return 0; } } else if (type == FT_BYTES || type == FT_UINT_BYTES) {