Pull request #3600: flow: disable inspection for and HA flow unless the state is...

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 43c5ddde196b6f2f702ab308c209f06249a4627b..58be06f829be667121c7d1e5c8017cef60d6d197 100644 (file)
--- 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;