From: Victor Julien <victor@inliniac.net>
Date: Thu, 23 Feb 2017 12:09:46 +0000 (+0100)
Subject: stream: StreamTcpReassembleRawCheckLimit cleanup
X-Git-Tag: suricata-4.0.0-beta1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69519bda48f24b84b7d621f759d0d3045660225b;p=thirdparty%2Fsuricata.git

stream: StreamTcpReassembleRawCheckLimit cleanup
---

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 3586e3cfc8..6d38da51e1 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -696,21 +696,27 @@ static int StreamTcpReassembleRawCheckLimit(const TcpSession *ssn,
 {
     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 (stream->flags & STREAMTCP_STREAM_FLAG_TRIGGER_RAW) {
-        SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_TRIGGER_RAW is set");
-        SCReturnInt(1);
-    }
-
-    if (stream->flags & STREAMTCP_STREAM_FLAG_NEW_RAW_DISABLED) {
-        SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_NEW_RAW_DISABLED is set, "
-                "so no new segments will be considered");
+    /* if any of these flags is set we always inspect immediately */
+#define STREAMTCP_STREAM_FLAG_FLUSH_FLAGS       \
+        (   STREAMTCP_STREAM_FLAG_NOREASSEMBLY  \
+        |   STREAMTCP_STREAM_FLAG_TRIGGER_RAW   \
+        |   STREAMTCP_STREAM_FLAG_NEW_RAW_DISABLED)
+
+    if (stream->flags & STREAMTCP_STREAM_FLAG_FLUSH_FLAGS) {
+        if (stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) {
+            SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_NOREASSEMBLY "
+                    "is set, so not expecting any new packets");
+        }
+        if (stream->flags & STREAMTCP_STREAM_FLAG_TRIGGER_RAW) {
+            SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_TRIGGER_RAW is set");
+        }
+        if (stream->flags & STREAMTCP_STREAM_FLAG_NEW_RAW_DISABLED) {
+            SCLogDebug("reassembling now as STREAMTCP_STREAM_FLAG_NEW_RAW_DISABLED is set, "
+                    "so no new segments will be considered");
+        }
         SCReturnInt(1);
     }
+#undef STREAMTCP_STREAM_FLAG_FLUSH_FLAGS
 
     /* some states mean we reassemble no matter how much data we have */
     if (ssn->state > TCP_TIME_WAIT)