diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-isl.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-isl.c')
| -rw-r--r-- | epan/dissectors/packet-isl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 1462f07ffc..05a6188ecd 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -332,11 +332,11 @@ proto_register_isl(void) { static hf_register_info hf[] = { { &hf_isl_dst, - { "Destination", "isl.dst", FT_BYTES, BASE_HEX, NULL, 0x0, + { "Destination", "isl.dst", FT_BYTES, BASE_NONE, NULL, 0x0, "Destination Address", HFILL }}, { &hf_isl_type, { "Type", "isl.type", FT_UINT8, BASE_DEC, - VALS(type_vals), 0xF0, "Type", HFILL }}, + VALS(type_vals), 0xF0, NULL, HFILL }}, { &hf_isl_user_eth, { "User", "isl.user_eth", FT_UINT8, BASE_DEC, VALS(ether_user_vals), 0x0F, "Priority (for Ethernet)", HFILL }}, @@ -351,7 +351,7 @@ proto_register_isl(void) "Source or Destination Hardware Address", HFILL }}, { &hf_isl_len, { "Length", "isl.len", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_isl_hsa, { "HSA", "isl.hsa", FT_UINT24, BASE_HEX, NULL, 0x0, "High bits of source address", HFILL }}, @@ -372,7 +372,7 @@ proto_register_isl(void) 0xFFFE, "Source Virtual LAN ID", HFILL }}, { &hf_isl_explorer, { "Explorer", "isl.explorer", FT_BOOLEAN, 16, - TFS(&explorer_tfs), 0x0001, "Explorer", HFILL }}, + TFS(&explorer_tfs), 0x0001, NULL, HFILL }}, { &hf_isl_dst_route_descriptor, { "Destination route descriptor", "isl.dst_route_desc", FT_UINT16, BASE_HEX, NULL, 0x0, |