Merge pull request #1286 in SNORT/snort3 from offload_crash to master

Squashed commit of the following:

commit 53d14ee1015a9df4b133589bece240fb39d84179
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jul 2 17:07:55 2018 -0400

    detection: don't offload when 0 threads are configured

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index 599ab8a59100d25f3379147f10448e4fa04b9fd6..27ef5ab40bca544d56d65db2287a1ef49cf32732 100644 (file)
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -297,8 +297,10 @@ bool DetectionEngine::offload(Packet* p)
 {
     ContextSwitcher* sw = Snort::get_switcher();
 
-    if ( p->type() != PktType::PDU or (p->dsize < SnortConfig::get_conf()->offload_limit) or
-        !sw->can_hold() )
+    if ( p->type() != PktType::PDU or
+         p->dsize < SnortConfig::get_conf()->offload_limit or
+         !sw->can_hold() or
+         !offloader->available() )
     {
         fp_local(p);
         return false;

diff --git a/src/detection/regex_offload.h b/src/detection/regex_offload.h
index 1802daab26b8bc6a491b1ef2771363422a065d53..e12d21942154cb34831301acee288180f47726af 100644 (file)
--- a/src/detection/regex_offload.h
+++ b/src/detection/regex_offload.h
@@ -49,6 +49,9 @@ public:
 
     void stop();
 
+    unsigned available()
+    { return idle.size(); }
+
     unsigned count()
     { return busy.size(); }