From: Andrii Serbeniuk -X (aserbeni - SOFTSERVE INC at Cisco) <aserbeni@cisco.com>
Date: Thu, 29 Feb 2024 15:34:45 +0000 (+0000)
Subject: Pull request #4229: stream: remove splitter from session before inspectors
X-Git-Tag: 3.1.82.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=003c84fb5fac0ff75c561bff5beb5561448f34aa;p=thirdparty%2Fsnort3.git

Pull request #4229: stream: remove splitter from session before inspectors

Merge in SNORT/snort3 from ~ASERBENI/snort3:http_splitter_tsan to master

Squashed commit of the following:

commit c130ef97ed07885fff092d5b5c0fb79caaa7b595
Author: Vitalii <vhorbato@cisco.com>
Date:   Fri Nov 11 11:01:07 2022 +0200

    stream: remove splitter from session before inspectors
---

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 14c427758..9498414cc 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -200,6 +200,9 @@ void TcpSession::clear_session(bool free_flow_data, bool flush_segments, bool re
 
     update_perf_base_state(TcpStreamTracker::TCP_CLOSED);
 
+    set_splitter(true, nullptr);
+    set_splitter(false, nullptr);
+
     if ( restart )
     {
         flow->restart(free_flow_data);
@@ -213,9 +216,6 @@ void TcpSession::clear_session(bool free_flow_data, bool flush_segments, bool re
         server.reassembler.clear_paf();
     }
 
-    set_splitter(true, nullptr);
-    set_splitter(false, nullptr);
-
     tel.log_internal_event(SESSION_EVENT_CLEAR);
 }