From: Nick Porter <nick@portercomputing.co.uk>
Date: Fri, 29 Aug 2025 11:00:45 +0000 (+0100)
Subject: Add trigger_args to trunk
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a72bc4883a489d86da31cc4b7ea36342ff4e0614;p=thirdparty%2Ffreeradius-server.git

Add trigger_args to trunk
---

diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 69f3510bfa..f9e4952f34 100644
--- a/src/lib/server/trunk.c
+++ b/src/lib/server/trunk.c
@@ -312,6 +312,8 @@ struct trunk_s {
 	uint64_t		last_req_per_conn;	//!< The last request to connection ratio we calculated.
 	/** @} */
 
+	fr_pair_list_t		*trigger_args;		//!< Passed to trigger
+
 	bool			trigger_undef[NUM_ELEMENTS(trunk_conn_trigger_names)];	//!< Record that a specific trigger is undefined.
 
 	CONF_PAIR		*trigger_cp[NUM_ELEMENTS(trunk_conn_trigger_names)];	//!< Cached trigger CONF_PAIRs
@@ -444,7 +446,7 @@ static size_t trunk_connection_events_len = NUM_ELEMENTS(trunk_connection_events
 		if (trigger(unlang_interpret_get_thread_default(), trunk->conf.conn_trigger_cs, \
 			    &trunk->trigger_cp[idx], \
 			    fr_table_str_by_value(trunk_conn_trigger_names, _state, \
-						  "<INVALID>"), true, NULL) == -1) { \
+						  "<INVALID>"), true, trunk->trigger_args) == -1) { \
 			trunk->trigger_undef[idx] = true; \
 		} \
 	} \
@@ -477,7 +479,7 @@ void trunk_request_state_log_entry_add(char const *function, int line,
 	if (trunk->conf.req_triggers) { \
 		trigger(unlang_interpret_get_thread_default(), \
 			trunk->conf.req_trigger_cs, NULL, fr_table_str_by_value(trunk_req_trigger_names, _state, \
-							 "<INVALID>"), true, NULL); \
+							 "<INVALID>"), true, trunk->trigger_args); \
 	} \
 } while (0)