X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fs2smanager.lua;h=e4de498a10d20503c6f2588b2713778ec3455e9c;hb=6ecc8b9795da4f47058000d6f4715cedf1755dfd;hp=b034fcaeeb33161f95d359143cf28aade2189b86;hpb=d12f92a366b3192fb017c2d1742d9c88cbaf7aec;p=prosody.git

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index b034fcae..e4de498a 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -8,7 +8,7 @@
 
 
 
-local hosts = hosts;
+local hosts = prosody.hosts;
 local tostring, pairs, getmetatable, newproxy, setmetatable
     = tostring, pairs, getmetatable, newproxy, setmetatable;
 
@@ -24,21 +24,14 @@ local fire_event = prosody.events.fire_event;
 
 module "s2smanager"
 
-local open_sessions = 0;
-
 function new_incoming(conn)
 	local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} };
-	if true then
-		session.trace = newproxy(true);
-		getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
-	end
-	open_sessions = open_sessions + 1;
 	session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$"));
 	incoming_s2s[session] = true;
 	return session;
 end
 
-function new_outgoing(from_host, to_host, connect)
+function new_outgoing(from_host, to_host)
 	local host_session = { to_host = to_host, from_host = from_host, host = from_host,
 		               notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
 	hosts[from_host].s2sout[to_host] = host_session;
@@ -62,7 +55,7 @@ local resting_session = { -- Resting, not dead
 function retire_session(session, reason)
 	local log = session.log or log;
 	for k in pairs(session) do
-		if k ~= "trace" and k ~= "log" and k ~= "id" and k ~= "conn" then
+		if k ~= "log" and k ~= "id" and k ~= "conn" then
 			session[k] = nil;
 		end
 	end