aboutsummaryrefslogtreecommitdiffstats
path: root/epan/packet.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-12-29 19:41:33 -0500
committerMichael Mann <mmann78@netscape.net>2016-12-31 13:08:41 +0000
commita0be5ad6f1b964db0cc7fc948d1deb9ac89971b8 (patch)
tree9a960b1a0a4e188c8eff7e81c1a998733fa360b6 /epan/packet.c
parent6a5fcc5a38936d940e4fa50294be0648a3ab6ea9 (diff)
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 <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c4
1 files changed, 2 insertions, 2 deletions
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);