From: George Koikara (gkoikara) <gkoikara@cisco.com>
Date: Wed, 27 Nov 2019 05:42:32 +0000 (+0000)
Subject: Merge pull request #1797 in SNORT/snort3 from ~POAWASTH/snort3:CSCvr33175 to master
X-Git-Tag: 3.0.0-266~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c27cc03a09aaf9026da8cd1e91fdae309465606e;p=thirdparty%2Fsnort3.git

Merge pull request #1797 in SNORT/snort3 from ~POAWASTH/snort3:CSCvr33175 to master

Squashed commit of the following:

commit df59543a5e3e99bef9c809163c6030bdfb042796
Author: Pooja Awasthi <poawasth@cisco.com>
Date:   Fri Oct 11 06:07:32 2019 -0400

    high_availability:Disabling the inspection if the Flow state is BLOCK
---

diff --git a/src/flow/ha.cc b/src/flow/ha.cc
index 7466b96fa..93708ec99 100644
--- a/src/flow/ha.cc
+++ b/src/flow/ha.cc
@@ -660,6 +660,12 @@ Flow* HighAvailability::process_daq_import(Packet& p, FlowKey& key)
             {
                 if (FlowKey::compare(&key, flow->key, 0) == 0)
                 {
+                    if (flow->flow_state == Flow::FlowState::BLOCK) 
+                    {   
+                        flow->disable_inspection();
+                        p.disable_inspect = true;
+                    }
+
                     // Clear the standby bit so that we don't immediately trigger a new data store
                     // FIXIT-L streamline the consume process so this doesn't have to be done here
                     flow->ha_state->clear(FlowHAState::STANDBY);