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-nhrp.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-nhrp.c')
| -rw-r--r-- | epan/dissectors/packet-nhrp.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 97ad1dcbe2..0b2b16e7fa 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -881,48 +881,48 @@ proto_register_nhrp(void) static hf_register_info hf[] = { { &hf_nhrp_hdr_afn, - { "Address Family Number", "nhrp.hdr.afn", FT_UINT16, BASE_HEX_DEC, VALS(afn_vals), 0x0, "", HFILL }}, + { "Address Family Number", "nhrp.hdr.afn", FT_UINT16, BASE_HEX_DEC, VALS(afn_vals), 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_pro_type, - { "Protocol Type (short form)", "nhrp.hdr.pro.type",FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "", HFILL }}, + { "Protocol Type (short form)", "nhrp.hdr.pro.type",FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_pro_snap_oui, - { "Protocol Type (long form) - OUI", "nhrp.hdr.pro.snap.oui",FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, "", HFILL }}, + { "Protocol Type (long form) - OUI", "nhrp.hdr.pro.snap.oui",FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_pro_snap_pid, - { "Protocol Type (long form) - PID", "nhrp.hdr.pro.snap.pid",FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Protocol Type (long form) - PID", "nhrp.hdr.pro.snap.pid",FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_hopcnt, - { "Hop Count", "nhrp.hdr.hopcnt", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Hop Count", "nhrp.hdr.hopcnt", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_pktsz, - { "Packet Length", "nhrp.hdr.pktsz", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Packet Length", "nhrp.hdr.pktsz", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_chksum, - { "Packet Checksum", "nhrp.hdr.chksum", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Packet Checksum", "nhrp.hdr.chksum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_extoff, - { "Extension Offset", "nhrp.hdr.extoff", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Extension Offset", "nhrp.hdr.extoff", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_version, - { "Version", "nhrp.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Version", "nhrp.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_op_type, - { "NHRP Packet Type", "nhrp.hdr.op.type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NHRP Packet Type", "nhrp.hdr.op.type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_shtl, - { "Source Address Type/Len", "nhrp.hdr.shtl", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Source Address Type/Len", "nhrp.hdr.shtl", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_shtl_type, - { "Type", "nhrp.hdr.shtl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }}, + { "Type", "nhrp.hdr.shtl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }}, { &hf_nhrp_hdr_shtl_len, - { "Length", "nhrp.hdr.shtl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }}, + { "Length", "nhrp.hdr.shtl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }}, { &hf_nhrp_hdr_sstl, - { "Source SubAddress Type/Len", "nhrp.hdr.sstl", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Source SubAddress Type/Len", "nhrp.hdr.sstl", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_hdr_sstl_type, - { "Type", "nhrp.hdr.sstl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }}, + { "Type", "nhrp.hdr.sstl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }}, { &hf_nhrp_hdr_sstl_len, - { "Length", "nhrp.hdr.sstl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }}, + { "Length", "nhrp.hdr.sstl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }}, { &hf_nhrp_src_proto_len, - { "Source Protocol Len", "nhrp.src.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Source Protocol Len", "nhrp.src.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_dst_proto_len, - { "Destination Protocol Len", "nhrp.dst.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Destination Protocol Len", "nhrp.dst.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_flags, - { "Flags", "nhrp.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Flags", "nhrp.flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_flag_Q, - { "Is Router", "nhrp.flag.q", FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }}, + { "Is Router", "nhrp.flag.q", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }}, { &hf_nhrp_flag_N, - { "Expected Purge Reply", "nhrp.flag.n", FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }}, + { "Expected Purge Reply", "nhrp.flag.n", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }}, { &hf_nhrp_flag_A, { "Authoritative", "nhrp.flag.a", FT_BOOLEAN, 16, NULL, 0x4000, "A bit", HFILL }}, { &hf_nhrp_flag_D, @@ -936,62 +936,62 @@ proto_register_nhrp(void) { &hf_nhrp_flag_NAT, { "Cisco NAT Supported", "nhrp.flag.nat", FT_BOOLEAN, 16, NULL, 0x0002, "NAT bit", HFILL }}, { &hf_nhrp_request_id, - { "Request ID", "nhrp.reqid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "", HFILL }}, + { "Request ID", "nhrp.reqid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_src_nbma_addr, - { "Source NBMA Address", "nhrp.src.nbma.addr",FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Source NBMA Address", "nhrp.src.nbma.addr",FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_src_nbma_saddr, - { "Source NBMA Sub Address", "nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Source NBMA Sub Address", "nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_src_prot_addr, - { "Source Protocol Address", "nhrp.src.prot.addr",FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Source Protocol Address", "nhrp.src.prot.addr",FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_dst_prot_addr, - { "Destination Protocol Address", "nhrp.dst.prot.addr",FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Destination Protocol Address", "nhrp.dst.prot.addr",FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_code, - { "Code", "nhrp.code", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Code", "nhrp.code", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_prefix_len, - { "Prefix Length", "nhrp.prefix", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Prefix Length", "nhrp.prefix", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_unused, - { "Unused", "nhrp.unused", FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Unused", "nhrp.unused", FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_mtu, - { "Max Transmission Unit", "nhrp.mtu", FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Max Transmission Unit", "nhrp.mtu", FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_holding_time, - { "Holding Time (s)", "nhrp.htime", FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Holding Time (s)", "nhrp.htime", FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_cli_addr_tl, - { "Client Address Type/Len", "nhrp.cli.addr_tl", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Client Address Type/Len", "nhrp.cli.addr_tl", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_cli_addr_tl_type, - { "Type", "nhrp.cli.addr_tl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }}, + { "Type", "nhrp.cli.addr_tl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }}, { &hf_nhrp_cli_addr_tl_len, - { "Length", "nhrp.cli.addr_tl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }}, + { "Length", "nhrp.cli.addr_tl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }}, { &hf_nhrp_cli_saddr_tl, - { "Client Sub Address Type/Len","nhrp.cli.saddr_tl", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Client Sub Address Type/Len","nhrp.cli.saddr_tl", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_cli_saddr_tl_type, - { "Type", "nhrp.cli.saddr_tl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }}, + { "Type", "nhrp.cli.saddr_tl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }}, { &hf_nhrp_cli_saddr_tl_len, - { "Length", "nhrp.cli.saddr_tl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }}, + { "Length", "nhrp.cli.saddr_tl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }}, { &hf_nhrp_cli_prot_len, - { "Client Protocol Length", "nhrp.prot.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Client Protocol Length", "nhrp.prot.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_pref, - { "CIE Preference Value", "nhrp.pref", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "CIE Preference Value", "nhrp.pref", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_client_nbma_addr, - { "Client NBMA Address", "nhrp.client.nbma.addr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Client NBMA Address", "nhrp.client.nbma.addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_client_nbma_saddr, - { "Client NBMA Sub Address", "nhrp.client.nbma.saddr",FT_UINT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Client NBMA Sub Address", "nhrp.client.nbma.saddr",FT_UINT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_client_prot_addr, - { "Client Protocol Address", "nhrp.client.prot.addr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Client Protocol Address", "nhrp.client.prot.addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_ext_C, - { "Compulsory Flag", "nhrp.ext.c", FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }}, + { "Compulsory Flag", "nhrp.ext.c", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }}, { &hf_nhrp_ext_type, - { "Extension Type", "nhrp.ext.type", FT_UINT16, BASE_HEX, NULL, 0x3FFF, "", HFILL }}, + { "Extension Type", "nhrp.ext.type", FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL }}, { &hf_nhrp_ext_len, - { "Extension length", "nhrp.ext.len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Extension length", "nhrp.ext.len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_ext_value, - { "Extension Value", "nhrp.ext.val", FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Extension Value", "nhrp.ext.val", FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_error_offset, - { "Error Offset", "nhrp.err.offset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Error Offset", "nhrp.err.offset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_nhrp_error_packet, - { "Errored Packet", "nhrp.err.pkt", FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Errored Packet", "nhrp.err.pkt", FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }}, }; static gint *ett[] = { |