From: Naveen Gujje (ngujje) <ngujje@cisco.com>
Date: Wed, 9 Sep 2020 02:33:09 +0000 (+0000)
Subject: Merge pull request #2306 in SNORT/snort3 from ~SUNIMUKH/snort3:CSCvu79452 to master
X-Git-Tag: 3.0.2-6~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faad59f0acbd7e4cbe827900d54ca89656aaab5e;p=thirdparty%2Fsnort3.git

Merge pull request #2306 in SNORT/snort3 from ~SUNIMUKH/snort3:CSCvu79452 to master

Squashed commit of the following:

commit 873b964c11d555ba6dcbb97a30987335caaa090d
Author: Sunirmal Mukherjee <sunimukh@cisco.com>
Date:   Tue Jun 30 14:08:29 2020 -0400

    flow: disabled inspection for FlowState::RESET
---

diff --git a/src/flow/ha.cc b/src/flow/ha.cc
index edf8aebdd..685d59ed6 100644
--- a/src/flow/ha.cc
+++ b/src/flow/ha.cc
@@ -660,7 +660,8 @@ Flow* HighAvailability::process_daq_import(Packet& p, FlowKey& key)
             {
                 if (FlowKey::is_equal(&key, flow->key, 0))
                 {
-                    if (flow->flow_state == Flow::FlowState::BLOCK)
+                    if (flow->flow_state == Flow::FlowState::BLOCK
+                        or flow->flow_state == Flow::FlowState::RESET)
                     {
                         flow->disable_inspection();
                         p.disable_inspect = true;