From 8bd04c8be3304731dc319a35d1e6974193bcd3c1 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Sun, 3 Sep 2017 20:50:40 +0100 Subject: [PATCH] IMF: preserve carrying protocol (e.g. SMTP, POP, IMAP) in protocol column Change-Id: I8331040bbc9866878e74ad4c5f6b986dd94603fc Reviewed-on: https://code.wireshark.org/review/23381 Petri-Dish: Martin Mathieson Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-imf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index d2867389d7..61d48d394a 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -752,7 +752,11 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) eo_info->subject_data = ""; } + /* Want to preserve existing protocol name and show that it is carrying IMF */ + col_append_str(pinfo->cinfo, COL_PROTOCOL, "|"); + col_set_fence(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); + col_clear(pinfo->cinfo, COL_INFO); item = proto_tree_add_item(tree, proto_imf, tvb, 0, -1, ENC_NA);