From: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date: Thu, 10 Nov 2022 18:09:18 +0000 (+0000)
Subject: Pull request #3662: Master stream: ignore flushing from meta-ack if sent after FIN
X-Git-Tag: 3.1.47.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ad5504d99ca1f804df2242db4d935adf6e3d41c;p=thirdparty%2Fsnort3.git

Pull request #3662: Master stream: ignore flushing from meta-ack if sent after FIN

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

Squashed commit of the following:

commit f6818718191ac312df3c8cdc6ab980374163c20d
Author: Juweria Ali Imran <jaliimra@cisco.com>
Date:   Thu Nov 10 10:20:42 2022 -0500

    stream: ignore flushing from meta-ack if sent after FIN
---

diff --git a/src/stream/tcp/tcp_stream_tracker.cc b/src/stream/tcp/tcp_stream_tracker.cc
index 6915ad848..152af86ec 100644
--- a/src/stream/tcp/tcp_stream_tracker.cc
+++ b/src/stream/tcp/tcp_stream_tracker.cc
@@ -538,7 +538,7 @@ void TcpStreamTracker::update_tracker_ack_sent(TcpSegmentDescriptor& tsd)
     }
 
     if ( ( fin_seq_status == TcpStreamTracker::FIN_WITH_SEQ_SEEN )
-        && SEQ_GEQ(tsd.get_ack(), fin_final_seq + 1) )
+        && SEQ_GEQ(tsd.get_ack(), fin_final_seq + 1) && !(tsd.is_meta_ack_packet()) )
     {
         fin_seq_status = TcpStreamTracker::FIN_WITH_SEQ_ACKED;
     }