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-openflow_v5.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-openflow_v5.c')
| -rw-r--r-- | epan/dissectors/packet-openflow_v5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 1822f673c5..cc9d9d4d4e 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -2049,7 +2049,7 @@ dissect_openflow_packet_in_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree data_tree = proto_tree_add_subtree(tree, tvb, offset, length - offset, ett_openflow_v5_packet_in_data, NULL, "Data"); /* save some state */ - save_writable = col_get_writable(pinfo->cinfo); + save_writable = col_get_writable(pinfo->cinfo, -1); save_in_error_pkt = pinfo->flags.in_error_pkt; copy_address_shallow(&save_dl_src, &pinfo->dl_src); copy_address_shallow(&save_dl_dst, &pinfo->dl_dst); @@ -2059,12 +2059,12 @@ dissect_openflow_packet_in_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree copy_address_shallow(&save_dst, &pinfo->dst); /* dissect data */ - col_set_writable(pinfo->cinfo, FALSE); + col_set_writable(pinfo->cinfo, -1, FALSE); next_tvb = tvb_new_subset_length(tvb, offset, length - offset); call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, data_tree); /* restore saved state */ - col_set_writable(pinfo->cinfo, save_writable); + col_set_writable(pinfo->cinfo, -1, save_writable); pinfo->flags.in_error_pkt = save_in_error_pkt; copy_address_shallow(&pinfo->dl_src, &save_dl_src); copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); @@ -2788,7 +2788,7 @@ dissect_openflow_packet_out_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree data_tree = proto_tree_add_subtree(tree, tvb, offset, length - offset, ett_openflow_v5_packet_out_data, NULL, "Data"); /* save some state */ - save_writable = col_get_writable(pinfo->cinfo); + save_writable = col_get_writable(pinfo->cinfo, -1); save_in_error_pkt = pinfo->flags.in_error_pkt; copy_address_shallow(&save_dl_src, &pinfo->dl_src); copy_address_shallow(&save_dl_dst, &pinfo->dl_dst); @@ -2798,12 +2798,12 @@ dissect_openflow_packet_out_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree copy_address_shallow(&save_dst, &pinfo->dst); /* dissect data */ - col_set_writable(pinfo->cinfo, FALSE); + col_set_writable(pinfo->cinfo, -1, FALSE); next_tvb = tvb_new_subset_length(tvb, offset, length - offset); call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, data_tree); /* restore saved state */ - col_set_writable(pinfo->cinfo, save_writable); + col_set_writable(pinfo->cinfo, -1, save_writable); pinfo->flags.in_error_pkt = save_in_error_pkt; copy_address_shallow(&pinfo->dl_src, &save_dl_src); copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); |