From: Tom Peters (thopeter) Date: Mon, 11 Jul 2022 20:43:04 +0000 (+0000) Subject: Pull request #3503: http_inspect: do not abort midstream pickups X-Git-Tag: 3.1.36.0~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc066e6874f48733a25fc97bfd595accfd76df8;p=thirdparty%2Fsnort3.git Pull request #3503: http_inspect: do not abort midstream pickups Merge in SNORT/snort3 from ~ADMAMOLE/snort3:midstream_pickup to master Squashed commit of the following: commit bc82cbb5677d46a254251022c7aebf01625a05c9 Author: Adrian Mamolea Date: Fri Jul 1 15:36:43 2022 -0400 http_inspect: do not abort midstream pickups --- diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc index 588e412c6..41bae3d32 100644 --- a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc +++ b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc @@ -46,8 +46,6 @@ StreamSplitter::Status Http2StreamSplitter::scan(Packet* pkt, const uint8_t* dat Profile profile(Http2Module::get_profile_stats()); Flow* const flow = pkt->flow; - if (flow->session_state & STREAM_STATE_MIDSTREAM) - return StreamSplitter::ABORT; // This is the session state information we share with Http2Inspect and store with stream. A // session is defined by a TCP connection. Since scan() is the first to see a new TCP diff --git a/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc b/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc index 549164dd3..3209cfaed 100644 --- a/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc +++ b/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc @@ -131,8 +131,6 @@ StreamSplitter::Status HttpStreamSplitter::scan(Packet* pkt, const uint8_t* data Profile profile(HttpModule::get_profile_stats()); Flow* const flow = pkt->flow; - if (flow->session_state & STREAM_STATE_MIDSTREAM) - return StreamSplitter::ABORT; // This is the session state information we share with HttpInspect and store with stream. A // session is defined by a TCP connection. Since scan() is the first to see a new TCP