From a0be5ad6f1b964db0cc7fc948d1deb9ac89971b8 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 29 Dec 2016 19:41:33 -0500 Subject: Add interface for "pinos" (Protocols in name only) This is for dissectors that need distinguishing names either for registering multiple dissection functions in a single dissector table or for "internal" dissectors whose just need a name associated with the dissection function. Features like enable/disable are handled by the "parent" protocol. This avoids clutter in the "official" protocol list. Change-Id: I69e7d27d332ae85286f254e95e8d79920da7a9e2 Reviewed-on: https://code.wireshark.org/review/19464 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/packet.c') diff --git a/epan/packet.c b/epan/packet.c index 5a0b2e115a..67ebb65f4b 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -642,7 +642,7 @@ call_dissector_through_handle(dissector_handle_t handle, tvbuff_t *tvb, saved_proto = pinfo->current_proto; - if (handle->protocol != NULL) { + if ((handle->protocol != NULL) && (!proto_is_pino(handle->protocol))) { pinfo->current_proto = proto_get_protocol_short_name(handle->protocol); } @@ -702,7 +702,7 @@ call_dissector_work(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pinfo */ pinfo->saved_can_desegment = saved_can_desegment; pinfo->can_desegment = saved_can_desegment-(saved_can_desegment>0); - if (handle->protocol != NULL) { + if ((handle->protocol != NULL) && (!proto_is_pino(handle->protocol))) { pinfo->current_proto = proto_get_protocol_short_name(handle->protocol); -- cgit v1.2.3