From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 12 Oct 2018 14:58:25 +0000 (-0400)
Subject: Merge pull request #1377 in SNORT/snort3 from offload_fp_local to master
X-Git-Tag: 3.0.0-249~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a0613a24beb2a151fd2c9b541e98f0873822a6c;p=thirdparty%2Fsnort3.git

Merge pull request #1377 in SNORT/snort3 from offload_fp_local to master

Squashed commit of the following:

commit fccd0e722d8087fe57c91e04272793b1aa3f67f8
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Sep 28 15:06:06 2018 -0400

    fp_detect: onload before running local to ensure event ordering
---

diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 4b1486e54..41209b87f 100644
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -1283,6 +1283,11 @@ void fp_local(Packet* p)
     stash->enable_process();
     stash->init();
     init_match_info(c->otnx);
+
+    // FIXIT-L set up a dependency chain between contexts and "pause" here
+    if ( p->flow )
+        DetectionEngine::onload(p->flow);
+
     fpEvalPacket(p);
     fpFinalSelectEvent(c->otnx, p);
 }