diff options
| author | Kenneth Soerensen <knnthsrnsn@gmail.com> | 2018-11-30 13:43:34 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-12-02 02:49:50 +0000 |
| commit | 82ebab607ec4634021f3b6a2ffadb06efcd6900c (patch) | |
| tree | c77eaa493e6107b03587daabec1d46a119509506 /epan/dissectors/packet-zbee-zdp-management.c | |
| parent | 5267fc7777bdd1338ac819d11d702f7fab51e856 (diff) | |
ZigBee: Correct unsolicited nwk update notify
- Correct cluster ID
- Parse ZDP Status
- Move from client to server
- Classify as notify instead of request
Change-Id: Idb3d26d3212af2762465d7ec02efcb8978830af3
Reviewed-on: https://code.wireshark.org/review/30859
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-management.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp-management.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 8195bcae42..29a4fcb598 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -471,32 +471,6 @@ dissect_zbee_zdp_req_mgmt_ieee_join_list(tvbuff_t *tvb, packet_info *pinfo, prot zdp_dump_excess(tvb, offset, pinfo, tree); } /* dissect_zbee_zdp_req_mgmt_ieee_join_list */ -/** - *ZigBee Device Profile dissector for the unsolicited nwk update notify. - * - *@param tvb pointer to buffer containing raw packet. - *@param pinfo pointer to packet information fields - *@param tree pointer to data tree Wireshark uses to display packet. -*/ -void -dissect_zbee_zdp_req_mgmt_unsolicited_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ - guint offset = 0; - - zdp_parse_chanmask(tree, tvb, &offset, hf_zbee_zdp_channel_page, hf_zbee_zdp_channel_mask); - proto_tree_add_item(tree, hf_zbee_zdp_tx_total, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - proto_tree_add_item(tree, hf_zbee_zdp_tx_fail, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - proto_tree_add_item(tree, hf_zbee_zdp_tx_retries, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; - proto_tree_add_item(tree, hf_zbee_zdp_period_time_results, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; - - /* Dump any leftover bytes. */ - zdp_dump_excess(tvb, offset, pinfo, tree); -} /* dissect_zbee_zdp_req_mgmt_unsolicited_nwkupdate */ - /************************************** * MANAGEMENT RESPONSES ************************************** @@ -848,6 +822,33 @@ dissect_zbee_zdp_rsp_mgmt_ieee_join_list(tvbuff_t *tvb, packet_info *pinfo, prot zdp_dump_excess(tvb, offset, pinfo, tree); } /* dissect_zbee_zdp_rsp_mgmt_ieee_join_list */ +/** + *ZigBee Device Profile dissector for the unsolicited nwk update notify. + * + *@param tvb pointer to buffer containing raw packet. + *@param pinfo pointer to packet information fields + *@param tree pointer to data tree Wireshark uses to display packet. +*/ +void +dissect_zbee_zdp_not_mgmt_unsolicited_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + guint offset = 0; + + zdp_parse_status(tree, tvb, &offset); + zdp_parse_chanmask(tree, tvb, &offset, hf_zbee_zdp_channel_page, hf_zbee_zdp_channel_mask); + proto_tree_add_item(tree, hf_zbee_zdp_tx_total, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tree, hf_zbee_zdp_tx_fail, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tree, hf_zbee_zdp_tx_retries, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tree, hf_zbee_zdp_period_time_results, tvb, offset, 1, ENC_LITTLE_ENDIAN); + offset += 1; + + /* Dump any leftover bytes. */ + zdp_dump_excess(tvb, offset, pinfo, tree); +} /* dissect_zbee_zdp_not_mgmt_unsolicited_nwkupdate */ + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |