From: Russ Combs <rucombs@cisco.com>
Date: Mon, 10 Nov 2014 13:42:11 +0000 (-0500)
Subject: patched around shutdown issue after reload
X-Git-Tag: 3.0.0-233~1243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11683d98672df4449cbe1115a994c4dccf40ef58;p=thirdparty%2Fsnort3.git

patched around shutdown issue after reload
---

diff --git a/ChangeLog b/ChangeLog
index b9cbfea60..b9e59fc1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 -- fix icmp session cleanup counting
 -- fix null flow_con in print mode
 -- fixed udp session timeout counting
+-- patched around shutdown issue after reload
 
 127
 -- REG_TEST out logging tcp options for rebuilt packets to match snort bug
diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index c79c9fcef..ff74191fe 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -493,7 +493,9 @@ void InspectorManager::thread_stop(SnortConfig*)
     if ( pi && pi->framework_policy )
     {
         for ( auto* p : pi->framework_policy->ilist )
-            if ( !p->pp_class.init )
+            // FIXIT-H init set after reload preventing call to
+            // StreamBase::tterm() which is bad, m'kay?
+            //if ( !p->pp_class.init )
             {
                 p->handler->tterm();
                 p->pp_class.init = true;