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.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.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 623352515c..0535913dec 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -281,7 +281,6 @@ const value_string zbee_zdp_cluster_names[] = { { ZBEE_ZDP_REQ_MGMT_NWKUPDATE, "Network Update Request" }, { ZBEE_ZDP_REQ_MGMT_NWKUPDATE_ENH, "Network Update Enhanced Request" }, { ZBEE_ZDP_REQ_MGMT_IEEE_JOIN_LIST, "IEEE Joining List Request" }, - { ZBEE_ZDP_REQ_MGMT_UNSOLICITED_NWKUPDATE, "Unsolicited Enhanced Network Update Notify" }, { ZBEE_ZDP_RSP_NWK_ADDR, "Network Address Response" }, { ZBEE_ZDP_RSP_IEEE_ADDR, "Extended Address Response" }, @@ -327,6 +326,7 @@ const value_string zbee_zdp_cluster_names[] = { { ZBEE_ZDP_NOT_MGMT_NWKUPDATE, "Network Update Notify" }, { ZBEE_ZDP_NOT_MGMT_NWKUPDATE_ENH, "Network Enhanced Update Notify" }, { ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST, "IEEE Joining List Response" }, + { ZBEE_ZDP_NOT_MGMT_UNSOLICITED_NWKUPDATE, "Unsolicited Enhanced Network Update Notify" }, { 0, NULL } }; @@ -1189,9 +1189,6 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case ZBEE_ZDP_REQ_MGMT_IEEE_JOIN_LIST: dissect_zbee_zdp_req_mgmt_ieee_join_list(zdp_tvb, pinfo, zdp_tree); break; - case ZBEE_ZDP_REQ_MGMT_UNSOLICITED_NWKUPDATE: - dissect_zbee_zdp_req_mgmt_unsolicited_nwkupdate(zdp_tvb, pinfo, zdp_tree); - break; case ZBEE_ZDP_RSP_NWK_ADDR: dissect_zbee_zdp_rsp_nwk_addr(zdp_tvb, pinfo, zdp_tree); break; @@ -1322,6 +1319,9 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST: dissect_zbee_zdp_rsp_mgmt_ieee_join_list(zdp_tvb, pinfo, zdp_tree); break; + case ZBEE_ZDP_NOT_MGMT_UNSOLICITED_NWKUPDATE: + dissect_zbee_zdp_not_mgmt_unsolicited_nwkupdate(zdp_tvb, pinfo, zdp_tree); + break; default: /* Invalid Cluster Identifier. */ call_data_dissector(zdp_tvb, pinfo, tree); |