aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ositp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-26 08:25:32 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-27 05:00:37 +0000
commit10261d120283cb739118fa7178b4e911ed72de14 (patch)
tree034d43a2eb1757d37cf9cc1453de9b815e0ad2bc /epan/dissectors/packet-ositp.c
parente2d5089cb9ad555bc0361768a5eaf24b3bd1379c (diff)
Remove manual setting of pinfo->current_proto.
Calling a protocol dissection function will properly set/restore pinfo->current_proto, so there's no need to duplicate it. Change-Id: Ic2ec0b35fa4d46a98f3410bf238056425076e4a9 Reviewed-on: https://code.wireshark.org/review/12205 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ositp.c')
-rw-r--r--epan/dissectors/packet-ositp.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 816f8b3889..7da6b4b1d1 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -2108,12 +2108,6 @@ static gint dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo,
gboolean is_cltp = FALSE;
gboolean subdissector_found = FALSE;
- if (!proto_is_protocol_enabled(find_protocol_by_id(proto_cotp)))
- return FALSE; /* COTP has been disabled */
- /* XXX - what about CLTP? */
-
- pinfo->current_proto = "COTP";
-
/* Initialize the COL_INFO field; each of the TPDUs will have its
information appended. */
col_set_str(pinfo->cinfo, COL_INFO, "");