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-pppoe.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-pppoe.c')
| -rw-r--r-- | epan/dissectors/packet-pppoe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 5aceffc4fd..a1f1b09246 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -871,27 +871,27 @@ void proto_register_pppoe(void) /* These fields common to discovery and session protocols */ { &hf_pppoe_version, { "Version", "pppoe.version", FT_UINT8, BASE_DEC, - NULL, 0xf0, "", HFILL + NULL, 0xf0, NULL, HFILL } }, { &hf_pppoe_type, { "Type", "pppoe.type", FT_UINT8, BASE_DEC, - NULL, 0x0f, "", HFILL + NULL, 0x0f, NULL, HFILL } }, { &hf_pppoe_code, { "Code", "pppoe.code", FT_UINT8, BASE_HEX, - VALS(code_vals), 0x0, "", HFILL + VALS(code_vals), 0x0, NULL, HFILL } }, { &hf_pppoe_session_id, { "Session ID", "pppoe.session_id", FT_UINT16, BASE_HEX, - NULL, 0x0, "", HFILL + NULL, 0x0, NULL, HFILL } }, { &hf_pppoe_payload_length, { "Payload Length", "pppoe.payload_length", FT_UINT16, BASE_DEC, - NULL, 0x0, "", HFILL + NULL, 0x0, NULL, HFILL } } }; |