diff options
| author | dsrsupport <eugene.exarevsky@dsr-company.com> | 2016-09-06 17:56:15 +0300 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-10-16 15:24:30 +0000 |
| commit | dc1cd7889da85938b016c6bfec932dd595b7e18b (patch) | |
| tree | ac8f9410ceaa356372f3063e1dc34654cf28fac6 /epan/dissectors/packet-ieee802154.c | |
| parent | b240082cf4ca297149a119694e9eb4d205bccc02 (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-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 9be986e24a..f757856ecf 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2384,6 +2384,7 @@ static const true_false_string tfs_cinfo_power_src = { "AC/Mains Power", "Batter static void dissect_ieee802154_assoc_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet) { + guint8 cap; proto_tree *subtree; static const int * capability[] = { &hf_ieee802154_cinfo_alt_coord, @@ -2395,6 +2396,9 @@ dissect_ieee802154_assoc_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree NULL }; + cap = tvb_get_guint8(tvb, 0); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", (cap & IEEE802154_CMD_CINFO_DEVICE_TYPE) ? tfs_cinfo_device_type.true_string : tfs_cinfo_device_type.false_string); + /* Create a subtree for this command frame. */ subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL, val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command")); |