From: Russ Combs Date: Thu, 27 Oct 2016 12:38:26 +0000 (-0400) Subject: fix merge with master X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e6bc897189b7ef8990cb7df2f6243ad09a9f052;p=thirdparty%2Fsnort3.git fix merge with master --- diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc index e31b8ae73..24c13e248 100644 --- a/src/detection/detection_engine.cc +++ b/src/detection/detection_engine.cc @@ -177,6 +177,9 @@ bool DetectionEngine::offloaded(Packet* p) void DetectionEngine::idle() { + if ( !offload_ids ) + return; + while ( !offload_ids->empty() ) { const struct timespec blip = { 0, 1 }; @@ -343,6 +346,8 @@ void DetectionEngine::inspect(Packet* p) log_events(p); reset(); + + Stream::check_flow_block_pending(p); } // Return 0 if no OTN since -1 return indicates queue limit reached.