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-idp.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-idp.c')
-rw-r--r-- | epan/dissectors/packet-idp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index b86bfd1d9a..0389ecfbe6 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -144,52 +144,52 @@ proto_register_idp(void) static hf_register_info hf_idp[] = { { &hf_idp_checksum, { "Checksum", "idp.checksum", FT_UINT16, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_src, - { "Source Address", "idp.src", FT_STRING, BASE_DEC, - NULL, 0x0, "Source Address", HFILL }}, + { "Source Address", "idp.src", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_dst, - { "Destination Address", "idp.dst", FT_STRING, BASE_DEC, - NULL, 0x0, "Destination Address", HFILL }}, + { "Destination Address", "idp.dst", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_len, { "Length", "idp.len", FT_UINT16, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, /* XXX - does this have separate hop count and time subfields? */ { &hf_idp_hops, { "Transport Control (Hops)", "idp.hops", FT_UINT8, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_packet_type, { "Packet Type", "idp.packet_type", FT_UINT8, BASE_DEC, - VALS(idp_packet_type_vals), 0x0, "", HFILL }}, + VALS(idp_packet_type_vals), 0x0, NULL, HFILL }}, { &hf_idp_dnet, { "Destination Network","idp.dst.net", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_dnode, { "Destination Node", "idp.dst.node", FT_ETHER, BASE_NONE, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_dsocket, { "Destination Socket", "idp.dst.socket", FT_UINT16, BASE_HEX, - VALS(idp_socket_vals), 0x0, "", HFILL }}, + VALS(idp_socket_vals), 0x0, NULL, HFILL }}, { &hf_idp_snet, { "Source Network","idp.src.net", FT_UINT32, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_snode, { "Source Node", "idp.src.node", FT_ETHER, BASE_NONE, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_idp_ssocket, { "Source Socket", "idp.src.socket", FT_UINT16, BASE_HEX, - VALS(idp_socket_vals), 0x0, "", HFILL }}, + VALS(idp_socket_vals), 0x0, NULL, HFILL }}, }; static gint *ett[] = { |