diff options
author | Kenneth Soerensen <knnthsrnsn@gmail.com> | 2018-11-30 13:47:52 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2018-12-02 02:48:12 +0000 |
commit | 5267fc7777bdd1338ac819d11d702f7fab51e856 (patch) | |
tree | c5828d92d85d06018b966ee9fe8da38be8e59ec9 /epan | |
parent | bb9c71023c6e2951229f71b4aed84b835a09f566 (diff) |
ZigBee: Classify mgmt_nwkupdate as notify instead of request
Change-Id: Ic559133086f4529f8dcc7b99cce6dbb97c11e197
Reviewed-on: https://code.wireshark.org/review/30860
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')
-rw-r--r-- | epan/dissectors/packet-zbee-zdp-management.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-zbee-zdp.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 171e4f8896..8195bcae42 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -770,7 +770,7 @@ dissect_zbee_zdp_rsp_mgmt_cache(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_rsp_mgmt_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_zbee_zdp_not_mgmt_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint offset = 0; guint i, j; @@ -809,7 +809,7 @@ dissect_zbee_zdp_rsp_mgmt_nwkupdate(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); -} /* dissect_zbee_zdp_rsp_mgmt_nwkupdate */ +} /* dissect_zbee_zdp_not_mgmt_nwkupdate */ /** *ZigBee Device Profile dissector for the IEEE Joining List Response. diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 9429fe9c39..623352515c 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -324,8 +324,8 @@ const value_string zbee_zdp_cluster_names[] = { { ZBEE_ZDP_RSP_MGMT_DIRECT_JOIN, "Direct Join Response" }, { ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN, "Permit Join Response" }, { ZBEE_ZDP_RSP_MGMT_CACHE, "Cache Response" }, - { ZBEE_ZDP_RSP_MGMT_NWKUPDATE, "Network Update Notify" }, - { ZBEE_ZDP_RSP_MGMT_NWKUPDATE_ENH, "Network Enhanced Update Notify" }, + { 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" }, { 0, NULL } }; @@ -1315,9 +1315,9 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case ZBEE_ZDP_RSP_MGMT_CACHE: dissect_zbee_zdp_rsp_mgmt_cache(zdp_tvb, pinfo, zdp_tree); break; - case ZBEE_ZDP_RSP_MGMT_NWKUPDATE: - case ZBEE_ZDP_RSP_MGMT_NWKUPDATE_ENH: - dissect_zbee_zdp_rsp_mgmt_nwkupdate(zdp_tvb, pinfo, zdp_tree); + case ZBEE_ZDP_NOT_MGMT_NWKUPDATE: + case ZBEE_ZDP_NOT_MGMT_NWKUPDATE_ENH: + dissect_zbee_zdp_not_mgmt_nwkupdate(zdp_tvb, pinfo, zdp_tree); break; case ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST: dissect_zbee_zdp_rsp_mgmt_ieee_join_list(zdp_tvb, pinfo, zdp_tree); diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h index cba3c5fb02..64226d984b 100644 --- a/epan/dissectors/packet-zbee-zdp.h +++ b/epan/dissectors/packet-zbee-zdp.h @@ -105,8 +105,8 @@ #define ZBEE_ZDP_RSP_MGMT_DIRECT_JOIN 0x8035 #define ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN 0x8036 /* ZigBee 2006 & later. */ #define ZBEE_ZDP_RSP_MGMT_CACHE 0x8037 /* ZigBee 2006 & later. */ -#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE 0x8038 /* ZigBee 2007 & later. */ -#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE_ENH 0x8039 /* R22 */ +#define ZBEE_ZDP_NOT_MGMT_NWKUPDATE 0x8038 /* ZigBee 2007 & later. */ +#define ZBEE_ZDP_NOT_MGMT_NWKUPDATE_ENH 0x8039 /* R22 */ #define ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST 0x803a /* R22 */ #define ZBEE_ZDP_MSG_RESPONSE_BIT 0x8000 @@ -430,7 +430,7 @@ extern void dissect_zbee_zdp_rsp_mgmt_leave (tvbuff_t *tvb, packet_i extern void dissect_zbee_zdp_rsp_mgmt_direct_join (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void dissect_zbee_zdp_rsp_mgmt_permit_join (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void dissect_zbee_zdp_rsp_mgmt_cache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -extern void dissect_zbee_zdp_rsp_mgmt_nwkupdate (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +extern void dissect_zbee_zdp_not_mgmt_nwkupdate (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void dissect_zbee_zdp_rsp_mgmt_ieee_join_list (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern const value_string zbee_zdp_cluster_names[]; |