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-rpl.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-rpl.c')
| -rw-r--r-- | epan/dissectors/packet-rpl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 2953de59d7..9fcfaa75dc 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -341,8 +341,7 @@ proto_register_rpl(void) { &hf_rpl_memsize, { "Memory Size", "rpl.memsize", FT_UINT16, BASE_DEC, NULL, 0x0, - "RPL Memory Size - AX from INT 12h MINUS 32k" - " MINUS the Boot ROM Size", HFILL }}, + "RPL Memory Size - AX from INT 12h MINUS 32k MINUS the Boot ROM Size", HFILL }}, { &hf_rpl_bsmversion, { "BSM Version", "rpl.bsmversion", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -353,7 +352,7 @@ proto_register_rpl(void) "RPL Adapter ID", HFILL }}, { &hf_rpl_shortname, { "Short Name", "rpl.shortname", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "RPL BSM Short Name", HFILL }}, { &hf_rpl_laddress, { "Locate Address", "rpl.laddress", @@ -369,7 +368,7 @@ proto_register_rpl(void) "RPL Sequence Number", HFILL }}, { &hf_rpl_config, { "Configuration", "rpl.config", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "RPL Configuration", HFILL }}, { &hf_rpl_flags, { "Flags", "rpl.flags", @@ -377,11 +376,11 @@ proto_register_rpl(void) "RPL Bit Significant Option Flags", HFILL }}, { &hf_rpl_data, { "Data", "rpl.data", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "RPL Binary File Data", HFILL }}, { &hf_rpl_ec, { "EC", "rpl.ec", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "RPL EC", HFILL }}, }; |