diff options
author | Kenneth Soerensen <knnthsrnsn@gmail.com> | 2018-11-30 13:34:52 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-12-01 22:29:27 +0000 |
commit | bb9c71023c6e2951229f71b4aed84b835a09f566 (patch) | |
tree | 4ae490f1b8156043015bbae7e913d84d5423dedc /epan | |
parent | b44172b4ee1dcdc6b1d7b41f944cec17b117776f (diff) |
ZigBee: Use ZDP Status for IEEE Joining List Response
Change-Id: I66506048fbca06f124aab49a142fe24092760206
Reviewed-on: https://code.wireshark.org/review/30858
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-zbee-zdp-management.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 5d23e56fdb..171e4f8896 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -824,8 +824,7 @@ dissect_zbee_zdp_rsp_mgmt_ieee_join_list(tvbuff_t *tvb, packet_info *pinfo, prot guint32 i, status, list_total, list_count; guint offset = 0; - proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_ieee_join_status, tvb, offset, 1, ENC_LITTLE_ENDIAN, &status); - offset += 1; + status = zdp_parse_status(tree, tvb, &offset); if (status == 0x00) { proto_tree_add_item(tree, hf_zbee_zdp_ieee_join_update_id, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 325d5d2ca1..9429fe9c39 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -181,7 +181,6 @@ static int hf_zbee_zdp_complex = -1; int hf_zbee_zdp_lqi = -1; static int hf_zbee_zdp_scan_channel = -1; int hf_zbee_zdp_ieee_join_start_index = -1; - int hf_zbee_zdp_ieee_join_status = -1; int hf_zbee_zdp_ieee_join_update_id = -1; int hf_zbee_zdp_ieee_join_policy = -1; int hf_zbee_zdp_ieee_join_list_total = -1; @@ -1841,10 +1840,6 @@ void proto_register_zbee_zdp(void) { "Start Index", "zbee_zdp.ieee_joining_list.start_index", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_zbee_zdp_ieee_join_status, - { "Status", "zbee_zdp.ieee_joining_list.status", FT_UINT8, BASE_HEX, VALS(zbee_zdp_status_names), 0x0, - NULL, HFILL }}, - { &hf_zbee_zdp_ieee_join_update_id, { "Update Id", "zbee_zdp.ieee_joining_list.update_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, |