# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1776444421 -3600
# Node ID 5aacae4b2ccf9459067d09da7fcbdffbb821f6e5
# Parent  c1469296190d904817a60ec6fa98a7674092dcc3# Parent  18d364587db51e4d9c841165e7c6e7e903e82e1c
Merge 13.0->trunk

diff -r c1469296190d -r 5aacae4b2ccf core/moduleapi.lua
--- a/core/moduleapi.lua	Fri Apr 17 14:35:32 2026 +0100
+++ b/core/moduleapi.lua	Fri Apr 17 17:47:01 2026 +0100
@@ -83,12 +83,12 @@
 end
 
 function api:hook_object_event(object, event, handler, priority)
-	self.event_handlers:set(object, event, handler, true);
+	self.event_handlers:add(object, event, handler, true);
 	return object.add_handler(event, handler, priority);
 end
 
 function api:unhook_object_event(object, event, handler)
-	self.event_handlers:set(object, event, handler, nil);
+	self.event_handlers:remove(object, event, handler);
 	return object.remove_handler(event, handler);
 end
 
diff -r c1469296190d -r 5aacae4b2ccf plugins/mod_s2s.lua
--- 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
 
diff -r c1469296190d -r 5aacae4b2ccf util/multitable.lua
--- a/util/multitable.lua	Fri Apr 17 14:35:32 2026 +0100
+++ b/util/multitable.lua	Fri Apr 17 17:47:01 2026 +0100
@@ -58,14 +58,14 @@
 		local v = t[k];
 		if v then
 			r(v, n+1, _end, ...);
-			if not next(v) then
+			if next(v) == nil then
 				t[k] = nil;
 			end
 		end
 	else
 		for _,b in pairs(t) do
 			r(b, n+1, _end, ...);
-			if not next(b) then
+			if next(b) == nil then
 				t[_] = nil;
 			end
 		end