stream: raw reassembly explicit disable raw handling

9 years ago · 2f77302eeb
parent d6d7f65050
commit 2f77302eeb
1 changed files with 3 additions and 2 deletions
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@ -1218,7 +1218,8 @@ bool StreamReassembleRawHasDataReady(TcpSession *ssn, Packet *p)
        return false;
    }

-    if (stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY)
+    if (stream->flags & (STREAMTCP_STREAM_FLAG_NOREASSEMBLY|
+                         STREAMTCP_STREAM_FLAG_DISABLE_RAW))
        return false;

    if (StreamTcpInlineMode() == FALSE) {
@ -1543,7 +1544,7 @@ int StreamReassembleRaw(TcpSession *ssn, const Packet *p,
        stream = &ssn->server;
    }

-    if ((stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) ||
+    if ((stream->flags & (STREAMTCP_STREAM_FLAG_NOREASSEMBLY|STREAMTCP_STREAM_FLAG_DISABLE_RAW)) ||
        StreamTcpReassembleRawCheckLimit(ssn, stream, p) == 0)
    {
        *progress_out = STREAM_RAW_PROGRESS(stream);