From bf3bb39ea3ebf1faff066579a2647e31aa031ace Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 4 Dec 2008 16:41:32 +0000 Subject: Fix logger ids for c2s and s2sout --- core/s2smanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/s2smanager.lua') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 0afb8805..9c7a6008 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -108,7 +108,7 @@ function new_outgoing(from_host, to_host) local log; do - local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$"); + local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$"); log = logger_init(conn_name); host_session.log = log; end -- cgit v1.2.3 From 533449b6d26621a0e410e84003f1902e319bbfb6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 4 Dec 2008 17:10:02 +0000 Subject: Don't send stream:features to incoming s2s connections --- core/s2smanager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/s2smanager.lua') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 9c7a6008..df877767 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -180,7 +180,9 @@ end function streamopened(session, attr) local send = session.sends2s; - session.version = tonumber(attr.version) or 0; + -- TODO: #29: SASL/TLS on s2s streams + session.version = 0; --tonumber(attr.version) or 0; + if session.version >= 1.0 and not (attr.to and attr.from) then --print("to: "..tostring(attr.to).." from: "..tostring(attr.from)); log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); -- cgit v1.2.3