aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zdp-discovery.c
diff options
context:
space:
mode:
authordsrsupport <eugene.exarevsky@dsr-company.com>2016-09-06 17:56:15 +0300
committerAnders Broman <a.broman58@gmail.com>2016-10-16 15:24:30 +0000
commitdc1cd7889da85938b016c6bfec932dd595b7e18b (patch)
treeac8f9410ceaa356372f3063e1dc34654cf28fac6 /epan/dissectors/packet-zbee-zdp-discovery.c
parentb240082cf4ca297149a119694e9eb4d205bccc02 (diff)
ZigBee MAC and ZDO dissectors: put useful information into column description for Association req and ZDo Node Desc Resp.
I added that information to column description because I always need it when analyzing logs. For Association request it is joining device type (FFD or RFD), for Node Descriptor Response this is stack version (r21 or legacy). Change-Id: Ic7ca237b1f4b598f9354b406f105c2befe45140d Reviewed-on: https://code.wireshark.org/review/17534 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-discovery.c')
-rw-r--r--epan/dissectors/packet-zbee-zdp-discovery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c
index 6c1f5c882f..25fde7a0c4 100644
--- a/epan/dissectors/packet-zbee-zdp-discovery.c
+++ b/epan/dissectors/packet-zbee-zdp-discovery.c
@@ -481,7 +481,7 @@ dissect_zbee_zdp_req_store_node_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tr
/*device =*/ zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, (int)sizeof(guint16), NULL);
ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(guint64), NULL);
- zdp_parse_node_desc(tree, ett_zbee_zdp_node, tvb, &offset, version);
+ zdp_parse_node_desc(tree, NULL, ett_zbee_zdp_node, tvb, &offset, version);
zbee_append_info(tree, pinfo, ", Device: %s", eui64_to_display(wmem_packet_scope(), ext_addr));
@@ -783,7 +783,7 @@ dissect_zbee_zdp_rsp_node_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
status = zdp_parse_status(tree, tvb, &offset);
device = zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, (int)sizeof(guint16), NULL);
if (status == ZBEE_ZDP_STATUS_SUCCESS) {
- zdp_parse_node_desc(tree, ett_zbee_zdp_node, tvb, &offset, version);
+ zdp_parse_node_desc(tree, pinfo, ett_zbee_zdp_node, tvb, &offset, version);
}
zbee_append_info(tree, pinfo, ", Device: 0x%04x", device);