diff options
| author | Michael Mann <mmann78@netscape.net> | 2018-02-01 19:51:36 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-02 01:50:27 +0000 |
| commit | dc86a285c1c7c23309728d587c3aaeeef3db6238 (patch) | |
| tree | 5f2a8ef8b9175b084a20958d4ce61c808a071116 | |
| parent | 8bf837eddc0ab120ad16273b773fa6cd8ec5c9f4 (diff) | |
SoupBinTCP: Remove try_conversation_dissector call
As stated in the #if 0ed out comments, It's not valid for a
soupbintcp subdissector to call conversation_set_dissector(), so
it shouldn't call try_conversation_dissector. Just remove the
call entirely so it doesn't look like the removal is temporary.
Change-Id: I68d9b72360b52002692c369d7b202a8a215c0a96
Reviewed-on: https://code.wireshark.org/review/25555
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-soupbintcp.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index d61b1e5d58..7042554741 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -382,22 +382,6 @@ dissect_soupbintcp_common( /* Sub-dissector tvb starts at 3 (length (2) + pkt_type (1)) */ sub_tvb = tvb_new_subset_remaining(tvb, 3); -#if 0 /* XXX: It's not valid for a soupbintcp subdissector to call */ - /* conversation_set_dissector() since the conversation is really */ - /* a TCP conversation. (A 'soupbintcp' port type would need to */ - /* be defined to be able to use conversation_set_dissector()). */ - /* In addition, no current soupbintcp subdissector calls */ - /* conversation_set_dissector(). */ - - /* If this packet is part of a conversation, call dissector - * for the conversation if available */ - if (try_conversation_dissector(&pinfo->dst, &pinfo->src, conversation_pt_to_endpoint_type(pinfo->ptype), - pinfo->srcport, pinfo->destport, - sub_tvb, pinfo, tree, NULL)) { - return; - } -#endif - /* Otherwise, try heuristic dissectors */ if (dissector_try_heuristic(heur_subdissector_list, sub_tvb, |