diff options
| author | Chris Brandson <cjb@exegin.com> | 2017-07-17 16:54:06 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-18 04:40:38 +0000 |
| commit | e46bd2827f581f1c5b18c4e166c13741fa6a99a8 (patch) | |
| tree | 7b307902af2a6f137cd8290e0e763fcaaf9a8516 /epan/dissectors/packet-zbee-zdp.c | |
| parent | aec147efa1f27518f6927ca5078e0547dd1a234d (diff) | |
ZigBee cleanup minor errors
Alarm Code now correctly displayed as a byte
Missing ZCL status codes from ZCL 6 and ZCL 7 have been added
Input and Output Cluster Lists now displayed in hex as they are everywhere else
The term Device is no longer used, instead Nwk Addr and Address are used as applicable
Change-Id: I552f4b64974bf44088a1c8f90d44e5459a0f81a6
Reviewed-on: https://code.wireshark.org/review/22683
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 3e52ef3fa8..3c5e42f9c6 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -55,7 +55,7 @@ static int hf_zbee_zdp_length = -1; /* Deprecates since ZigBee 2006. */ /* General indicies. */ int hf_zbee_zdp_ext_addr = -1; - int hf_zbee_zdp_device = -1; + int hf_zbee_zdp_nwk_addr = -1; int hf_zbee_zdp_req_type = -1; int hf_zbee_zdp_index = -1; static int hf_zbee_zdp_status = -1; @@ -1333,8 +1333,8 @@ void proto_register_zbee_zdp(void) { "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, + { &hf_zbee_zdp_nwk_addr, + { "Nwk Addr of Interest", "zbee_zdp.nwk_addr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_req_type, @@ -1390,11 +1390,11 @@ void proto_register_zbee_zdp(void) 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_HEX, 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_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zdp_assoc_device_count, |