Merge pull request #1364 in SNORT/snort3 from offload_inspector_clear to master

Squashed commit of the following:

commit 6e21621729fe149abf19a943c6b52aeab1186c98
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Sep 18 16:06:02 2018 -0400

    DetectionEngine: Only clear inspector data after offloads have completed

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index 53fae34df2ef8752c11e0322a4d4285becac6901..3ef5b3a377fa09a541b412f5def1d1a4b167b9ad 100644 (file)
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -153,7 +153,7 @@ void DetectionEngine::finish_inspect(Packet* p, bool inspected)
     // this also handles block pending state
     Stream::check_flow_closed(p);
 
-    if ( inspected )
+    if ( inspected and (!p->flow or !p->flow->is_offloaded()) )
         InspectorManager::clear(p);
 
     clear_events(p);