From: Victor Julien <victor@inliniac.net>
Date: Thu, 2 Mar 2017 23:12:38 +0000 (+0100)
Subject: stream: raw reassembly explicit disable raw handling
X-Git-Tag: suricata-4.0.0-beta1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f77302eeb39503881b1588052e08f02cd3b0b21;p=thirdparty%2Fsuricata.git

stream: raw reassembly explicit disable raw handling
---

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 0366789f5b..dbe17dedab 100644
--- 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);