osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ZigBee: ZDP MGMT NWK Enhanced update notify 

Added in a way to dissect the mgmt_nwk_enhanced_update_notify
(clusterID=0x8039). It still uses the same dissector as the non-enhanced
version (clusterID=0x8038) since it's payload is the same. Only difference
is the clusterID and it's name.

Change-Id: Icb3c5e895f5fbe2150325bd5e974406d18beb1c1
Reviewed-on: https://code.wireshark.org/review/26742
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dana Sy 2018-04-04 11:37:53 -07:00 committed by Anders Broman
parent a63542fe33
commit 2f44216f3a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-zbee-zdp-management.c
View File

@ -736,7 +736,8 @@ dissect_zbee_zdp_rsp_mgmt_cache(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
} /* dissect_zbee_zdp_rsp_mgmt_bind */
/**
*ZigBee Device Profile dissector for the nwk update notify.
*ZigBee Device Profile dissector for both the enhanced and
*non-enhanced nwk update notify.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields

2
epan/dissectors/packet-zbee-zdp.c
View File

@ -320,6 +320,7 @@ const value_string zbee_zdp_cluster_names[] = {
{ 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_RSP_MGMT_IEEE_JOIN_LIST, "IEEE Joining List Response" },
{ 0, NULL }
};
@ -1253,6 +1254,7 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
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);
break;
case ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST:

2
epan/dissectors/packet-zbee-zdp.h
View File

@ -105,7 +105,7 @@
#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. */
/* ZBEE_ZDP_REQ_MGMT_NWKUPDATE_ENH returns ZBEE_ZDP_RSP_MGMT_NWKUPDATE so cluster 0x8039 is unused */
#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE_ENH 0x8039 /* R22 */
#define ZBEE_ZDP_RSP_MGMT_IEEE_JOIN_LIST 0x803a /* R22 */
#define ZBEE_ZDP_MSG_RESPONSE_BIT 0x8000