From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 19 Aug 2021 13:06:37 +0000 (+0000)
Subject: Merge pull request #3031 in SNORT/snort3 from ~RDEMPSTE/snort3:rule_set to master
X-Git-Tag: 3.1.11.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd7e48a44fce716e51bcb452548a80a9046254b;p=thirdparty%2Fsnort3.git

Merge pull request #3031 in SNORT/snort3 from ~RDEMPSTE/snort3:rule_set to master

Squashed commit of the following:

commit 6b3ca22e8a2b259e07236b5c548452757144671b
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Aug 18 19:38:24 2021 -0400

    flow: set the client initiated flag before publishing the flow state setup event
---

diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index 1d9349122..fc8bff39d 100644
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -460,6 +460,7 @@ unsigned FlowControl::process(Flow* flow, Packet* p)
         // process expected flows
         check_expected_flow(flow, p);
 
+        flow->set_client_initiate(p);
         DataBus::publish(FLOW_STATE_SETUP_EVENT, p);
 
         if ( flow->flow_state == Flow::FlowState::SETUP ||
@@ -469,7 +470,6 @@ unsigned FlowControl::process(Flow* flow, Packet* p)
 
         ++news;
         flow->flowstats.start_time = p->pkth->ts;
-        flow->set_client_initiate(p);
     }
 
     // This requires the packet direction to be set