From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Fri, 17 Apr 2020 20:32:25 +0000 (+0000)
Subject: Merge pull request #2161 in SNORT/snort3 from ~DERAMADA/snort3:h2i_discard_split_pref... 
X-Git-Tag: 3.0.1-2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb2569aa38a1ca15d2b48c59de2490b425f040e;p=thirdparty%2Fsnort3.git

Merge pull request #2161 in SNORT/snort3 from ~DERAMADA/snort3:h2i_discard_split_preface to master

Squashed commit of the following:

commit f8545189f4980ad464cc7acbae782de0fe393c77
Author: deramada <deramada@cisco.com>
Date:   Tue Apr 14 10:54:50 2020 -0400

    http2_inspect: discard split connection preface
---

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
index 1f8996eeb..478e149fa 100644
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
@@ -272,7 +272,10 @@ StreamSplitter::Status Http2StreamSplitter::implement_scan(Http2FlowData* sessio
             return StreamSplitter::ABORT;
         case V_TBD:
             session_data->scan_octets_seen[source_id] += length;
-            return StreamSplitter::SEARCH;
+            assert(session_data->scan_octets_seen[source_id] < 24);
+            *flush_offset = length;
+            session_data->payload_discard[source_id] = true;
+            return StreamSplitter::FLUSH;
         }
     }
     else