diff options
| author | dsrsupport <eugene.exarevsky@dsr-company.com> | 2015-12-29 16:02:12 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-30 00:11:51 +0000 |
| commit | 39559b1adc1cb2eec11a0f7a83da05909254c6ce (patch) | |
| tree | fa2cb933aa5142cc8928038c2c8b65a6ce945382 /epan/dissectors/packet-zbee-nwk.c | |
| parent | cef51084f2f2d5b23cd95a3c3eaa55dfc50fe2b4 (diff) | |
ZigBee NWK: fix Info column for NWK Rejoin Resp.
Fixed ZigBee NWK Rejoin Response info column to display an address which parent gave to the rejoining child.
Bug: 11940
Change-Id: I886b9fd6c7e99b097b297f351a84b95b3ffc5a94
Reviewed-on: https://code.wireshark.org/review/12911
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-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 6e9276ef8c..e36d847cc4 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1105,11 +1105,13 @@ dissect_zbee_nwk_rejoin_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, *@return offset after command dissection. */ static guint -dissect_zbee_nwk_rejoin_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, zbee_nwk_packet * packet, guint offset) +dissect_zbee_nwk_rejoin_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, zbee_nwk_packet * packet _U_, guint offset) { guint8 status; + guint16 new_address; /* Get and display the short address. */ + new_address = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_zbee_nwk_cmd_addr, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -1120,7 +1122,7 @@ dissect_zbee_nwk_rejoin_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Update the info column. */ if (status == IEEE802154_CMD_ASRSP_AS_SUCCESS) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Address: 0x%04x", packet->src); + col_append_fstr(pinfo->cinfo, COL_INFO, ", New Address: 0x%04x", new_address); } else { col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str_const(status, zbee_nwk_rejoin_codes, "Unknown Rejoin Response")); |