osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

ZigBee: fix column description for APS ACK to T2 packet

Browse source 
If this is APS ACK, do not overwrite its column description by Test Profile command description.

Change-Id: Ibd4ae978776ad9e9924e6933ede90bc2ad8855de
Reviewed-on: https://code.wireshark.org/review/16414
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-07-13 14:33:55 +03:00 committed by Michael Mann
parent 998ab7f7e5
commit b7cdff0192
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
epan/dissectors/packet-zbee-aps.c
View file

@ -893,8 +893,11 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
break;
case ZBEE_PROFILE_T2:
proto_tree_add_item(aps_tree, hf_zbee_aps_t2_cluster, tvb, offset, 2, ENC_LITTLE_ENDIAN);
col_set_str(pinfo->cinfo, COL_INFO,
val_to_str_const(nwk->cluster_id, zbee_aps_t2_cid_names, "Unknown T2 cluster"));
if (packet.type == ZBEE_APS_FCF_DATA)
{
col_set_str(pinfo->cinfo, COL_INFO,
val_to_str_const(nwk->cluster_id, zbee_aps_t2_cid_names, "Unknown T2 cluster"));
}
break;
default:
proto_tree_add_item(aps_tree, hf_zbee_aps_cluster, tvb, offset, 2, ENC_LITTLE_ENDIAN);