From 24eeabfbf907e5d02d25ab5aa29871018294b646 Mon Sep 17 00:00:00 2001 From: Ilya Bakhtin Date: Mon, 15 Feb 2021 18:36:46 +0100 Subject: [PATCH] protodetect: improve midstream handling Set "done flag" only if parsers for both directions are not found in a case of midstream parsers from other direction are tried if nothing is found for the initial one. "done flag" must be set if nothing is found in both directions. Otherwise processing of incomplete data is terminated at the very first try. (cherry picked from commit 5285163d8f31dc89a4ab96b0842099f9792e29be) --- src/app-layer-detect-proto.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c index be5607e70d..dd173e37af 100644 --- a/src/app-layer-detect-proto.c +++ b/src/app-layer-detect-proto.c @@ -499,6 +499,7 @@ static AppProto AppLayerProtoDetectPPGetProto(Flow *f, uint8_t dir = idir; uint16_t dp = f->protodetect_dp ? f->protodetect_dp : FLOW_GET_DP(f); uint16_t sp = FLOW_GET_SP(f); + bool probe_is_found = false; again_midstream: if (idir != dir) { @@ -555,9 +556,9 @@ again_midstream: if (pe1 == NULL && pe2 == NULL) { SCLogDebug("%s - No probing parsers found for either port", (dir == STREAM_TOSERVER) ? "toserver":"toclient"); - if (dir == idir) - FLOW_SET_PP_DONE(f, dir); goto noparsers; + } else { + probe_is_found = true; } /* run the parser(s): always call with original direction */ @@ -590,8 +591,8 @@ again_midstream: } } - noparsers: - if (stream_config.midstream == true && idir == dir) { +noparsers: + if (stream_config.midstream && idir == dir) { if (idir == STREAM_TOSERVER) { dir = STREAM_TOCLIENT; } else { @@ -600,6 +601,8 @@ again_midstream: SCLogDebug("no match + midstream, retry the other direction %s", (dir == STREAM_TOSERVER) ? "toserver" : "toclient"); goto again_midstream; + } else if (!probe_is_found) { + FLOW_SET_PP_DONE(f, idir); } end: -- 2.47.2