Pull request #4548: stream_tcp: initialize 3whs normalizer for peer tracker separately

Merge in SNORT/snort3 from ~JALIIMRA/snort3:init_peer_tracker_norm to master

Squashed commit of the following:

commit 330edd264c0d87c0f04e2e913e28c6bcd8de3903
Author: Juweria Ali Imran <jaliimra@cisco.com>
Date:   Mon Dec 16 16:44:33 2024 -0500

    stream_tcp: initialize 3whs normalizer for peer tracker separately

diff --git a/src/stream/tcp/tcp_state_listen.cc b/src/stream/tcp/tcp_state_listen.cc
index f9b00bd22f2d5462bd22221bd89394389e46ed21..34484fc19e1c6611560deda87bf185e8ffb7472a 100644 (file)
--- a/src/stream/tcp/tcp_state_listen.cc
+++ b/src/stream/tcp/tcp_state_listen.cc
@@ -67,8 +67,8 @@ bool TcpStateListen::data_seg_sent(TcpSegmentDescriptor& tsd, TcpStreamTracker&
         TcpStreamTracker* listener = tsd.get_listener();
         TcpStreamTracker* talker = tsd.get_talker();
 
-        trk.normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, listener, talker);
-        trk.normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, talker, listener);
+        talker->normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, talker, listener);
+        listener->normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, listener, talker);
         flow->set_session_flags(SSNFLAG_MIDSTREAM);
 
         if ( PacketTracer::is_active() )

diff --git a/src/stream/tcp/tcp_state_none.cc b/src/stream/tcp/tcp_state_none.cc
index aa10e4421b2fe22e4f17bb8dbc46d0d24a169eea..5f27ef5bbc448beff4d87eaff5fcc55f194be425 100644 (file)
--- a/src/stream/tcp/tcp_state_none.cc
+++ b/src/stream/tcp/tcp_state_none.cc
@@ -67,8 +67,8 @@ bool TcpStateNone::data_seg_sent(TcpSegmentDescriptor& tsd, TcpStreamTracker& tr
         TcpStreamTracker* listener = tsd.get_listener();
         TcpStreamTracker* talker = tsd.get_talker();
 
-        trk.normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, listener, talker);
-        trk.normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, talker, listener);
+        talker->normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, talker, listener);
+        listener->normalizer.init(StreamPolicy::MISSED_3WHS, trk.session, listener, talker);
         flow->set_session_flags(SSNFLAG_MIDSTREAM);
 
         if ( PacketTracer::is_active() )