From: Victor Julien <vjulien@oisf.net>
Date: Fri, 22 Apr 2022 17:33:13 +0000 (+0200)
Subject: stream/unittests: fix failures after last_ack fix
X-Git-Tag: suricata-5.0.10~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6562085251ff1adb9c729e7d3e230cfa8c1e36e;p=thirdparty%2Fsuricata.git

stream/unittests: fix failures after last_ack fix

Work around many tests not setting up stream completely or correctly.

(cherry picked from commit 3d6e733aa7297f64fe87cc3b59fbbd9a527513fa)
---

diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h
index 11d616a995..0e2ea46fae 100644
--- a/src/stream-tcp-reassemble.h
+++ b/src/stream-tcp-reassemble.h
@@ -133,8 +133,14 @@ void StreamTcpReassemblySetMinInspectDepth(TcpSession *ssn, int direction, uint3
 static inline bool STREAM_LASTACK_GT_BASESEQ(const TcpStream *stream)
 {
     /* last ack not yet initialized */
-    if (STREAM_BASE_OFFSET(stream) == 0 && (stream->tcp_flags & TH_ACK) == 0)
+    if (STREAM_BASE_OFFSET(stream) == 0 && (stream->tcp_flags & TH_ACK) == 0) {
+#ifdef UNITTESTS
+        if (RunmodeIsUnittests() && stream->last_ack == 0)
+            return false;
+#else
         return false;
+#endif
+    }
     if (SEQ_GT(stream->last_ack, stream->base_seq))
         return true;
     return false;