osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.
pespin/osmux-wip
João Valverde 2021-11-30 02:53:49 +00:00
parent 7e99bbf32b
commit 19dcb725b6
151 changed files with 1278 additions and 1309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.dissector
View File

@ -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:

2
epan/dissectors/asn1/credssp/credssp.cnf
View File

@ -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;

2
epan/dissectors/asn1/gsm_map/gsm_map.cnf
View File

@ -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

2
epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
View File

@ -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",

2
epan/dissectors/asn1/ldap/ldap.cnf
View File

@ -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

2
epan/dissectors/asn1/lpp/lpp.cnf
View File

@ -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;

4
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -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;

2
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -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",

4
epan/dissectors/asn1/ngap/ngap.cnf
View File

@ -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 = &parameter_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 = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s

2
epan/dissectors/asn1/ngap/packet-ngap-template.c
View File

@ -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",

2
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -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;

2
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
View File

@ -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",

30
epan/dissectors/asn1/p1/p1.cnf
View File

@ -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

8
epan/dissectors/asn1/p22/p22.cnf
View File

@ -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

4
epan/dissectors/asn1/pkix1explicit/pkix1explicit.cnf
View File

@ -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"

2
epan/dissectors/asn1/rrc/rrc.cnf
View File

@ -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;

4
epan/dissectors/asn1/rtse/rtse.cnf
View File

@ -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

2
epan/dissectors/asn1/s1ap/packet-s1ap-template.c
View File

@ -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",

6
epan/dissectors/asn1/s1ap/s1ap.cnf
View File

@ -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 = &parameter_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 = &parameter_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 = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s

2
epan/dissectors/asn1/sabp/packet-sabp-template.c
View File

@ -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",

2
epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
View File

@ -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"
};

6
epan/dissectors/asn1/ulp/ulp.cnf
View File

@ -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;

6
epan/dissectors/asn1/x2ap/x2ap.cnf
View File

@ -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 = &parameter_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 = &parameter_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 = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s

8
epan/dissectors/asn1/x509sat/x509sat.cnf
View File

@ -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

4
epan/dissectors/asn1/xnap/xnap.cnf
View File

@ -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 = &parameter_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 = &parameter_tvb HF_INDEX = -1
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s

2
epan/dissectors/file-jpeg.c
View File

@ -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
}

24
epan/dissectors/file-pcapng.c
View File

@ -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,

4
epan/dissectors/file-png.c
View File

@ -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 = {

2
epan/dissectors/packet-adb.c
View File

@ -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 }
}
};

8
epan/dissectors/packet-adb_cs.c
View File

@ -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,

16
epan/dissectors/packet-adb_service.c
View File

@ -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 }
},
};

12
epan/dissectors/packet-afp.c
View File

@ -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,

8
epan/dissectors/packet-ansi_637.c
View File

@ -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,

2
epan/dissectors/packet-at-ldf.c
View File

@ -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 }
}

12
epan/dissectors/packet-atalk.c
View File

@ -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,

8
epan/dissectors/packet-bacapp.c
View File

@ -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",

8
epan/dissectors/packet-bgp.c
View File

@ -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}},

4
epan/dissectors/packet-blip.c
View File

@ -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,

8
epan/dissectors/packet-bluecom.c
View File

@ -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 }},

6
epan/dissectors/packet-bluetooth.c
View File

@ -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 }
},
};

2
epan/dissectors/packet-bpsec.c
View File

@ -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}},

20
epan/dissectors/packet-bpv7.c
View File

@ -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}},
};

4
epan/dissectors/packet-btatt.c
View File

@ -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,

2
epan/dissectors/packet-caneth.c
View File

@ -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
}

6
epan/dissectors/packet-cell_broadcast.c
View File

@ -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
}
}

14
epan/dissectors/packet-cose.c