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-ipsec-tcp.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-ipsec-tcp.c')
-rw-r--r-- | epan/dissectors/packet-ipsec-tcp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index 1a351dca48..c040ebdca9 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -190,35 +190,35 @@ proto_register_tcpencap(void) { &hf_tcpencap_unknown, { "Unknown trailer", "tcpencap.unknown", FT_BYTES, BASE_NONE, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_zero, { "All zero", "tcpencap.zero", FT_BYTES, BASE_NONE, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_seq, { "Sequence number", "tcpencap.seq", FT_UINT16, BASE_HEX, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_esp_zero, { "ESP zero", "tcpencap.espzero", FT_UINT16, BASE_HEX, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_ike_direction, { "ISAKMP traffic direction", "tcpencap.ikedirection", FT_UINT16, BASE_HEX, VALS(tcpencap_ikedir_vals), - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_magic, { "Magic number", "tcpencap.magic", FT_BYTES, BASE_NONE, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_proto, { "Protocol", "tcpencap.proto", FT_UINT8, BASE_HEX, VALS(tcpencap_proto_vals), - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_tcpencap_magic2, { "Magic 2", "tcpencap.magic2", FT_BYTES, BASE_NONE, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, }; |