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-h460.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-h460.c')
-rw-r--r-- | epan/dissectors/packet-h460.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 353147dec9..2d855e30cd 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -2245,7 +2245,7 @@ void proto_register_h460(void) { "h460_2.INTEGER_1_255", HFILL }}, { &hf_h460_2_regionalData, { "regionalData", "h460.2.regionalData", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "h460_2.OCTET_STRING", HFILL }}, /* --- Module CIRCUIT-STATUS-MAP --- --- --- */ @@ -2276,7 +2276,7 @@ void proto_register_h460(void) { "h460_3.INTEGER_0_4095", HFILL }}, { &hf_h460_3_status, { "status", "h460.3.status", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "h460_3.OCTET_STRING", HFILL }}, { &hf_h460_3_serviceStatus, { "serviceStatus", "h460.3.serviceStatus", @@ -2394,7 +2394,7 @@ void proto_register_h460(void) { "h225.GenericIdentifier", HFILL }}, { &hf_h460_9_extensionContent, { "extensionContent", "h460.9.extensionContent", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "h460_9.OCTET_STRING", HFILL }}, { &hf_h460_9_rtpAddress, { "rtpAddress", "h460.9.rtpAddress", @@ -2759,7 +2759,7 @@ void proto_register_h460(void) { "h225.TransportAddress", HFILL }}, { &hf_h460_15_immediateResume, { "immediateResume", "h460.15.immediateResume", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "h460_15.BOOLEAN", HFILL }}, { &hf_h460_15_resetH245, { "resetH245", "h460.15.resetH245", @@ -2767,7 +2767,7 @@ void proto_register_h460(void) { "h460_15.NULL", HFILL }}, { &hf_h460_15_okToSuspend, { "okToSuspend", "h460.15.okToSuspend", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "h460_15.BOOLEAN", HFILL }}, { &hf_h460_15_randomNumber, { "randomNumber", "h460.15.randomNumber", @@ -2860,7 +2860,7 @@ void proto_register_h460(void) { "h460_21.INTEGER_1_65535", HFILL }}, { &hf_h460_21_groupIdentifer, { "groupIdentifer", "h460.21.groupIdentifer", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "h460_21.GloballyUniqueID", HFILL }}, { &hf_h460_21_capability, { "capability", "h460.21.capability", |