diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-14 11:55:08 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-15 06:03:57 +0000 |
| commit | 0ef1d941ea971fc4367b97ca7e7ab7a2ee9e9b88 (patch) | |
| tree | 824d57e52d2cef773f6f93394483bd0f32cc94b8 /epan/dissectors/packet-zbee-zcl-general.c | |
| parent | c19e6c24067fd0aa1ea628de85f25ef9ece08839 (diff) | |
Allow control of individual columns to be (un)writable.
Most protocols just want to limit COL_INFO or COL_PROTOCOL
so give that level of granularity.
Bug: 12144
Bug: 5117
Bug: 11144
Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8
Reviewed-on: https://code.wireshark.org/review/15894
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
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-zbee-zcl-general.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-general.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 45bcadf7df..611306f963 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -12679,18 +12679,18 @@ dissect_zbee_zcl_gp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (payload_size != 0 && payload_size != 0xff) { tvbuff_t *gtvb = tvb_new_composite(); - gboolean writable = col_get_writable(pinfo->cinfo); + gboolean writable = col_get_writable(pinfo->cinfo, COL_INFO); /* remove payload length and put command id instead */ tvb_composite_append(gtvb, tvb_new_subset_length(tvb, offset-2, 1)); tvb_composite_append(gtvb, tvb_new_subset_length(tvb, offset, payload_size)); tvb_composite_finalize(gtvb); /* prevent overwriting COL_INFO */ - col_set_writable(pinfo->cinfo, FALSE); + 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, writable); + col_set_writable(pinfo->cinfo, COL_INFO, writable); offset += payload_size; } return offset; |