From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Wed, 26 Sep 2018 19:24:48 +0000 (-0400)
Subject: Merge pull request #1364 in SNORT/snort3 from offload_inspector_clear to master
X-Git-Tag: 3.0.0-249~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5d84e8902d2c58b336d7bfcde52525ea0f1f9b;p=thirdparty%2Fsnort3.git

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 53fae34df..3ef5b3a37 100644
--- 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);