From: Eric Leblond <eric@regit.org>
Date: Sat, 14 Jul 2018 20:37:03 +0000 (+0200)
Subject: flow-manager: no force reassembly on bypassed flow
X-Git-Tag: suricata-5.0.0-rc1~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1745408c139214033396154215cbf24490e56bf5;p=thirdparty%2Fsuricata.git

flow-manager: no force reassembly on bypassed flow

When a bypassed flow is created we are forcing the reassembly so
we don't need to do it again when it timeout.
---

diff --git a/src/flow-manager.c b/src/flow-manager.c
index 97166fdb9a..d279bb9734 100644
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -275,6 +275,8 @@ static int FlowManagerFlowTimedOut(Flow *f, struct timeval *ts)
     int server = 0, client = 0;
 
     if (!(f->flags & FLOW_TIMEOUT_REASSEMBLY_DONE) &&
+            SC_ATOMIC_GET(f->flow_state) != FLOW_STATE_CAPTURE_BYPASSED &&
+            SC_ATOMIC_GET(f->flow_state) != FLOW_STATE_LOCAL_BYPASSED &&
             FlowForceReassemblyNeedReassembly(f, &server, &client) == 1) {
         FlowForceReassemblyForFlow(f, server, client);
         return 0;