diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-tcap.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-tcap.c')
-rw-r--r-- | epan/dissectors/packet-tcap.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 6c6fe3c79a..0c20ea30ba 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1555,29 +1555,29 @@ proto_register_tcap(void) { &hf_tcap_tag, { "Tag", "tcap.msgtype", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL } + NULL, HFILL } }, { &hf_tcap_length, { "Length", "tcap.len", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL } + NULL, HFILL } }, { &hf_tcap_data, { "Data", "tcap.data", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL } }, { &hf_tcap_tid, { "Transaction Id", "tcap.tid", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL } }, /* Tcap Service Response Time */ { &hf_tcapsrt_SessionId, { "Session Id", "tcap.srt.session_id", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_tcapsrt_BeginSession, { "Begin Session", @@ -1620,7 +1620,7 @@ proto_register_tcap(void) "tcap.OBJECT_IDENTIFIER", HFILL }}, { &hf_tcap_dialog, { "dialog", "tcap.dialog", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.Dialog1", HFILL }}, { &hf_tcap_unidirectional, { "unidirectional", "tcap.unidirectional", @@ -1644,7 +1644,7 @@ proto_register_tcap(void) "tcap.Abort", HFILL }}, { &hf_tcap_dialoguePortion, { "dialoguePortion", "tcap.dialoguePortion", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.DialoguePortion", HFILL }}, { &hf_tcap_components, { "components", "tcap.components", @@ -1652,11 +1652,11 @@ proto_register_tcap(void) "tcap.ComponentPortion", HFILL }}, { &hf_tcap_otid, { "otid", "tcap.otid", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.OrigTransactionID", HFILL }}, { &hf_tcap_dtid, { "dtid", "tcap.dtid", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.DestTransactionID", HFILL }}, { &hf_tcap_reason, { "reason", "tcap.reason", @@ -1668,7 +1668,7 @@ proto_register_tcap(void) "tcap.P_AbortCause", HFILL }}, { &hf_tcap_u_abortCause, { "u-abortCause", "tcap.u_abortCause", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.DialoguePortion", HFILL }}, { &hf_tcap__untag_item, { "Component", "tcap.Component", @@ -1772,7 +1772,7 @@ proto_register_tcap(void) "tcap.AUDT_apdu", HFILL }}, { &hf_tcap_audt_protocol_version, { "protocol-version", "tcap.protocol_version", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.AUDT_protocol_version", HFILL }}, { &hf_tcap_audt_application_context_name, { "application-context-name", "tcap.application_context_name", @@ -1800,7 +1800,7 @@ proto_register_tcap(void) "tcap.ABRT_apdu", HFILL }}, { &hf_tcap_aarq_protocol_version, { "protocol-version", "tcap.protocol_version", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.AARQ_protocol_version", HFILL }}, { &hf_tcap_aarq_application_context_name, { "application-context-name", "tcap.application_context_name", @@ -1816,7 +1816,7 @@ proto_register_tcap(void) "tcap.EXTERNAL", HFILL }}, { &hf_tcap_aare_protocol_version, { "protocol-version", "tcap.protocol_version", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "tcap.AARE_protocol_version", HFILL }}, { &hf_tcap_aare_application_context_name, { "application-context-name", "tcap.application_context_name", @@ -1861,15 +1861,15 @@ proto_register_tcap(void) { &hf_tcap_AUDT_protocol_version_version1, { "version1", "tcap.version1", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_tcap_AARQ_protocol_version_version1, { "version1", "tcap.version1", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_tcap_AARE_protocol_version_version1, { "version1", "tcap.version1", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ #line 319 "packet-tcap-template.c" |