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-nlsp.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-nlsp.c')
| -rw-r--r-- | epan/dissectors/packet-nlsp.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index b5a423854c..280f2bbeaa 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -1541,36 +1541,36 @@ proto_register_nlsp(void) static hf_register_info hf[] = { { &hf_nlsp_irpd, { "NetWare Link Services Protocol Discriminator", "nlsp.irpd", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_header_length, { "PDU Header Length", "nlsp.header_length", - FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_minor_version, { "Minor Version", "nlsp.minor_version", FT_UINT8, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_nr, { "Multi-homed Non-routing Server", "nlsp.nr", FT_BOOLEAN, 8, - NULL, 0x80, "", HFILL }}, + NULL, 0x80, NULL, HFILL }}, { &hf_nlsp_type, { "Packet Type", "nlsp.type", FT_UINT8, BASE_DEC, - VALS(nlsp_packet_type_vals), PACKET_TYPE_MASK, "", HFILL }}, + VALS(nlsp_packet_type_vals), PACKET_TYPE_MASK, NULL, HFILL }}, { &hf_nlsp_major_version, { "Major Version", "nlsp.major_version", FT_UINT8, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_packet_length, { "Packet Length", "nlsp.packet_length", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_hello_state, { "State", "nlsp.hello.state", FT_UINT8, BASE_DEC, VALS(nlsp_hello_state_vals), NLSP_HELLO_STATE_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_nlsp_hello_multicast, { "Multicast Routing", "nlsp.hello.multicast", FT_BOOLEAN, 8, @@ -1580,24 +1580,24 @@ proto_register_nlsp(void) { &hf_nlsp_hello_circuit_type, { "Circuit Type", "nlsp.hello.circuit_type", FT_UINT8, BASE_DEC, VALS(nlsp_hello_circuit_type_vals), NLSP_HELLO_CTYPE_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_nlsp_hello_holding_timer, { "Holding Timer", "nlsp.hello.holding_timer", FT_UINT8, BASE_DEC, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_hello_priority, { "Priority", "nlsp.hello.priority", FT_UINT8, BASE_DEC, NULL, NLSP_HELLO_PRIORITY_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_nlsp_lsp_sequence_number, { "Sequence Number", "nlsp.sequence_number", - FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_lsp_checksum, { "Checksum", "nlsp.lsp.checksum", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nlsp_lsp_p, { "Partition Repair", "nlsp.lsp.partition_repair", FT_BOOLEAN, 8, @@ -1606,16 +1606,16 @@ proto_register_nlsp(void) { &hf_nlsp_lsp_attached_flag, { "Attached Flag", "nlsp.lsp.attached_flag", FT_UINT8, BASE_DEC, - VALS(nlsp_attached_flag_vals), NLSP_LSP_ATT_MASK, "", HFILL }}, + VALS(nlsp_attached_flag_vals), NLSP_LSP_ATT_MASK, NULL, HFILL }}, { &hf_nlsp_lsp_lspdbol, { "LSP Database Overloaded", "nlsp.lsp.lspdbol", FT_BOOLEAN, 8, - NULL, NLSP_LSP_OVERFLOW_MASK, "", HFILL }}, + NULL, NLSP_LSP_OVERFLOW_MASK, NULL, HFILL }}, { &hf_nlsp_lsp_router_type, { "Router Type", "nlsp.lsp.router_type", FT_UINT8, BASE_DEC, VALS(nlsp_router_type_vals), NLSP_LSP_ROUTER_TYPE_MASK, - "", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { &ett_nlsp, |