]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4711: stream_tcp: do not purge seglist data on held packet retransmit
authorJuweria Ali Imran (jaliimra) <jaliimra@cisco.com>
Fri, 23 May 2025 14:46:27 +0000 (14:46 +0000)
committerSteve Chew (stechew) <stechew@cisco.com>
Fri, 23 May 2025 14:46:27 +0000 (14:46 +0000)
Merge in SNORT/snort3 from ~JALIIMRA/snort3:held_packet_retransmit to master

Squashed commit of the following:

commit 2fba7b400772dec79ab54a19bc52897d949e35d3
Author: Juweria Ali Imran <jaliimra@cisco.com>
Date:   Thu Apr 24 20:36:30 2025 -0400

    stream_tcp: do not purge seglist data on held packet retransmit

src/stream/tcp/tcp_reassembler.cc

index 8a0236ea9061c729a5b63602fefe9549b6e7fcc0..6b2df0fd5f411543e6ae529469ff461ce4c2464f 100644 (file)
@@ -567,6 +567,7 @@ void TcpReassemblerBase::flush_queued_segments(Flow* flow, bool clear, Packet* p
     }
 }
 
+
 void TcpReassemblerBase::check_first_segment_hole()
 {
     if ( SEQ_LT(seglist.seglist_base_seq, seglist.head->start_seq()) )
@@ -593,11 +594,6 @@ uint32_t TcpReassemblerBase::perform_partial_flush(Packet* p)
         paf.paf_jump(flushed);
         tcpStats.partial_flushes++;
         tcpStats.partial_flush_bytes += flushed;
-        if ( seglist.seg_count )
-        {
-            purge_to_seq(seglist.head->start_seq() + flushed);
-            tracker.r_win_base = seglist.seglist_base_seq;
-        }
     }
 
     return flushed;
@@ -672,3 +668,4 @@ TcpReassemblerIgnore* TcpReassemblerIgnore::get_instance(bool server_tracker)
         return ignore_reassembler_client;
 }
 
+