diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-04 18:49:00 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-04 18:49:00 +0000 |
| commit | a1173c8d66cdfd8f22d34c09508a20098819bdbf (patch) | |
| tree | 45cded6f238a663f14e24f02ecae383e23031852 /core/s2smanager.lua | |
| parent | 83fc91cb1069a562620d2220c2b0c0afdc609a22 (diff) | |
| parent | 327c81737eb11a340005c7078015c46fdfea6390 (diff) | |
| download | prosody-a1173c8d66cdfd8f22d34c09508a20098819bdbf.tar.gz prosody-a1173c8d66cdfd8f22d34c09508a20098819bdbf.zip | |
Automated merge with http://waqas.ath.cx/
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 0afb8805..df877767 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 @@ -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"); |