diff options
| author | dsrsupport <eugene.exarevsky@dsr-company.com> | 2016-09-06 17:56:15 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-19 17:21:25 +0000 |
| commit | c92cc9c95a8bc45c932bb37775627657994e906d (patch) | |
| tree | 99c8f8c97b2299cdce1eebe4ac9cc7e5de400b93 /epan/dissectors/packet-zbee-zdp.c | |
| parent | 11e8bac88e067b226f92add83eca3009fa5b95a7 (diff) | |
ZigBee ZDO dissector: fix for r21 in column description in ZDO Node Desc Resp.
Fixed display for Server flags:
a) introduce a flag 'show_ver_flags' to display stack revision only for ZDO Node Desc Resp;
b) fix crash in zdp_parse_node_desc when passed NULL as pinfo. Now never pass NULL there.
Change-Id: Ibdb7fe2da54a902b39e20e07aa2aa5c9c23beeee
Reviewed-on: https://code.wireshark.org/review/18313
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 3b1834c54d..3e52ef3fa8 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -725,7 +725,7 @@ zdp_parse_server_flags(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *of *@param offset offset into the tvb to find the node descriptor. */ void -zdp_parse_node_desc(proto_tree *tree, packet_info *pinfo, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version) +zdp_parse_node_desc(proto_tree *tree, packet_info *pinfo, gboolean show_ver_flags, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version) { proto_item *ti; proto_item *field_root = NULL; @@ -784,7 +784,7 @@ zdp_parse_node_desc(proto_tree *tree, packet_info *pinfo, gint ettindex, tvbuff_ }; ver_flags = zdp_parse_server_flags(field_tree, ett_zbee_zdp_server, tvb, offset) & ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV; - if (ver_flags) { + if (show_ver_flags && ver_flags) { zbee_append_info(tree, pinfo, ", Rev: %d", (ver_flags >> ws_ctz(ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV))); } |