From: Lukasz Czarnik -X (lczarnik - SOFTSERVE INC at Cisco) Date: Tue, 5 Mar 2024 14:08:37 +0000 (+0000) Subject: Pull request #4232: appid: broadcast commands with ctrlcon X-Git-Tag: 3.1.82.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5d2cc67cc09da8bbed95fd5b055aa4d9fba631e;p=thirdparty%2Fsnort3.git Pull request #4232: appid: broadcast commands with ctrlcon Merge in SNORT/snort3 from ~LCZARNIK/snort3:broad_ctrlcon to master Squashed commit of the following: commit 43cc5e1b230645b337b19bcb350c511ac67f8abf Author: Lukasz Czarnik Date: Fri Mar 1 08:33:46 2024 -0500 appid: broadcast commands with ctrlcon --- diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc index 6b83b589a..afcd762b1 100644 --- a/src/main/snort_config.cc +++ b/src/main/snort_config.cc @@ -342,7 +342,7 @@ void SnortConfig::post_setup() void SnortConfig::update_scratch(ControlConn* ctrlcon) { - main_broadcast_command(new ACScratchUpdate(this, scratch_handlers, ctrlcon)); + main_broadcast_command(new ACScratchUpdate(this, scratch_handlers, ctrlcon), ctrlcon); } void SnortConfig::clone(const SnortConfig* const conf) diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc index 8f0e66f8e..52672370e 100644 --- a/src/network_inspectors/appid/appid_module.cc +++ b/src/network_inspectors/appid/appid_module.cc @@ -225,7 +225,7 @@ ACThirdPartyAppIdContextUnload::~ACThirdPartyAppIdContextUnload() delete tp_ctxt; AppIdContext& ctxt = inspector.get_ctxt(); ctxt.create_tp_appid_ctxt(); - main_broadcast_command(new ACThirdPartyAppIdContextSwap(inspector, ctrlcon)); + main_broadcast_command(new ACThirdPartyAppIdContextSwap(inspector, ctrlcon), ctrlcon); log_message("== unload old third-party complete\n"); ReloadTracker::update(ctrlcon, "unload old third-party complete, start swapping to new configuration."); }