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 14c427758bf2383e65daa5afbcd99c5bda4b1173..9498414cc427bc5c129b72fa4029e9b85d80d2c1 100644 (file)
--- 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);
 }