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-pres.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-pres.c')
-rw-r--r-- | epan/dissectors/packet-pres.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index ea9e843803..8d925e326a 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1458,23 +1458,23 @@ void proto_register_pres(void) { { &hf_pres_CP_type, { "CP-type", "pres.cptype", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_CPA_PPDU, { "CPA-PPDU", "pres.cpapdu", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Abort_type, { "Abort type", "pres.aborttype", FT_UINT32, BASE_DEC, VALS(pres_Abort_type_vals), 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_CPR_PPDU, { "CPR-PPDU", "pres.cprtype", FT_UINT32, BASE_DEC, VALS(pres_CPR_PPDU_vals), 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Typed_data_type, { "Typed data type", "pres.Typed_data_type", FT_UINT32, BASE_DEC, VALS(pres_Typed_data_type_vals), 0, - "", HFILL }}, + NULL, HFILL }}, @@ -1494,15 +1494,15 @@ void proto_register_pres(void) { "pres.T_normal_mode_parameters", HFILL }}, { &hf_pres_protocol_version, { "protocol-version", "pres.protocol_version", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Protocol_version", HFILL }}, { &hf_pres_calling_presentation_selector, { "calling-presentation-selector", "pres.calling_presentation_selector", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Calling_presentation_selector", HFILL }}, { &hf_pres_called_presentation_selector, { "called-presentation-selector", "pres.called_presentation_selector", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Called_presentation_selector", HFILL }}, { &hf_pres_presentation_context_definition_list, { "presentation-context-definition-list", "pres.presentation_context_definition_list", @@ -1514,15 +1514,15 @@ void proto_register_pres(void) { "pres.Default_context_name", HFILL }}, { &hf_pres_presentation_requirements, { "presentation-requirements", "pres.presentation_requirements", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Presentation_requirements", HFILL }}, { &hf_pres_user_session_requirements, { "user-session-requirements", "pres.user_session_requirements", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.User_session_requirements", HFILL }}, { &hf_pres_protocol_options, { "protocol-options", "pres.protocol_options", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Protocol_options", HFILL }}, { &hf_pres_initiators_nominated_context, { "initiators-nominated-context", "pres.initiators_nominated_context", @@ -1546,7 +1546,7 @@ void proto_register_pres(void) { "pres.T_CPA_PPDU_normal_mode_parameters", HFILL }}, { &hf_pres_responding_presentation_selector, { "responding-presentation-selector", "pres.responding_presentation_selector", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Responding_presentation_selector", HFILL }}, { &hf_pres_presentation_context_definition_result_list, { "presentation-context-definition-result-list", "pres.presentation_context_definition_result_list", @@ -1682,7 +1682,7 @@ void proto_register_pres(void) { "pres.T_provider_reason", HFILL }}, { &hf_pres_simply_encoded_data, { "simply-encoded-data", "pres.simply_encoded_data", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.Simply_encoded_data", HFILL }}, { &hf_pres_fully_encoded_data, { "fully-encoded-data", "pres.fully_encoded_data", @@ -1698,92 +1698,92 @@ void proto_register_pres(void) { "pres.T_presentation_data_values", HFILL }}, { &hf_pres_single_ASN1_type, { "single-ASN1-type", "pres.single_ASN1_type", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.T_single_ASN1_type", HFILL }}, { &hf_pres_octet_aligned, { "octet-aligned", "pres.octet_aligned", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.T_octet_aligned", HFILL }}, { &hf_pres_arbitrary, { "arbitrary", "pres.arbitrary", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pres.BIT_STRING", HFILL }}, { &hf_pres_Presentation_requirements_context_management, { "context-management", "pres.context-management", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Presentation_requirements_restoration, { "restoration", "pres.restoration", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Protocol_options_nominated_context, { "nominated-context", "pres.nominated-context", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Protocol_options_short_encoding, { "short-encoding", "pres.short-encoding", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Protocol_options_packed_encoding_rules, { "packed-encoding-rules", "pres.packed-encoding-rules", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_Protocol_version_version_1, { "version-1", "pres.version-1", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_half_duplex, { "half-duplex", "pres.half-duplex", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_duplex, { "duplex", "pres.duplex", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_expedited_data, { "expedited-data", "pres.expedited-data", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_minor_synchronize, { "minor-synchronize", "pres.minor-synchronize", FT_BOOLEAN, 8, NULL, 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_major_synchronize, { "major-synchronize", "pres.major-synchronize", FT_BOOLEAN, 8, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_resynchronize, { "resynchronize", "pres.resynchronize", FT_BOOLEAN, 8, NULL, 0x04, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_activity_management, { "activity-management", "pres.activity-management", FT_BOOLEAN, 8, NULL, 0x02, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_negotiated_release, { "negotiated-release", "pres.negotiated-release", FT_BOOLEAN, 8, NULL, 0x01, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_capability_data, { "capability-data", "pres.capability-data", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_exceptions, { "exceptions", "pres.exceptions", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_typed_data, { "typed-data", "pres.typed-data", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_symmetric_synchronize, { "symmetric-synchronize", "pres.symmetric-synchronize", FT_BOOLEAN, 8, NULL, 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_pres_User_session_requirements_data_separation, { "data-separation", "pres.data-separation", FT_BOOLEAN, 8, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ #line 376 "packet-pres-template.c" |