Software /
code /
prosody
Diff
core/s2smanager.lua @ 551:53dc98ffde16
Automated merge with http://waqas.ath.cx/
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 04 Dec 2008 19:21:50 +0000 |
parent | 544:efde848869c5 |
child | 558:ab3960421356 |
line wrap: on
line diff
--- a/core/s2smanager.lua Fri Dec 05 00:16:38 2008 +0500 +++ b/core/s2smanager.lua Thu Dec 04 19:21:50 2008 +0000 @@ -108,7 +108,7 @@ 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 @@ -180,7 +180,9 @@ 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");