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-sll.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-sll.c')
| -rw-r--r-- | epan/dissectors/packet-sll.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 54ea07d8a2..e5af009e05 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -291,16 +291,16 @@ proto_register_sll(void) static hf_register_info hf[] = { { &hf_sll_pkttype, { "Packet type", "sll.pkttype", FT_UINT16, BASE_DEC, - VALS(packet_type_vals), 0x0, "Packet type", HFILL }}, + VALS(packet_type_vals), 0x0, NULL, HFILL }}, /* ARP hardware type? With Linux extensions? */ { &hf_sll_hatype, { "Link-layer address type", "sll.hatype", FT_UINT16, BASE_DEC, - NULL, 0x0, "Link-layer address type", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_sll_halen, { "Link-layer address length", "sll.halen", FT_UINT16, BASE_DEC, - NULL, 0x0, "Link-layer address length", HFILL }}, + NULL, 0x0, NULL, HFILL }}, /* Source address if it's an Ethernet-type address */ { &hf_sll_src_eth, @@ -314,7 +314,7 @@ proto_register_sll(void) /* Source address if it's not an Ethernet-type address */ { &hf_sll_src_other, - { "Source", "sll.src.other", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Source", "sll.src.other", FT_BYTES, BASE_NONE, NULL, 0x0, "Source link-layer address", HFILL }}, /* if the protocol field is an internal Linux protocol type */ @@ -334,7 +334,7 @@ proto_register_sll(void) { &hf_sll_trailer, { "Trailer", "sll.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, - "Trailer", HFILL }} + NULL, HFILL }} }; static gint *ett[] = { &ett_sll |