diff options
author | Michael Mann <mmann78@netscape.net> | 2012-07-25 12:19:21 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2012-07-25 12:19:21 +0000 |
commit | 6d06ea6062f55cf562764fdf986a8b462d379d89 (patch) | |
tree | 96e7c5f539c26f1f3d00ce14a53b1ed1bf5c4756 /epan | |
parent | f4f8e88ae9434a45fe4db2ec1c1f5c32dd232704 (diff) |
Converted ZigBee dissectors display filter format from zbee.<protocol> to zbee_<protocol>
Also corrected zbee_afp filters as they were incorrectly using zbee.app
svn path=/trunk/; revision=43990
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-zbee-aps.c | 88 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 134 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-zcl.c | 98 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 172 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee.h | 6 |
5 files changed, 249 insertions, 249 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 1e37562abb..11f7f3f5cc 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1762,183 +1762,183 @@ void proto_register_zbee_aps(void) { static hf_register_info hf[] = { { &hf_zbee_aps_fcf_frame_type, - { "Frame Type", "zbee.aps.type", FT_UINT8, BASE_HEX, VALS(zbee_aps_frame_types), ZBEE_APS_FCF_FRAME_TYPE, + { "Frame Type", "zbee_aps.type", FT_UINT8, BASE_HEX, VALS(zbee_aps_frame_types), ZBEE_APS_FCF_FRAME_TYPE, NULL, HFILL }}, { &hf_zbee_aps_fcf_delivery, - { "Delivery Mode", "zbee.aps.delivery", FT_UINT8, BASE_HEX, VALS(zbee_aps_delivery_modes), ZBEE_APS_FCF_DELIVERY_MODE, + { "Delivery Mode", "zbee_aps.delivery", FT_UINT8, BASE_HEX, VALS(zbee_aps_delivery_modes), ZBEE_APS_FCF_DELIVERY_MODE, NULL, HFILL }}, { &hf_zbee_aps_fcf_indirect_mode, - { "Indirect Address Mode", "zbee.aps.indirect_mode", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_INDIRECT_MODE, + { "Indirect Address Mode", "zbee_aps.indirect_mode", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_INDIRECT_MODE, NULL, HFILL }}, { &hf_zbee_aps_fcf_ack_format, - { "Acknowledgement Format", "zbee.aps.ack_format", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_ACK_FORMAT, + { "Acknowledgement Format", "zbee_aps.ack_format", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_ACK_FORMAT, NULL, HFILL }}, { &hf_zbee_aps_fcf_security, - { "Security", "zbee.aps.security", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_SECURITY, + { "Security", "zbee_aps.security", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_SECURITY, "Whether security operations are performed on the APS payload.", HFILL }}, { &hf_zbee_aps_fcf_ack_req, - { "Acknowledgement Request","zbee.aps.ack_req", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_ACK_REQ, + { "Acknowledgement Request","zbee_aps.ack_req", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_ACK_REQ, "Flag requesting an acknowledgement frame for this packet.", HFILL }}, { &hf_zbee_aps_fcf_ext_header, - { "Extended Header", "zbee.aps.ext_header", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_EXT_HEADER, + { "Extended Header", "zbee_aps.ext_header", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_EXT_HEADER, NULL, HFILL }}, { &hf_zbee_aps_dst, - { "Destination Endpoint", "zbee.aps.dst", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Destination Endpoint", "zbee_aps.dst", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_group, - { "Group", "zbee.aps.group", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Group", "zbee_aps.group", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_cluster, - { "Cluster", "zbee.aps.cluster", FT_UINT16, BASE_HEX, + { "Cluster", "zbee_aps.cluster", FT_UINT16, BASE_HEX, VALS(zbee_aps_cid_names), 0x0, NULL, HFILL }}, { &hf_zbee_aps_profile, - { "Profile", "zbee.aps.profile", FT_UINT16, BASE_HEX | BASE_RANGE_STRING, + { "Profile", "zbee_aps.profile", FT_UINT16, BASE_HEX | BASE_RANGE_STRING, RVALS(zbee_aps_apid_names), 0x0, NULL, HFILL }}, { &hf_zbee_aps_src, - { "Source Endpoint", "zbee.aps.src", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Source Endpoint", "zbee_aps.src", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_counter, - { "Counter", "zbee.aps.counter", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Counter", "zbee_aps.counter", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragmentation, - { "Fragmentation", "zbee.aps.fragmentation", FT_UINT8, BASE_HEX, VALS(zbee_aps_fragmentation_modes), ZBEE_APS_EXT_FCF_FRAGMENT, + { "Fragmentation", "zbee_aps.fragmentation", FT_UINT8, BASE_HEX, VALS(zbee_aps_fragmentation_modes), ZBEE_APS_EXT_FCF_FRAGMENT, NULL, HFILL }}, { &hf_zbee_aps_block_number, - { "Block Number", "zbee.aps.block", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Block Number", "zbee_aps.block", FT_UINT8, BASE_DEC, NULL, 0x0, "A block identifier within a fragmented transmission, or the number of expected blocks if the first block.", HFILL }}, { &hf_zbee_aps_cmd_id, - { "Command Identifier", "zbee.aps.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_aps_cmd_names), 0x0, + { "Command Identifier", "zbee_aps.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_aps_cmd_names), 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_initiator, - { "Initiator Address", "zbee.aps.cmd.initiator", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Initiator Address", "zbee_aps.cmd.initiator", FT_EUI64, BASE_NONE, NULL, 0x0, "The extended address of the device to initiate the SKKE procedure", HFILL }}, { &hf_zbee_aps_cmd_responder, - { "Responder Address", "zbee.aps.cmd.responder", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Responder Address", "zbee_aps.cmd.responder", FT_EUI64, BASE_NONE, NULL, 0x0, "The extended address of the device responding to the SKKE procedure", HFILL }}, { &hf_zbee_aps_cmd_partner, - { "Partner Address", "zbee.aps.cmd.partner", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Partner Address", "zbee_aps.cmd.partner", FT_EUI64, BASE_NONE, NULL, 0x0, "The partner to use this key with for link-level security.", HFILL }}, { &hf_zbee_aps_cmd_initiator_flag, - { "Initiator", "zbee.aps.cmd.init_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Initiator", "zbee_aps.cmd.init_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Inidicates the destination of the transport-key command requested this key.", HFILL }}, { &hf_zbee_aps_cmd_device, - { "Device Address", "zbee.aps.cmd.device", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Device Address", "zbee_aps.cmd.device", FT_EUI64, BASE_NONE, NULL, 0x0, "The device whose status is being updated.", HFILL }}, { &hf_zbee_aps_cmd_challenge, - { "Challenge", "zbee.aps.cmd.challenge", FT_BYTES, BASE_NONE, 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_NONE, 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_NONE, NULL, 0x0, + { "Key", "zbee_aps.cmd.key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_key_type, - { "Key Type", "zbee.aps.cmd.key_type", FT_UINT8, BASE_HEX, + { "Key Type", "zbee_aps.cmd.key_type", FT_UINT8, BASE_HEX, VALS(zbee_aps_key_names), 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_dst, - { "Extended Destination", "zbee.aps.cmd.dst", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Destination", "zbee_aps.cmd.dst", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_src, - { "Extended Source", "zbee.aps.cmd.src", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Source", "zbee_aps.cmd.src", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_seqno, - { "Sequence Number", "zbee.aps.cmd.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Sequence Number", "zbee_aps.cmd.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, "The key sequence number associated with the network key.", HFILL }}, { &hf_zbee_aps_cmd_short_addr, - { "Device Address", "zbee.aps.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Device Address", "zbee_aps.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0, "The device whose status is being updated.", HFILL }}, { &hf_zbee_aps_cmd_device_status, - { "Device Status", "zbee.aps.cmd.status", FT_UINT8, BASE_HEX, + { "Device Status", "zbee_aps.cmd.status", FT_UINT8, BASE_HEX, VALS(zbee_aps_update_status_names), 0x0, "Update device status.", HFILL }}, { &hf_zbee_aps_cmd_ea_key_type, - { "Key Type", "zbee.aps.cmd.ea.key_type", FT_UINT8, BASE_HEX, + { "Key Type", "zbee_aps.cmd.ea.key_type", FT_UINT8, BASE_HEX, VALS(zbee_aps_ea_key_names), 0x0, NULL, HFILL }}, { &hf_zbee_aps_cmd_ea_data, - { "Data", "zbee.aps.cmd.ea.data", FT_BYTES, BASE_NONE, 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, - { "Message fragments", "zbee.aps.fragments", FT_NONE, BASE_NONE, NULL, 0x0, + { "Message fragments", "zbee_aps.fragments", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment, - { "Message fragment", "zbee.aps.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, + { "Message fragment", "zbee_aps.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_overlap, - { "Message fragment overlap", "zbee.aps.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Message fragment overlap", "zbee_aps.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_overlap_conflicts, - { "Message fragment overlapping with conflicting data", "zbee.aps.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Message fragment overlapping with conflicting data", "zbee_aps.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_multiple_tails, - { "Message has multiple tail fragments", "zbee.aps.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Message has multiple tail fragments", "zbee_aps.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_too_long_fragment, - { "Message fragment too long", "zbee.aps.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Message fragment too long", "zbee_aps.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_error, - { "Message defragmentation error", "zbee.aps.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, + { "Message defragmentation error", "zbee_aps.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_fragment_count, - { "Message fragment count", "zbee.aps.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Message fragment count", "zbee_aps.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_reassembled_in, - { "Reassembled in", "zbee.aps.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, + { "Reassembled in", "zbee_aps.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_aps_reassembled_length, - { "Reassembled ZigBee APS length", "zbee.aps.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled ZigBee APS length", "zbee_aps.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }} }; static hf_register_info hf_apf[] = { { &hf_zbee_apf_count, - { "Count", "zbee.app.count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Count", "zbee_apf.count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_apf_type, - { "Type", "zbee.app.type", FT_UINT8, BASE_HEX, + { "Type", "zbee_apf.type", FT_UINT8, BASE_HEX, VALS(zbee_apf_type_names), 0x0, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index fc9a2cd31e..4fd9c24418 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1533,280 +1533,280 @@ void proto_register_zbee_nwk(void) static hf_register_info hf[] = { { &hf_zbee_nwk_frame_type, - { "Frame Type", "zbee.nwk.frame_type", FT_UINT16, BASE_HEX, VALS(zbee_nwk_frame_types), + { "Frame Type", "zbee_nwk.frame_type", FT_UINT16, BASE_HEX, VALS(zbee_nwk_frame_types), ZBEE_NWK_FCF_FRAME_TYPE, NULL, HFILL }}, { &hf_zbee_nwk_proto_version, - { "Protocol Version", "zbee.nwk.proto_version", FT_UINT16, BASE_DEC, NULL, ZBEE_NWK_FCF_VERSION, + { "Protocol Version", "zbee_nwk.proto_version", FT_UINT16, BASE_DEC, NULL, ZBEE_NWK_FCF_VERSION, NULL, HFILL }}, { &hf_zbee_nwk_discover_route, - { "Discover Route", "zbee.nwk.discovery", FT_UINT16, BASE_HEX, VALS(zbee_nwk_discovery_modes), + { "Discover Route", "zbee_nwk.discovery", FT_UINT16, BASE_HEX, VALS(zbee_nwk_discovery_modes), ZBEE_NWK_FCF_DISCOVER_ROUTE, "Determines how route discovery may be handled, if at all.", HFILL }}, { &hf_zbee_nwk_multicast, - { "Multicast", "zbee.nwk.multicast", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_MULTICAST, + { "Multicast", "zbee_nwk.multicast", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_MULTICAST, NULL, HFILL }}, { &hf_zbee_nwk_security, - { "Security", "zbee.nwk.security", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SECURITY, + { "Security", "zbee_nwk.security", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SECURITY, "Whether or not security operations are performed on the network payload.", HFILL }}, { &hf_zbee_nwk_source_route, - { "Source Route", "zbee.nwk.src_route", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SOURCE_ROUTE, + { "Source Route", "zbee_nwk.src_route", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SOURCE_ROUTE, NULL, HFILL }}, { &hf_zbee_nwk_ext_dst, - { "Destination", "zbee.nwk.ext_dst", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_DEST, + { "Destination", "zbee_nwk.ext_dst", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_DEST, NULL, HFILL }}, { &hf_zbee_nwk_ext_src, - { "Extended Source", "zbee.nwk.ext_src", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_SOURCE, + { "Extended Source", "zbee_nwk.ext_src", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_SOURCE, NULL, HFILL }}, { &hf_zbee_nwk_dst, - { "Destination", "zbee.nwk.dst", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Destination", "zbee_nwk.dst", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_src, - { "Source", "zbee.nwk.src", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Source", "zbee_nwk.src", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_radius, - { "Radius", "zbee.nwk.radius", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Radius", "zbee_nwk.radius", FT_UINT8, BASE_DEC, NULL, 0x0, "Number of hops remaining for a range-limited broadcast packet.", HFILL }}, { &hf_zbee_nwk_seqno, - { "Sequence Number", "zbee.nwk.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Sequence Number", "zbee_nwk.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_mcast_mode, - { "Multicast Mode", "zbee.nwk.multicast.mode", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_MODE, + { "Multicast Mode", "zbee_nwk.multicast.mode", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_MODE, "Controls whether this packet is permitted to be routed through non-members of the multicast group.", HFILL }}, { &hf_zbee_nwk_mcast_radius, - { "Non-Member Radius", "zbee.nwk.multicast.radius", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_RADIUS, + { "Non-Member Radius", "zbee_nwk.multicast.radius", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_RADIUS, "Limits the range of multicast packets when being routed through non-members.", HFILL }}, { &hf_zbee_nwk_mcast_max_radius, - { "Max Non-Member Radius", "zbee.nwk.multicast.max_radius", FT_UINT8, BASE_DEC, NULL, + { "Max Non-Member Radius", "zbee_nwk.multicast.max_radius", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_MAX_RADIUS, NULL, HFILL }}, { &hf_zbee_nwk_dst64, - { "Destination", "zbee.nwk.dst64", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Destination", "zbee_nwk.dst64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_src64, - { "Extended Source", "zbee.nwk.src64", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Source", "zbee_nwk.src64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_src64_origin, - { "Origin", "zbee.nwk.src64.origin", FT_FRAMENUM, BASE_NONE, NULL, 0x0, + { "Origin", "zbee_nwk.src64.origin", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_relay_count, - { "Relay Count", "zbee.nwk.relay.count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Relay Count", "zbee_nwk.relay.count", FT_UINT8, BASE_DEC, NULL, 0x0, "Number of entries in the relay list.", HFILL }}, { &hf_zbee_nwk_relay_index, - { "Relay Index", "zbee.nwk.relay.index", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Relay Index", "zbee_nwk.relay.index", FT_UINT8, BASE_DEC, NULL, 0x0, "Number of relays required to route to the source device.", HFILL }}, { &hf_zbee_nwk_cmd_id, - { "Command Identifier", "zbee.nwk.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_nwk_cmd_names), 0x0, + { "Command Identifier", "zbee_nwk.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_nwk_cmd_names), 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_addr, - { "Address", "zbee.nwk.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Address", "zbee_nwk.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_id, - { "Route ID", "zbee.nwk.cmd.route.id", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Route ID", "zbee_nwk.cmd.route.id", FT_UINT8, BASE_DEC, NULL, 0x0, "A sequence number for routing commands.", HFILL }}, { &hf_zbee_nwk_cmd_route_dest, - { "Destination", "zbee.nwk.cmd.route.dest", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Destination", "zbee_nwk.cmd.route.dest", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_orig, - { "Originator", "zbee.nwk.cmd.route.orig", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Originator", "zbee_nwk.cmd.route.orig", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_resp, - { "Responder", "zbee.nwk.cmd.route.resp", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Responder", "zbee_nwk.cmd.route.resp", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_dest_ext, - { "Extended Destination", "zbee.nwk.cmd.route.dest_ext", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Destination", "zbee_nwk.cmd.route.dest_ext", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_orig_ext, - { "Extended Originator", "zbee.nwk.cmd.route.orig_ext", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Originator", "zbee_nwk.cmd.route.orig_ext", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_resp_ext, - { "Extended Responder", "zbee.nwk.cmd.route.resp_ext", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Responder", "zbee_nwk.cmd.route.resp_ext", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_cost, - { "Path Cost", "zbee.nwk.cmd.route.cost", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Path Cost", "zbee_nwk.cmd.route.cost", FT_UINT8, BASE_DEC, NULL, 0x0, "A value specifying the efficiency of this route.", HFILL }}, { &hf_zbee_nwk_cmd_route_opt_repair, - { "Route Repair", "zbee.nwk.cmd.route.opts.repair", FT_BOOLEAN, 8, NULL, + { "Route Repair", "zbee_nwk.cmd.route.opts.repair", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_REPAIR, "Flag identifying whether the route request command was to repair a failed route.", HFILL }}, { &hf_zbee_nwk_cmd_route_opt_multicast, - { "Multicast", "zbee.nwk.cmd.route.opts.mcast", FT_BOOLEAN, 8, NULL, + { "Multicast", "zbee_nwk.cmd.route.opts.mcast", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_MCAST, "Flag identifying this as a multicast route request.", HFILL }}, { &hf_zbee_nwk_cmd_route_opt_dest_ext, - { "Extended Destination", "zbee.nwk.cmd.route.opts.dest_ext", FT_BOOLEAN, 8, NULL, + { "Extended Destination", "zbee_nwk.cmd.route.opts.dest_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_DEST_EXT, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_opt_resp_ext, - { "Extended Responder", "zbee.nwk.cmd.route.opts.resp_ext", FT_BOOLEAN, 8, NULL, + { "Extended Responder", "zbee_nwk.cmd.route.opts.resp_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_RESP_EXT, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_opt_orig_ext, - { "Extended Originator", "zbee.nwk.cmd.route.opts.orig_ext", FT_BOOLEAN, 8, NULL, + { "Extended Originator", "zbee_nwk.cmd.route.opts.orig_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_ORIG_EXT, NULL, HFILL }}, { &hf_zbee_nwk_cmd_route_opt_many_to_one, - { "Many-to-One Discovery", "zbee.nwk.cmd.route.opts.many2one", FT_UINT8, BASE_HEX, + { "Many-to-One Discovery", "zbee_nwk.cmd.route.opts.many2one", FT_UINT8, BASE_HEX, VALS(zbee_nwk_cmd_route_many_modes), ZBEE_NWK_CMD_ROUTE_OPTION_MANY_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_nwk_status, - { "Status Code", "zbee.nwk.cmd.status", FT_UINT8, BASE_HEX, VALS(zbee_nwk_status_codes), 0x0, + { "Status Code", "zbee_nwk.cmd.status", FT_UINT8, BASE_HEX, VALS(zbee_nwk_status_codes), 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_leave_rejoin, - { "Rejoin", "zbee.nwk.cmd.leave.rejoin", FT_BOOLEAN, 8, NULL, + { "Rejoin", "zbee_nwk.cmd.leave.rejoin", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LEAVE_OPTION_REJOIN, "Flag instructing the device to rejoin the network.", HFILL }}, { &hf_zbee_nwk_cmd_leave_request, - { "Request", "zbee.nwk.cmd.leave.request", FT_BOOLEAN, 8, NULL, + { "Request", "zbee_nwk.cmd.leave.request", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LEAVE_OPTION_REQUEST, "Flag identifying the direction of this command. 1=Request, 0=Indication", HFILL }}, { &hf_zbee_nwk_cmd_leave_children, - { "Remove Children", "zbee.nwk.cmd.leave.children", FT_BOOLEAN, 8, NULL, + { "Remove Children", "zbee_nwk.cmd.leave.children", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LEAVE_OPTION_CHILDREN, "Flag instructing the device to remove its children in addition to itself.", HFILL }}, { &hf_zbee_nwk_cmd_relay_count, - { "Relay Count", "zbee.nwk.cmd.relay_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Relay Count", "zbee_nwk.cmd.relay_count", FT_UINT8, BASE_DEC, NULL, 0x0, "Number of relays required to route to the destination.", HFILL }}, { &hf_zbee_nwk_cmd_cinfo_alt_coord, - { "Alternate Coordinator", "zbee.nwk.cmd.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, + { "Alternate Coordinator", "zbee_nwk.cmd.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALT_PAN_COORD, "Indicates that the device is able to operate as a PAN coordinator.", HFILL }}, { &hf_zbee_nwk_cmd_cinfo_type, - { "Full-Function Device", "zbee.nwk.cmd.cinfo.ffd", FT_BOOLEAN, 8, NULL, + { "Full-Function Device", "zbee_nwk.cmd.cinfo.ffd", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_DEVICE_TYPE, NULL, HFILL }}, { &hf_zbee_nwk_cmd_cinfo_power, - { "AC Power", "zbee.nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL, + { "AC Power", "zbee_nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_POWER_SRC, "Indicates this device is using AC/Mains power.", HFILL }}, { &hf_zbee_nwk_cmd_cinfo_idle_rx, - { "Rx On When Idle", "zbee.nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL, + { "Rx On When Idle", "zbee_nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_IDLE_RX, "Indicates the receiver is active when the device is idle.", HFILL }}, { &hf_zbee_nwk_cmd_cinfo_security, - { "Security Capability", "zbee.nwk.cmd.cinfo.security", FT_BOOLEAN, 8, NULL, + { "Security Capability", "zbee_nwk.cmd.cinfo.security", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_SEC_CAPABLE, "Indicates this device is capable of performing encryption/decryption.", HFILL }}, { &hf_zbee_nwk_cmd_cinfo_alloc, - { "Allocate Short Address", "zbee.nwk.cmd.cinfo.alloc", FT_BOOLEAN, 8, NULL, + { "Allocate Short Address", "zbee_nwk.cmd.cinfo.alloc", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALLOC_ADDR, "Flag requesting the parent to allocate a short address for this device.", HFILL }}, { &hf_zbee_nwk_cmd_rejoin_status, - { "Status", "zbee.nwk.cmd.rejoin_status", FT_UINT8, BASE_HEX, + { "Status", "zbee_nwk.cmd.rejoin_status", FT_UINT8, BASE_HEX, VALS(zbee_nwk_rejoin_codes), 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_link_last, - { "Last Frame", "zbee.nwk.cmd.link.last", FT_BOOLEAN, 8, NULL, + { "Last Frame", "zbee_nwk.cmd.link.last", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LINK_OPTION_LAST_FRAME, "Flag indicating the last in a series of link status commands.", HFILL }}, { &hf_zbee_nwk_cmd_link_first, - { "First Frame", "zbee.nwk.cmd.link.first", FT_BOOLEAN, 8, NULL, + { "First Frame", "zbee_nwk.cmd.link.first", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LINK_OPTION_FIRST_FRAME, "Flag indicating the first in a series of link status commands.", HFILL }}, { &hf_zbee_nwk_cmd_link_count, - { "Link Status Count", "zbee.nwk.cmd.link.count", FT_UINT8, BASE_DEC, NULL, + { "Link Status Count", "zbee_nwk.cmd.link.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_LINK_OPTION_COUNT_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_report_type, - { "Report Type", "zbee.nwk.cmd.report.type", FT_UINT8, BASE_HEX, + { "Report Type", "zbee_nwk.cmd.report.type", FT_UINT8, BASE_HEX, VALS(zbee_nwk_report_types), ZBEE_NWK_CMD_NWK_REPORT_ID_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_report_count, - { "Report Information Count", "zbee.nwk.cmd.report.count", FT_UINT8, BASE_DEC, NULL, + { "Report Information Count", "zbee_nwk.cmd.report.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_NWK_REPORT_COUNT_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_update_type, - { "Update Type", "zbee.nwk.cmd.update.type", FT_UINT8, BASE_HEX, + { "Update Type", "zbee_nwk.cmd.update.type", FT_UINT8, BASE_HEX, VALS(zbee_nwk_update_types), ZBEE_NWK_CMD_NWK_UPDATE_ID_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_update_count, - { "Update Information Count", "zbee.nwk.cmd.update.count", FT_UINT8, BASE_DEC, NULL, + { "Update Information Count", "zbee_nwk.cmd.update.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_NWK_UPDATE_COUNT_MASK, NULL, HFILL }}, { &hf_zbee_nwk_cmd_update_id, - { "Update ID", "zbee.nwk.cmd.update.id", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Update ID", "zbee_nwk.cmd.update.id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_nwk_cmd_epid, - { "Extended PAN ID", "zbee.nwk.cmd.epid", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended PAN ID", "zbee_nwk.cmd.epid", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_beacon_protocol, - { "Protocol ID", "zbee.beacon.protocol", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Protocol ID", "zbee_beacon.protocol", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_beacon_stack_profile, - { "Stack Profile", "zbee.beacon.profile", FT_UINT8, BASE_HEX, + { "Stack Profile", "zbee_beacon.profile", FT_UINT8, BASE_HEX, VALS(zbee_nwk_stack_profiles), 0x0, NULL, HFILL }}, { &hf_zbee_beacon_version, - { "Protocol Version", "zbee.beacon.version", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Protocol Version", "zbee_beacon.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_beacon_router_capacity, - { "Router Capacity", "zbee.beacon.router", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Router Capacity", "zbee_beacon.router", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Whether the device can accept join requests from routing capable devices.", HFILL }}, { &hf_zbee_beacon_depth, - { "Device Depth", "zbee.beacon.depth", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Device Depth", "zbee_beacon.depth", FT_UINT8, BASE_DEC, NULL, 0x0, "The tree depth of the device, 0 indicates the network coordinator.", HFILL }}, { &hf_zbee_beacon_end_device_capacity, - { "End Device Capacity", "zbee.beacon.end_dev", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "End Device Capacity", "zbee_beacon.end_dev", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Whether the device can accept join requests from ZigBee end devices.", HFILL }}, { &hf_zbee_beacon_epid, - { "Extended PAN ID", "zbee.beacon.ext_panid", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended PAN ID", "zbee_beacon.ext_panid", FT_EUI64, BASE_NONE, NULL, 0x0, "Extended PAN identifier.", HFILL }}, { &hf_zbee_beacon_tx_offset, - { "Tx Offset", "zbee.beacon.tx_offset", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Tx Offset", "zbee_beacon.tx_offset", FT_UINT32, BASE_DEC, NULL, 0x0, "The time difference between a device and its parent's beacon.", HFILL }}, { &hf_zbee_beacon_update_id, - { "Update ID", "zbee.beacon.update_id", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Update ID", "zbee_beacon.update_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }} }; @@ -1831,7 +1831,7 @@ void proto_register_zbee_nwk(void) /* Register the dissectors with Wireshark. */ register_dissector(ZBEE_PROTOABBREV_NWK, dissect_zbee_nwk, proto_zbee_nwk); - register_dissector("zbee.beacon", dissect_zbee_beacon, proto_zbee_nwk); + register_dissector("zbee_beacon", dissect_zbee_beacon, proto_zbee_nwk); /* Register the Security dissector. */ zbee_security_register(NULL, proto_zbee_nwk); diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 8f8087ac34..e738c5063d 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2022,182 +2022,182 @@ void proto_register_zbee_zcl(void) static hf_register_info hf[] = { { &hf_zbee_zcl_fcf_frame_type, - { "Frame Type", "zbee.zcl.type", FT_UINT8, BASE_HEX, VALS(zbee_zcl_frame_types), + { "Frame Type", "zbee_zcl.type", FT_UINT8, BASE_HEX, VALS(zbee_zcl_frame_types), ZBEE_ZCL_FCF_FRAME_TYPE, NULL, HFILL }}, { &hf_zbee_zcl_fcf_mfr_spec, - { "Manufacturer Specific", "zbee.zcl.ms", FT_BOOLEAN, 8, NULL, + { "Manufacturer Specific", "zbee_zcl.ms", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_FCF_MFR_SPEC, NULL, HFILL }}, { &hf_zbee_zcl_fcf_dir, - { "Direction", "zbee.zcl.dir", FT_BOOLEAN, 8, TFS(&tfs_client_server), + { "Direction", "zbee_zcl.dir", FT_BOOLEAN, 8, TFS(&tfs_client_server), ZBEE_ZCL_FCF_DIRECTION, NULL, HFILL }}, { &hf_zbee_zcl_fcf_disable_default_resp, - { "Disable Default Response", "zbee.zcl.ddr", FT_BOOLEAN, 8, NULL, + { "Disable Default Response", "zbee_zcl.ddr", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_FCF_DISABLE_DEFAULT_RESP, NULL, HFILL }}, { &hf_zbee_zcl_mfr_code, - { "Manufacturer Code", "zbee.zcl.cmd.mc", FT_UINT16, BASE_HEX|BASE_EXT_STRING, + { "Manufacturer Code", "zbee_zcl.cmd.mc", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &zbee_mfr_code_names_ext, 0x0, "Assigned manufacturer code.", HFILL }}, { &hf_zbee_zcl_tran_seqno, - { "Sequence Number", "zbee.zcl.cmd.tsn", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Sequence Number", "zbee_zcl.cmd.tsn", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_cmd_id, - { "Command", "zbee.zcl.cmd.id", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &zbee_zcl_cmd_names_ext, + { "Command", "zbee_zcl.cmd.id", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &zbee_zcl_cmd_names_ext, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_cs_cmd_id, - { "Command", "zbee.zcl.cs.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_zcl_cs_cmd_names) /*"Unknown"*/, + { "Command", "zbee_zcl.cs.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_zcl_cs_cmd_names) /*"Unknown"*/, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_id, - { "Attribute", "zbee.zcl.attr.id", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Attribute", "zbee_zcl.attr.id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_data_type, - { "Data Type", "zbee.zcl.attr.data.type", FT_UINT8, BASE_HEX|BASE_EXT_STRING, + { "Data Type", "zbee_zcl.attr.data.type", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &zbee_zcl_data_type_names_ext, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_boolean, - { "Boolean", "zbee.zcl.attr.boolean", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0xff, + { "Boolean", "zbee_zcl.attr.boolean", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0xff, NULL, HFILL }}, { &hf_zbee_zcl_attr_uint8, - { "Uint8", "zbee.zcl.attr.uint8", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, + { "Uint8", "zbee_zcl.attr.uint8", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_uint16, - { "Uint16", "zbee.zcl.attr.uint16", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, + { "Uint16", "zbee_zcl.attr.uint16", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_uint24, - { "Uint24", "zbee.zcl.attr.uint24", FT_UINT24, BASE_DEC_HEX, NULL, 0x0, + { "Uint24", "zbee_zcl.attr.uint24", FT_UINT24, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_uint32, - { "Uint32", "zbee.zcl.attr.uint32", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, + { "Uint32", "zbee_zcl.attr.uint32", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_uint64, - { "Uint64", "zbee.zcl.attr.uint64", FT_UINT64, BASE_DEC_HEX, NULL, 0x0, + { "Uint64", "zbee_zcl.attr.uint64", FT_UINT64, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_int8, - { "Int8", "zbee.zcl.attr.int8", FT_INT8, BASE_DEC, NULL, 0x0, + { "Int8", "zbee_zcl.attr.int8", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_int16, - { "Int16", "zbee.zcl.attr.int16", FT_INT16, BASE_DEC, NULL, 0x0, + { "Int16", "zbee_zcl.attr.int16", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_int24, - { "Int24", "zbee.zcl.attr.int24", FT_INT24, BASE_DEC, NULL, 0x0, + { "Int24", "zbee_zcl.attr.int24", FT_INT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_int32, - { "Int32", "zbee.zcl.attr.int32", FT_INT32, BASE_DEC, NULL, 0x0, + { "Int32", "zbee_zcl.attr.int32", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_int64, - { "Int64", "zbee.zcl.attr.int64", FT_INT64, BASE_DEC, NULL, 0x0, + { "Int64", "zbee_zcl.attr.int64", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_semi, - { "Semi Float", "zbee.zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, + { "Semi Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_float, - { "Float", "zbee.zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, + { "Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_double, - { "Double Float", "zbee.zcl.attr.float", FT_DOUBLE, BASE_NONE, NULL, 0x0, + { "Double Float", "zbee_zcl.attr.float", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_bytes, - { "Bytes", "zbee.zcl.attr.bytes", FT_BYTES, BASE_NONE, NULL, 0x0, + { "Bytes", "zbee_zcl.attr.bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_minint, - { "Minimum Interval", "zbee.zcl.attr.minint", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Minimum Interval", "zbee_zcl.attr.minint", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_maxint, - { "Maximum Interval", "zbee.zcl.attr.maxint", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Maximum Interval", "zbee_zcl.attr.maxint", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_timeout, - { "Timeout", "zbee.zcl.attr.timeout", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Timeout", "zbee_zcl.attr.timeout", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_hours, - { "Hours", "zbee.zcl.attr.hours", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Hours", "zbee_zcl.attr.hours", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_mins, - { "Minutes", "zbee.zcl.attr.mins", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Minutes", "zbee_zcl.attr.mins", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_secs, - { "Seconds", "zbee.zcl.attr.secs", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Seconds", "zbee_zcl.attr.secs", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_csecs, - { "Centiseconds", "zbee.zcl.attr.csecs", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Centiseconds", "zbee_zcl.attr.csecs", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_yy, - { "Year", "zbee.zcl.attr.yy", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Year", "zbee_zcl.attr.yy", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_mm, - { "Month", "zbee.zcl.attr.mm", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Month", "zbee_zcl.attr.mm", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_md, - { "Day of Month", "zbee.zcl.attr.md", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Day of Month", "zbee_zcl.attr.md", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_wd, - { "Day of Week", "zbee.zcl.attr.wd", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { "Day of Week", "zbee_zcl.attr.wd", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_utc, - { "UTC", "zbee.zcl.attr.utc", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, + { "UTC", "zbee_zcl.attr.utc", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_status, - { "Status", "zbee.zcl.attr.status", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &zbee_zcl_status_names_ext, + { "Status", "zbee_zcl.attr.status", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &zbee_zcl_status_names_ext, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_dir, - { "Direction", "zbee.zcl.attr.dir", FT_UINT8, BASE_HEX, VALS(zbee_zcl_dir_names), + { "Direction", "zbee_zcl.attr.dir", FT_UINT8, BASE_HEX, VALS(zbee_zcl_dir_names), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_dis, - { "Discovery", "zbee.zcl.attr.dis", FT_UINT8, BASE_HEX, VALS(zbee_zcl_dis_names), + { "Discovery", "zbee_zcl.attr.dis", FT_UINT8, BASE_HEX, VALS(zbee_zcl_dis_names), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_cid, - { "Cluster", "zbee.zcl.attr.cid", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Cluster", "zbee_zcl.attr.cid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_start, - { "Start Attribute", "zbee.zcl.attr.start", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Start Attribute", "zbee_zcl.attr.start", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_maxnum, - { "Maxiumum Number", "zbee.zcl.attr.maxnum", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Maxiumum Number", "zbee_zcl.attr.maxnum", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_str_len, - { "Length", "zbee.zcl.attr.str.len", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Length", "zbee_zcl.attr.str.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_str, - { "String", "zbee.zcl.attr.str", FT_STRING, BASE_NONE, NULL, 0x0, + { "String", "zbee_zcl.attr.str", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_ostr, - { "Octet String", "zbee.zcl.attr.ostr", FT_STRING, BASE_NONE, NULL, 0x0, + { "Octet String", "zbee_zcl.attr.ostr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }} }; @@ -2216,12 +2216,12 @@ void proto_register_zbee_zcl(void) } /* Register ZigBee ZCL protocol with Wireshark. */ - proto_zbee_zcl = proto_register_protocol("ZigBee Cluster Library", "ZigBee ZCL", "zbee.zcl"); + proto_zbee_zcl = proto_register_protocol("ZigBee Cluster Library", "ZigBee ZCL", "zbee_zcl"); proto_register_field_array(proto_zbee_zcl, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); /* Register the ZCL dissector and subdissector list. */ - register_dissector("zbee.zcl", dissect_zbee_zcl, proto_zbee_zcl); + register_dissector("zbee_zcl", dissect_zbee_zcl, proto_zbee_zcl); } /* proto_register_zbee_zcl */ @@ -2244,7 +2244,7 @@ void proto_reg_handoff_zbee_zcl(void) data_handle = find_dissector("data"); /* Register our dissector for the appropriate profiles. */ - zbee_zcl_handle = find_dissector("zbee.zcl"); + zbee_zcl_handle = find_dissector("zbee_zcl"); dissector_add_uint("zbee.profile", ZBEE_PROFILE_IPM, zbee_zcl_handle); dissector_add_uint("zbee.profile", ZBEE_PROFILE_T1, zbee_zcl_handle); dissector_add_uint("zbee.profile", ZBEE_PROFILE_HA, zbee_zcl_handle); diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 98b8f66ff9..f766be4e88 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -1397,335 +1397,335 @@ void proto_register_zbee_zdp(void) { static hf_register_info hf[] = { { &hf_zbee_zdp_seqno, - { "Sequence Number", "zbee.zdp.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Sequence Number", "zbee_zdp.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_length, - { "Length", "zbee.zdp.length", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Length", "zbee_zdp.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_ext_addr, - { "Extended Address", "zbee.zdp.ext_addr", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Extended Address", "zbee_zdp.ext_addr", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_device, - { "Device", "zbee.zdp.device", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Device", "zbee_zdp.device", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_req_type, - { "Request Type", "zbee.zdp.req_type", FT_UINT8, BASE_DEC, VALS(zbee_zdp_req_types), 0x0, + { "Request Type", "zbee_zdp.req_type", FT_UINT8, BASE_DEC, VALS(zbee_zdp_req_types), 0x0, NULL, HFILL }}, { &hf_zbee_zdp_index, - { "Index", "zbee.zdp.index", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Index", "zbee_zdp.index", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_status, - { "Status", "zbee.zdp.status", FT_UINT8, BASE_DEC, VALS(zbee_zdp_status_names), 0x0, + { "Status", "zbee_zdp.status", FT_UINT8, BASE_DEC, VALS(zbee_zdp_status_names), 0x0, NULL, HFILL }}, { &hf_zbee_zdp_endpoint, - { "Endpoint", "zbee.zdp.endpoint", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Endpoint", "zbee_zdp.endpoint", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_ep_count, - { "Endpoint Count", "zbee.zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Endpoint Count", "zbee_zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_profile, - { "Profile", "zbee.zdp.profile", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Profile", "zbee_zdp.profile", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_addr_mode, - { "Address Mode", "zbee.zdp.addr_mode", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Address Mode", "zbee_zdp.addr_mode", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_cluster, - { "Cluster", "zbee.zdp.cluster", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Cluster", "zbee_zdp.cluster", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_table_size, - { "Table Size", "zbee.zdp.table_size", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Table Size", "zbee_zdp.table_size", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of entries in the table.", HFILL }}, { &hf_zbee_zdp_table_count, - { "Table Count", "zbee.zdp.table_count", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Table Count", "zbee_zdp.table_count", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of table entries included in this message.", HFILL }}, { &hf_zbee_zdp_in_count, - { "Input Cluster Count", "zbee.zdp.in_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Input Cluster Count", "zbee_zdp.in_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_out_count, - { "Output Cluster Count", "zbee.zdp.out_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Output Cluster Count", "zbee_zdp.out_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_in_cluster, - { "Input Cluster", "zbee.zdp.in_cluster", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Input Cluster", "zbee_zdp.in_cluster", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_out_cluster, - { "Output Cluster", "zbee.zdp.out_cluster", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Output Cluster", "zbee_zdp.out_cluster", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_assoc_device_count, - { "Associated Device Count", "zbee.zdp.assoc_device_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Associated Device Count", "zbee_zdp.assoc_device_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_assoc_device, - { "Associated Device", "zbee.zdp.assoc_device", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Associated Device", "zbee_zdp.assoc_device", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_cinfo_alt_coord, - { "Alternate Coordinator", "zbee.zdp.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_ALT_COORD, + { "Alternate Coordinator", "zbee_zdp.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_ALT_COORD, "Indicates that the device is able to operate as a PAN coordinator.", HFILL }}, { &hf_zbee_zdp_cinfo_ffd, - { "Full-Function Device", "zbee.zdp.cinfo.ffd", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_FFD, + { "Full-Function Device", "zbee_zdp.cinfo.ffd", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_FFD, NULL, HFILL }}, { &hf_zbee_zdp_cinfo_power, - { "AC Power", "zbee.zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_POWER, + { "AC Power", "zbee_zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_POWER, "Indicates this device is using AC/Mains power.", HFILL }}, { &hf_zbee_zdp_cinfo_idle_rx, - { "Rx On When Idle", "zbee.zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_IDLE_RX, + { "Rx On When Idle", "zbee_zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_IDLE_RX, "Indicates the receiver is active when the device is idle.", HFILL }}, { &hf_zbee_zdp_cinfo_security, - { "Security Capability", "zbee.zdp.cinfo.security", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_SECURITY, + { "Security Capability", "zbee_zdp.cinfo.security", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_SECURITY, "Indicates this device is capable of performing encryption/decryption.", HFILL }}, { &hf_zbee_zdp_cinfo_alloc, - { "Allocate Short Address", "zbee.zdp.cinfo.alloc", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_ALLOC, + { "Allocate Short Address", "zbee_zdp.cinfo.alloc", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_ALLOC, "Flag requesting the parent to allocate a short address for this device.", HFILL }}, { &hf_zbee_zdp_server_pri_trust, - { "Primary Trust Center", "zbee.zdp.server.pri_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_TRUST, + { "Primary Trust Center", "zbee_zdp.server.pri_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_TRUST, NULL, HFILL }}, { &hf_zbee_zdp_server_bak_trust, - { "Backup Trust Center", "zbee.zdp.server.bak_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_TRUST, + { "Backup Trust Center", "zbee_zdp.server.bak_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_TRUST, NULL, HFILL }}, { &hf_zbee_zdp_server_pri_bind, - { "Primary Binding Table Cache","zbee.zdp.server.pri_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_BIND, + { "Primary Binding Table Cache","zbee_zdp.server.pri_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_BIND, NULL, HFILL }}, { &hf_zbee_zdp_server_bak_bind, - { "Backup Binding Table Cache", "zbee.zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_BIND, + { "Backup Binding Table Cache", "zbee_zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_BIND, NULL, HFILL }}, { &hf_zbee_zdp_server_pri_disc, - { "Primary Discovery Cache", "zbee.zdp.server.pri_disc", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC, + { "Primary Discovery Cache", "zbee_zdp.server.pri_disc", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC, NULL, HFILL }}, { &hf_zbee_zdp_server_bak_disc, - { "Backup Discovery Cache", "zbee.zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_DISC, + { "Backup Discovery Cache", "zbee_zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_DISC, NULL, HFILL }}, { &hf_zbee_zdp_node_type, - { "Type", "zbee.zdp.node.type", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_NODE_TYPE, + { "Type", "zbee_zdp.node.type", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_NODE_TYPE, NULL, HFILL }}, { &hf_zbee_zdp_node_complex, - { "Complex Descriptor", "zbee.zdp.node.complex", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_COMPLEX, + { "Complex Descriptor", "zbee_zdp.node.complex", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_COMPLEX, NULL, HFILL }}, { &hf_zbee_zdp_node_user, - { "User Descriptor", "zbee.zdp.node.user", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_USER, + { "User Descriptor", "zbee_zdp.node.user", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_USER, NULL, HFILL }}, { &hf_zbee_zdp_node_freq_868, - { "868MHz Band", "zbee.zdp.node.freq.868mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_868MHZ, + { "868MHz Band", "zbee_zdp.node.freq.868mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_868MHZ, NULL, HFILL }}, { &hf_zbee_zdp_node_freq_900, - { "900MHz Band", "zbee.zdp.node.freq.900mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_900MHZ, + { "900MHz Band", "zbee_zdp.node.freq.900mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_900MHZ, NULL, HFILL }}, { &hf_zbee_zdp_node_freq_2400, - { "2.4GHz Band", "zbee.zdp.node.freq.2400mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_2400MHZ, + { "2.4GHz Band", "zbee_zdp.node.freq.2400mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_2400MHZ, NULL, HFILL }}, { &hf_zbee_zdp_node_manufacturer, - { "Manufacturer Code", "zbee.zdp.node.manufacturer", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Manufacturer Code", "zbee_zdp.node.manufacturer", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_node_max_buffer, - { "Max Buffer Size", "zbee.zdp.node.max_buffer", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Max Buffer Size", "zbee_zdp.node.max_buffer", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_node_max_transfer, - { "Max Transfer Size", "zbee.zdp.node.max_transfer", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Max Transfer Size", "zbee_zdp.node.max_transfer", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_power_mode, - { "Mode", "zbee.zdp.power.mode", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_MODE, + { "Mode", "zbee_zdp.power.mode", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_MODE, NULL, HFILL }}, { &hf_zbee_zdp_power_avail_ac, - { "Available AC Power", "zbee.zdp.power.avail.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_AC, + { "Available AC Power", "zbee_zdp.power.avail.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_AC, NULL, HFILL }}, { &hf_zbee_zdp_power_avail_recharge, - { "Available Rechargeable Battery", "zbee.zdp.power.avail.rech", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_RECHARGEABLE, + { "Available Rechargeable Battery", "zbee_zdp.power.avail.rech", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_RECHARGEABLE, NULL, HFILL }}, { &hf_zbee_zdp_power_avail_dispose, - { "Available Disposeable Battery", "zbee.zdp.power.avail.disp", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_DISPOSEABLE, + { "Available Disposeable Battery", "zbee_zdp.power.avail.disp", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_DISPOSEABLE, NULL, HFILL }}, { &hf_zbee_zdp_power_source_ac, - { "Using AC Power", "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_AC, + { "Using AC Power", "zbee_zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_AC, NULL, HFILL }}, { &hf_zbee_zdp_power_source_recharge, - { "Using Rechargeable Battery", "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_RECHARGEABLE, + { "Using Rechargeable Battery", "zbee_zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_RECHARGEABLE, NULL, HFILL }}, { &hf_zbee_zdp_power_source_dispose, - { "Using Disposeable Battery", "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_DISPOSEABLE, + { "Using Disposeable Battery", "zbee_zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_DISPOSEABLE, NULL, HFILL }}, { &hf_zbee_zdp_power_level, - { "Level", "zbee.zdp.power.level", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_LEVEL, + { "Level", "zbee_zdp.power.level", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_LEVEL, NULL, HFILL }}, { &hf_zbee_zdp_simple_app_device, - { "Application Device", "zbee.zdp.app.device", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Application Device", "zbee_zdp.app.device", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_simple_app_version, - { "Application Version", "zbee.zdp.app.version", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Application Version", "zbee_zdp.app.version", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_complex_length, - { "Complex Descriptor Length", "zbee.zdp.complex_length", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Complex Descriptor Length", "zbee_zdp.complex_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_complex, - { "Complex Descriptor", "zbee.zdp.complex", FT_STRING, BASE_NONE, NULL, 0x0, + { "Complex Descriptor", "zbee_zdp.complex", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_user, - { "User Descriptor", "zbee.zdp.user", FT_STRING, BASE_NONE, NULL, 0x0, + { "User Descriptor", "zbee_zdp.user", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_user_length, - { "User Descriptor Length", "zbee.zdp.user_length", FT_UINT8, BASE_DEC, NULL, 0x0, + { "User Descriptor Length", "zbee_zdp.user_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_simple_length, - { "Simple Descriptor Length", "zbee.zdp.simple_length", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Simple Descriptor Length", "zbee_zdp.simple_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_disc_node_size, - { "Node Descriptor Size", "zbee.zdp.node_size", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Node Descriptor Size", "zbee_zdp.node_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_disc_power_size, - { "Power Descriptor Size", "zbee.zdp.power_size", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Power Descriptor Size", "zbee_zdp.power_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_cache, - { "Cache", "zbee.zdp.cache", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Cache", "zbee_zdp.cache", FT_UINT16, BASE_HEX, NULL, 0x0, "Address of the device containing the discovery cache.", HFILL }}, { &hf_zbee_zdp_disc_ep_count, - { "Active Endpoint Count", "zbee.zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Active Endpoint Count", "zbee_zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_disc_simple_count, - { "Simple Descriptor Count", "zbee.zdp.simple_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Simple Descriptor Count", "zbee_zdp.simple_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_disc_simple_size, - { "Simple Descriptor Size", "zbee.zdp.simple_size", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Simple Descriptor Size", "zbee_zdp.simple_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_target, - { "Target", "zbee.zdp.target", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Target", "zbee_zdp.target", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_target64, - { "Target", "zbee.zdp.target64", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Target", "zbee_zdp.target64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_target_ep, - { "Target Endpoint", "zbee.zdp.target_ep", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Target Endpoint", "zbee_zdp.target_ep", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_replacement, - { "Replacement", "zbee.zdp.replacement", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Replacement", "zbee_zdp.replacement", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_replacement_ep, - { "Replacement Endpoint", "zbee.zdp.replacement_ep", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Replacement Endpoint", "zbee_zdp.replacement_ep", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_src, - { "Source", "zbee.zdp.bind.src", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Source", "zbee_zdp.bind.src", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_src64, - { "Source", "zbee.zdp.bind.src64", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Source", "zbee_zdp.bind.src64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_src_ep, - { "Source Endpoint", "zbee.zdp.bind.src_ep", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Source Endpoint", "zbee_zdp.bind.src_ep", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_dst, - { "Destination", "zbee.zdp.bind.dst", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Destination", "zbee_zdp.bind.dst", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_dst64, - { "Destination", "zbee.zdp.bind.dst64", FT_EUI64, BASE_NONE, NULL, 0x0, + { "Destination", "zbee_zdp.bind.dst64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_bind_dst_ep, - { "Destination Endpoint", "zbee.zdp.bind.dst_ep", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Destination Endpoint", "zbee_zdp.bind.dst_ep", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_duration, - { "Duration", "zbee.zdp.duration", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Duration", "zbee_zdp.duration", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_leave_children, - { "Remove Children", "zbee.zdp.leave.children", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Remove Children", "zbee_zdp.leave.children", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_leave_rejoin, - { "Rejoin", "zbee.zdp.leave.rejoin", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + { "Rejoin", "zbee_zdp.leave.rejoin", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_significance, - { "Significance", "zbee.zdp.significance", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Significance", "zbee_zdp.significance", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_scan_count, - { "Scan Count", "zbee.zdp.scan_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Scan Count", "zbee_zdp.scan_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_update_id, - { "Update ID", "zbee.zdp.update_id", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Update ID", "zbee_zdp.update_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_manager, - { "Network Manager", "zbee.zdp.manager", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Network Manager", "zbee_zdp.manager", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_tx_total, - { "Total Transmissions", "zbee.zdp.tx_total", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Total Transmissions", "zbee_zdp.tx_total", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_tx_fail, - { "Failed Transmissions", "zbee.zdp.tx_fail", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Failed Transmissions", "zbee_zdp.tx_fail", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_channel_count, - { "Channel List Count", "zbee.zdp.channel_count", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Channel List Count", "zbee_zdp.channel_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }} }; @@ -1758,12 +1758,12 @@ void proto_register_zbee_zdp(void) }; /* Register ZigBee ZDP protocol with Wireshark. */ - proto_zbee_zdp = proto_register_protocol("ZigBee Device Profile", "ZigBee ZDP", "zbee.zdp"); + proto_zbee_zdp = proto_register_protocol("ZigBee Device Profile", "ZigBee ZDP", "zbee_zdp"); proto_register_field_array(proto_zbee_zdp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); /* Register the ZDP dissector. */ - register_dissector("zbee.zdp", dissect_zbee_zdp, proto_zbee_zdp); + register_dissector("zbee_zdp", dissect_zbee_zdp, proto_zbee_zdp); } /* proto_register_zbee_zdp */ /*FUNCTION:------------------------------------------------------ @@ -1785,6 +1785,6 @@ void proto_reg_handoff_zbee_zdp(void) data_handle = find_dissector("data"); /* Register our dissector with the ZigBee application dissectors. */ - zdp_handle = find_dissector("zbee.zdp"); + zdp_handle = find_dissector("zbee_zdp"); dissector_add_uint("zbee.profile", ZBEE_ZDP_PROFILE, zdp_handle); } /* proto_reg_handoff_zbee_zdp */ diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index beba4841bd..84ac504094 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -774,9 +774,9 @@ #define ZBEE_MFG_GENUS "Genus Power Infrastructures Limited" /* Protocol Abbreviations */ -#define ZBEE_PROTOABBREV_NWK "zbee.nwk" -#define ZBEE_PROTOABBREV_APS "zbee.aps" -#define ZBEE_PROTOABBREV_APF "zbee.apf" +#define ZBEE_PROTOABBREV_NWK "zbee_nwk" +#define ZBEE_PROTOABBREV_APS "zbee_aps" +#define ZBEE_PROTOABBREV_APF "zbee_apf" /* Helper Functions */ extern guint zbee_get_bit_field(guint input, guint mask); |