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-isis-lsp.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-isis-lsp.c')
| -rw-r--r-- | epan/dissectors/packet-isis-lsp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 1f14a7b849..705f1b2b9c 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1920,51 +1920,51 @@ isis_register_lsp(int proto_isis) { static hf_register_info hf[] = { { &hf_isis_lsp_pdu_length, { "PDU length", "isis.lsp.pdu_length", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_remaining_life, { "Remaining lifetime", "isis.lsp.remaining_life", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_lsp_id, { "LSP-ID", "isis.lsp.lsp_id", FT_STRING, - BASE_NONE, NULL, 0x0, "", HFILL }}, + BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_hostname, { "Hostname", "isis.lsp.hostname", FT_STRING, - BASE_NONE, NULL, 0x0, "", HFILL }}, + BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_sequence_number, { "Sequence number", "isis.lsp.sequence_number", - FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_checksum, { "Checksum", "isis.lsp.checksum",FT_UINT16, - BASE_HEX, NULL, 0x0, "", HFILL }}, + BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_checksum_good, { "Good Checksum", "isis.lsp.checksum_good", FT_BOOLEAN, BASE_NONE, - NULL, 0, "Good IS-IS LSP Checksum", HFILL }}, + NULL, 0x0, "Good IS-IS LSP Checksum", HFILL }}, { &hf_isis_lsp_checksum_bad, { "Bad Checksum", "isis.lsp.checksum_bad", FT_BOOLEAN, BASE_NONE, - NULL, 0, "Bad IS-IS LSP Checksum", HFILL }}, + NULL, 0x0, "Bad IS-IS LSP Checksum", HFILL }}, { &hf_isis_lsp_clv_ipv4_int_addr, { "IPv4 interface address", "isis.lsp.clv_ipv4_int_addr", FT_IPv4, - BASE_NONE, NULL, 0x0, "", HFILL }}, + BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_clv_ipv6_int_addr, { "IPv6 interface address", "isis.lsp.clv_ipv6_int_addr", FT_IPv6, - BASE_NONE, NULL, 0x0, "", HFILL }}, + BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_clv_te_router_id, { "Traffic Engineering Router ID", "isis.lsp.clv_te_router_id", FT_IPv4, - BASE_NONE, NULL, 0x0, "", HFILL }}, + BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_clv_mt, - { "MT-ID ", "isis.lsp.clv_mt", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MT-ID", "isis.lsp.clv_mt", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_isis_lsp_p, { "Partition Repair", "isis.lsp.partition_repair", FT_BOOLEAN, 8, @@ -1974,7 +1974,7 @@ isis_register_lsp(int proto_isis) { { &hf_isis_lsp_att, { "Attachment", "isis.lsp.att", FT_UINT8, BASE_DEC, NULL, ISIS_LSP_ATT_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_isis_lsp_hippity, { "Overload bit", "isis.lsp.overload", FT_BOOLEAN, 8, @@ -1984,7 +1984,7 @@ isis_register_lsp(int proto_isis) { { &hf_isis_lsp_is_type, { "Type of Intermediate System", "isis.lsp.is_type", FT_UINT8, BASE_DEC, VALS(isis_lsp_istype_vals), ISIS_LSP_IS_TYPE_MASK, - "", HFILL }} + NULL, HFILL }} }; static gint *ett[] = { &ett_isis_lsp, |