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 <lczarnik@cisco.com>
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 6b83b589a36f4644a4a2a102ee3d34cbeafd7f13..afcd762b1e7fc849975fa1fb2dd315e64d09bddf 100644 (file)
--- 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 8f0e66f8e0aa5ab4499bcef88dfca82ba3621c9e..52672370ee15af1129803860561fb733c6414ac0 100644 (file)
--- 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.");
 }