From 0ef1d941ea971fc4367b97ca7e7ab7a2ee9e9b88 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 14 Jun 2016 11:55:08 -0400 Subject: 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 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-diameter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-diameter.c') diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 45ff749036..7bfa12c15e 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -447,12 +447,12 @@ dissect_diameter_eap_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree gboolean save_writable; /* Ensure the packet is displayed as Diameter, not EAP */ - save_writable = col_get_writable(pinfo->cinfo); - col_set_writable(pinfo->cinfo, FALSE); + save_writable = col_get_writable(pinfo->cinfo, COL_PROTOCOL); + col_set_writable(pinfo->cinfo, COL_PROTOCOL, FALSE); call_dissector(eap_handle, tvb, pinfo, tree); - col_set_writable(pinfo->cinfo, save_writable); + col_set_writable(pinfo->cinfo, COL_PROTOCOL, save_writable); return tvb_reported_length(tvb); } @@ -877,7 +877,8 @@ proto_avp(diam_ctx_t *c, diam_avp_t *a, tvbuff_t *tvb, diam_sub_dis_t *diam_sub_ { proto_avp_t *t = (proto_avp_t *)a->type_data; - col_set_writable(c->pinfo->cinfo, FALSE); + col_set_writable(c->pinfo->cinfo, COL_PROTOCOL, FALSE); + col_set_writable(c->pinfo->cinfo, COL_INFO, FALSE); if (!t->handle) { t->handle = find_dissector(t->name); -- cgit v1.2.3