From: Philippe Antoine <contact@catenacyber.fr>
Date: Wed, 17 Feb 2021 14:43:17 +0000 (+0100)
Subject: tcp: remove debug asserts about large windows
X-Git-Tag: suricata-7.0.0-beta1~1783
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7264f58f2cbf266ba44efd32c5031b692b57967d;p=thirdparty%2Fsuricata.git

tcp: remove debug asserts about large windows

Completes 00d7c9034be7470177c01e8805831c258b016d0e
---

diff --git a/src/stream-tcp-list.c b/src/stream-tcp-list.c
index 518e958977..0497272cfd 100644
--- a/src/stream-tcp-list.c
+++ b/src/stream-tcp-list.c
@@ -741,7 +741,6 @@ static inline uint64_t GetLeftEdge(TcpSession *ssn, TcpStream *stream)
         if (STREAM_LASTACK_GT_BASESEQ(stream)) {
             /* get window of data that is acked */
             const uint32_t delta = stream->last_ack - stream->base_seq;
-            DEBUG_VALIDATE_BUG_ON(delta > 10000000ULL && delta > stream->window);
             /* get max absolute offset */
             last_ack_abs += delta;
         }
diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 90364ebbd6..5c05e42a6a 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -986,7 +986,6 @@ static inline bool CheckGap(TcpSession *ssn, TcpStream *stream, Packet *p)
     if (STREAM_LASTACK_GT_BASESEQ(stream)) {
         /* get window of data that is acked */
         const uint32_t delta = stream->last_ack - stream->base_seq;
-        DEBUG_VALIDATE_BUG_ON(delta > 10000000ULL && delta > stream->window);
         /* get max absolute offset */
         last_ack_abs += delta;
 
@@ -1577,7 +1576,6 @@ static int StreamReassembleRawInline(TcpSession *ssn, const Packet *p,
         uint64_t last_ack_abs = STREAM_BASE_OFFSET(stream);
         if (STREAM_LASTACK_GT_BASESEQ(stream)) {
             uint32_t delta = stream->last_ack - stream->base_seq;
-            DEBUG_VALIDATE_BUG_ON(delta > 10000000ULL && delta > stream->window);
             /* get max absolute offset */
             last_ack_abs += delta;
         }
@@ -1674,7 +1672,6 @@ static int StreamReassembleRawDo(TcpSession *ssn, TcpStream *stream,
     if (STREAM_LASTACK_GT_BASESEQ(stream)) {
         SCLogDebug("last_ack %u, base_seq %u", stream->last_ack, stream->base_seq);
         uint32_t delta = stream->last_ack - stream->base_seq;
-        DEBUG_VALIDATE_BUG_ON(delta > 10000000ULL && delta > stream->window);
         /* get max absolute offset */
         last_ack_abs += delta;
         SCLogDebug("last_ack_abs %"PRIu64, last_ack_abs);