diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-11-22 04:42:03 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-11-22 04:42:03 +0000 |
| commit | 8da42f8d71b94aacf7b914bd9c1d1147cb33e041 (patch) | |
| tree | 70573bb3851deaa9d1ef56cd853074e5957bf669 | |
| parent | 2b683fc8e66bd737c56635e516c65e502d879d13 (diff) | |
| download | prosody-8da42f8d71b94aacf7b914bd9c1d1147cb33e041.tar.gz prosody-8da42f8d71b94aacf7b914bd9c1d1147cb33e041.zip | |
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for other reasons)
| -rw-r--r-- | core/s2smanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 4c61eaa3..5dae58c9 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -128,7 +128,7 @@ function new_incoming(conn) open_sessions = open_sessions + 1; local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); session.log = log; - session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end + session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(conn, tostring(t)); end incoming_s2s[session] = true; add_task(connect_timeout, function () if session.conn ~= conn or @@ -317,9 +317,9 @@ function make_connect(host_session, connect_host, connect_port) cl.register_outgoing(conn, host_session); local w, log = conn.write, host_session.log; - host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end + host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(conn, tostring(t)); end - conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host)); + conn:write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host)); log("debug", "Connection attempt in progress..."); add_task(connect_timeout, function () if host_session.conn ~= conn or |