--- a/plugins/mod_s2s.lua	Fri Apr 17 14:35:32 2026 +0100
+++ b/plugins/mod_s2s.lua	Fri Apr 17 17:47:01 2026 +0100
@@ -932,18 +932,19 @@
 function listener.onconnect(conn)
 	conn:setoption("keepalive", opt_keepalives);
 	local session = sessions[conn];
+	local event_data = { session = session, conn = conn };
 	if not session then -- New incoming connection
 		session = s2s_new_incoming(conn);
 		sessions[conn] = session;
 		session.log("debug", "Incoming s2s connection");
-		module:fire_event("s2sin-connected", { session = session })
+		module:fire_event("s2sin-connected", event_data)
 		initialize_session(session);
 		m_accepted_tcp_connections:with_labels():add(1)
 	else -- Outgoing session connected
-		module:fire_event("s2sout-connected", { session = session })
+		module:fire_event("s2sout-connected", event_data)
 		session:open_stream(session.from_host, session.to_host);
 	end
-	module:fire_event("s2s-connected", { session = session, conn = conn })
+	module:fire_event("s2s-connected", event_data)
 	session.ip = conn:ip();
 end