From: Ron Dempster (rdempste) <rdempste@cisco.com>
Date: Fri, 30 Sep 2022 22:27:01 +0000 (+0000)
Subject: Pull request #3600: flow: disable inspection for and HA flow unless the state is... 
X-Git-Tag: 3.1.43.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3b62e3507963b4d94a69a446a976c7531d971d;p=thirdparty%2Fsnort3.git

Pull request #3600: flow: disable inspection for and HA flow unless the state is setup or inspect

Merge in SNORT/snort3 from ~RDEMPSTE/snort3:ha to master

Squashed commit of the following:

commit c948d9a71e22815c01847c104881758f24be4964
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Sep 21 15:41:21 2022 -0400

    flow: disable inspection for and HA flow unless the state is setup or inspect
---

diff --git a/src/flow/ha.cc b/src/flow/ha.cc
index 43c5ddde1..58be06f82 100644
--- a/src/flow/ha.cc
+++ b/src/flow/ha.cc
@@ -682,8 +682,7 @@ Flow* HighAvailability::process_daq_import(Packet& p, FlowKey& key)
             // Validate that the imported flow matches up with the given flow key.
             if (flow)
             {
-                if (flow->flow_state == Flow::FlowState::BLOCK
-                    or flow->flow_state == Flow::FlowState::RESET)
+                if (Flow::FlowState::INSPECT < flow->flow_state)
                 {
                     flow->disable_inspection();
                     p.disable_inspect = true;