stream: improve raw reassembly

When checking the reassembly limit for raw reassembly, consider the
STREAMTCP_STREAM_FLAG_NOREASSEMBLY a trigger immediately. We won't
process any more segments in the reassembly engine anyway.

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 97524d0616eeab22de3b6dda3c00c75857e326ce..9c97161e5c14a4cd6b9d05079a1e3f5f908354ea 100644 (file)
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -1764,6 +1764,11 @@ static int StreamTcpReassembleRawCheckLimit(TcpSession *ssn, TcpStream *stream,
 {
     SCEnter();
 
+    if (stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) {
+        SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_NOREASSEMBLY is set, so not expecting any new packets");
+        SCReturnInt(1);
+    }
+
     if (ssn->flags & STREAMTCP_FLAG_TRIGGER_RAW_REASSEMBLY) {
         SCLogDebug("reassembling now as STREAMTCP_FLAG_TRIGGER_RAW_REASSEMBLY is set");
         ssn->flags &= ~STREAMTCP_FLAG_TRIGGER_RAW_REASSEMBLY;