From 217c0e65f10dd8677c640fd46d7be5af3e1af45f Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Wed, 1 Jul 2020 12:57:18 +0200 Subject: NGAP: Preserve column info when NGAP is embedded in HTTP2. Fix regression due to different dissector function called. Change-Id: Ibf3bfc5ac1cb740e71afa89018d57808c418cdab Reviewed-on: https://code.wireshark.org/review/37638 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/asn1/ngap/packet-ngap-template.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'epan/dissectors/asn1') diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index d24885674e..8f2dc94412 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -556,7 +556,10 @@ dissect_ngap_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi col_append_sep_str(pinfo->cinfo, COL_PROTOCOL, "/", "NGAP"); ngap_item = proto_tree_add_item(tree, proto_ngap, tvb, 0, -1, ENC_NA); ngap_tree = proto_item_add_subtree(ngap_item, ett_ngap); + gboolean save_writable = col_get_writable(pinfo->cinfo, COL_PROTOCOL); + col_set_writable(pinfo->cinfo, COL_PROTOCOL, FALSE); call_dissector_with_data(subdissector, tvb, pinfo, ngap_tree, NULL); + col_set_writable(pinfo->cinfo, COL_PROTOCOL, save_writable); return tvb_captured_length(tvb); } else { return 0; -- cgit v1.2.3