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-zbee-aps.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-zbee-aps.c')
-rw-r--r-- | epan/dissectors/packet-zbee-aps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 5002b57361..b25a81149f 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1600,15 +1600,15 @@ void proto_register_zbee_aps(void) "The device whose status is being updated.", HFILL }}, { &hf_zbee_aps_cmd_challenge, - { "Challenge", "zbee.aps.cmd.challenge", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Challenge", "zbee.aps.cmd.challenge", FT_BYTES, BASE_NONE, NULL, 0x0, "Random challenge value used during SKKE and authentication.", HFILL }}, { &hf_zbee_aps_cmd_mac, - { "Message Authentication Code", "zbee.aps.cmd.mac", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Message Authentication Code", "zbee.aps.cmd.mac", FT_BYTES, BASE_NONE, NULL, 0x0, "Message authentication values used during SKKE and authentication.", HFILL }}, { &hf_zbee_aps_cmd_key, - { "Key", "zbee.aps.cmd.key", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Key", "zbee.aps.cmd.key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_key_type, @@ -1640,7 +1640,7 @@ void proto_register_zbee_aps(void) NULL, HFILL }}, { &hf_zbee_aps_cmd_ea_data, - { "Data", "zbee.aps.cmd.ea.data", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Data", "zbee.aps.cmd.ea.data", FT_BYTES, BASE_NONE, NULL, 0x0, "Additional data used in entity authentication. Typically this will be the outgoing frame counter associated with the key used for entity authentication.", HFILL }}, { &hf_zbee_aps_fragments, |