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

ZigBee Test Profile #2 enchancement. 

If profile id is ZigBee Test Profile #2, do not try to parse packet contents as other protocol above APS: ZCL or whatever else.

Change-Id: I0f1446aea9b270c226c7c472fe794e29240defc9
Reviewed-on: https://code.wireshark.org/review/16387
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-12 12:21:23 +03:00 committed by Michael Mann
parent 479caf15e7
commit 45679d2ae2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
epan/dissectors/packet-zbee-aps.c
View File

@ -893,6 +893,8 @@ 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"));
break;
default:
proto_tree_add_item(aps_tree, hf_zbee_aps_cluster, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@ -1059,9 +1061,16 @@ dissect_zbee_aps_no_endpt:
profile_handle = zbee_apf_handle;
}
else if (profile_handle == NULL) {
/* Could not locate a profile dissector, but there may
be profile-wide commands so try to dissect them */
zcl_handle = find_dissector(ZBEE_PROTOABBREV_ZCL);
if (payload_tvb && (packet.profile == ZBEE_PROFILE_T2)) {
/* Move T2 dissect here: don't want to show T2 contents as
* ZCL mess, broken packets etc */
payload_tvb = tvb_new_subset_remaining(payload_tvb, dissect_zbee_t2(payload_tvb, aps_tree, nwk->cluster_id));
}
else {
/* Could not locate a profile dissector, but there may
be profile-wide commands so try to dissect them */
zcl_handle = find_dissector(ZBEE_PROTOABBREV_ZCL);
}
if (zcl_handle) {
call_dissector_with_data(zcl_handle, payload_tvb, pinfo, tree, nwk);
}
@ -1092,10 +1101,6 @@ dissect_zbee_aps_no_endpt:
* dissector to display the leftover bytes, if any.
*/
if (payload_tvb && (packet.profile == ZBEE_PROFILE_T2)) {
payload_tvb = tvb_new_subset_remaining(payload_tvb, dissect_zbee_t2(payload_tvb, aps_tree, nwk->cluster_id));
}
if (payload_tvb) {
call_data_dissector(payload_tvb, pinfo, tree);
}