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

ZigBee ZDO: fix parse of ZDO Node Descriptor Response. 

Fix a bitmask for Stack compiliance revision.
Add Network manager field.

Bug: 12488
Change-Id: I0a0908f288997686b76899ee80d51c590599a32e
Reviewed-on: https://code.wireshark.org/review/15681
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
dsrsupport 2016-06-01 15:50:05 +03:00 committed by Michael Mann
parent 2184ae1673
commit 55548f2e20
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,7 @@ static int hf_zbee_zdp_server_pri_bind = -1;
static int hf_zbee_zdp_server_bak_bind = -1;
static int hf_zbee_zdp_server_pri_disc = -1;
static int hf_zbee_zdp_server_bak_disc = -1;
static int hf_zbee_zdp_server_network_manager = -1;
static int hf_zbee_zdp_server_stk_compl_rev = -1;
/* Node descriptor indicies. */
@ -672,6 +673,7 @@ zdp_parse_server_flags(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *of
&hf_zbee_zdp_server_bak_bind,
&hf_zbee_zdp_server_pri_disc,
&hf_zbee_zdp_server_bak_disc,
&hf_zbee_zdp_server_network_manager,
&hf_zbee_zdp_server_stk_compl_rev,
NULL
};
@ -1423,6 +1425,10 @@ void proto_register_zbee_zdp(void)
{ "Backup Discovery Cache", "zbee_zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_DISC,
NULL, HFILL }},
{ &hf_zbee_zdp_server_network_manager,
{ "Network Manager", "zbee_zdp.server.nwk_mgr", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_NETWORK_MANAGER,
NULL, HFILL }},
{ &hf_zbee_zdp_server_stk_compl_rev,
{ "Stack Compliance Revision", "zbee_zdp.server.stack_compiance_revision", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV,
NULL, HFILL }},

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

@ -158,7 +158,8 @@
#define ZBEE_ZDP_NODE_SERVER_BACKUP_BIND 0x0008
#define ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC 0x0010
#define ZBEE_ZDP_NODE_SERVER_BACKUP_DISC 0x0020
#define ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV 0xff00
#define ZBEE_ZDP_NODE_SERVER_NETWORK_MANAGER 0x0040
#define ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV 0xfe00
#define ZBEE_ZDP_POWER_MODE 0x000f
#define ZBEE_ZDP_POWER_MODE_RX_ON 0x0000