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/packet.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/packet.c')
| -rw-r--r-- | epan/packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/packet.c b/epan/packet.c index 21ea2d2b88..8deef8fdef 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -782,8 +782,8 @@ call_dissector_work_error(dissector_handle_t handle, tvbuff_t *tvb, saved_proto = pinfo->current_proto; saved_can_desegment = pinfo->can_desegment; - save_writable = col_get_writable(pinfo->cinfo); - col_set_writable(pinfo->cinfo, FALSE); + save_writable = col_get_writable(pinfo->cinfo, -1); + col_set_writable(pinfo->cinfo, -1, FALSE); copy_address_shallow(&save_dl_src, &pinfo->dl_src); copy_address_shallow(&save_dl_dst, &pinfo->dl_dst); copy_address_shallow(&save_net_src, &pinfo->net_src); @@ -799,7 +799,7 @@ call_dissector_work_error(dissector_handle_t handle, tvbuff_t *tvb, /* * Restore the column writability and addresses. */ - col_set_writable(pinfo->cinfo, save_writable); + col_set_writable(pinfo->cinfo, -1, save_writable); copy_address_shallow(&pinfo->dl_src, &save_dl_src); copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); copy_address_shallow(&pinfo->net_src, &save_net_src); @@ -841,7 +841,7 @@ call_dissector_work_error(dissector_handle_t handle, tvbuff_t *tvb, } ENDTRY; - col_set_writable(pinfo->cinfo, save_writable); + col_set_writable(pinfo->cinfo, -1, save_writable); copy_address_shallow(&pinfo->dl_src, &save_dl_src); copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); copy_address_shallow(&pinfo->net_src, &save_net_src); |