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-cisco-erspan.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-cisco-erspan.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-erspan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 04d69934d7..8e9878acce 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -141,35 +141,35 @@ proto_register_erspan(void) { &hf_erspan_unknown1, { "Unknown1", "erspan.unknown1", FT_UINT16, BASE_HEX, NULL, - 0xf000, "", HFILL }}, + 0xf000, NULL, HFILL }}, { &hf_erspan_vlan, { "Vlan", "erspan.vlan", FT_UINT16, BASE_DEC, NULL, - 0x0fff, "", HFILL }}, + 0x0fff, NULL, HFILL }}, { &hf_erspan_priority, { "Priority", "erspan.priority", FT_UINT16, BASE_DEC, NULL, - 0xe000, "", HFILL }}, + 0xe000, NULL, HFILL }}, { &hf_erspan_unknown2, { "Unknown2", "erspan.unknown2", FT_UINT16, BASE_DEC, NULL, - 0x1000, "", HFILL }}, + 0x1000, NULL, HFILL }}, { &hf_erspan_direction, { "Direction", "erspan.direction", FT_UINT16, BASE_DEC, VALS(erspan_direction_vals), - 0x0800, "", HFILL }}, + 0x0800, NULL, HFILL }}, { &hf_erspan_unknown3, { "Unknown3", "erspan.unknown3", FT_UINT16, BASE_DEC, NULL, - 0x0400, "", HFILL }}, + 0x0400, NULL, HFILL }}, { &hf_erspan_spanid, { "SpanID", "erspan.spanid", FT_UINT16, BASE_DEC, NULL, - 0x03ff, "", HFILL }}, + 0x03ff, NULL, HFILL }}, { &hf_erspan_unknown4, { "Unknown4", "erspan.unknown4", FT_BYTES, BASE_NONE, NULL, - 0, "", HFILL }}, + 0, NULL, HFILL }}, }; static gint *ett[] = { |