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-pktc.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-pktc.c')
| -rw-r--r-- | epan/dissectors/packet-pktc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index d9f92a5d36..eb04eb0984 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -758,16 +758,16 @@ proto_register_pktc_mtafqdn(void) VALS(pktc_mtafqdn_msgtype_vals), 0, "MTA FQDN Message Type", HFILL }}, { &hf_pktc_mtafqdn_enterprise, { "Enterprise Number", "pktc.mtafqdn.enterprise", FT_UINT32, BASE_DEC, - NULL, 0, "Enterprise Number", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_pktc_mtafqdn_version, { "Protocol Version", "pktc.mtafqdn.version", FT_UINT8, BASE_DEC, NULL, 0, "MTA FQDN Protocol Version", HFILL }}, /* MTA FQDN REQ */ { &hf_pktc_mtafqdn_mac, { "MTA MAC address", "pktc.mtafqdn.mac", FT_ETHER, BASE_NONE, - NULL, 0, "MTA MAC address", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_pktc_mtafqdn_pub_key_hash, { - "MTA Public Key Hash", "pktc.mtafqdn.pub_key_hash", FT_BYTES, BASE_HEX, + "MTA Public Key Hash", "pktc.mtafqdn.pub_key_hash", FT_BYTES, BASE_NONE, NULL, 0, "MTA Public Key Hash (SHA-1)", HFILL }}, { &hf_pktc_mtafqdn_manu_cert_revoked, { "Manufacturer Cert Revocation Time", "pktc.mtafqdn.manu_cert_revoked", FT_ABSOLUTE_TIME, BASE_NONE, @@ -775,7 +775,7 @@ proto_register_pktc_mtafqdn(void) /* MTA FQDN REP */ { &hf_pktc_mtafqdn_fqdn, { "MTA FQDN", "pktc.mtafqdn.fqdn", FT_STRING, BASE_NONE, - NULL, 0, "MTA FQDN", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_pktc_mtafqdn_ip, { "MTA IP Address", "pktc.mtafqdn.ip", FT_IPv4, BASE_NONE, NULL, 0, "MTA IP Address (all zeros if not supplied)", HFILL }}, |