From f0beb239fe649c347a56bfae338654365c762505 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Wed, 17 Feb 2021 15:43:17 +0100 Subject: [PATCH] tcp: remove debug asserts about large windows Completes 00d7c9034be7470177c01e8805831c258b016d0e (cherry picked from commit 7264f58f2cbf266ba44efd32c5031b692b57967d) --- src/stream-tcp-list.c | 1 - src/stream-tcp-reassemble.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/stream-tcp-list.c b/src/stream-tcp-list.c index cb47ee8e92..8c1d340423 100644 --- a/src/stream-tcp-list.c +++ b/src/stream-tcp-list.c @@ -743,7 +743,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 bd242b621f..0609b01d73 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -950,7 +950,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; @@ -1063,7 +1062,6 @@ static int ReassembleUpdateAppLayer (ThreadVars *tv, if (STREAM_LASTACK_GT_BASESEQ(*stream)) { /* get window of data that is acked */ 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; } @@ -1483,7 +1481,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; } @@ -1580,7 +1577,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); -- 2.47.2