osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

Remove false claims.

Browse source 
dissect_zbee_nwk_gp_cmd_commissioning_reply() *does* use the packet
argument.

Change-Id: Ife78d8090822474977ddf1ed6ce1a34611d06080
Reviewed-on: https://code.wireshark.org/review/28802
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-07-22 09:38:44 -07:00
parent e2e20c0dbb
commit fbd682ed28
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
epan/dissectors/packet-zbee-nwk-gp.c
View file

@ -1064,7 +1064,7 @@ dissect_zbee_nwk_gp_cmd_MS_attr_reporting(tvbuff_t *tvb, packet_info *pinfo _U_,
*/
static guint
dissect_zbee_nwk_gp_cmd_commissioning_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
zbee_nwk_green_power_packet *packet _U_, guint offset)
zbee_nwk_green_power_packet *packet, guint offset)
{
guint8 cr_options;
guint8 cr_sec_level;

3
epan/dissectors/packet-zbee-zcl-general.c
View file

@ -1,4 +1,3 @@
/* packet-zbee-zcl-general.c
* Dissector routines for the ZigBee ZCL General clusters like
* Basic, Identify, OnOff ...
@ -13643,8 +13642,6 @@ dissect_zbee_zcl_gp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb_composite_finalize(gtvb);
/* prevent overwriting COL_INFO */
col_set_writable(pinfo->cinfo, COL_INFO, FALSE);
/* Actually dissect_zbee_nwk_gp_cmd wants zbee_nwk_green_power_packet*
* as a data but never uses it. */
call_dissector_only(zgp_handle, gtvb, pinfo, tree, NULL);
col_set_writable(pinfo->cinfo, COL_INFO, writable);
offset += payload_size;