Mercurial > lxmppd-hg-xmllex / changeset
changeset
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for other reasons)
Sun, 22 Nov 2009 04:42:03 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sun, 22 Nov 2009 04:42:03 +0000
- changeset 2124
- be3c906f4770
- parent 2123
- 12669db7ed4a
- child 2125
- f107f0205793
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for other reasons)
| core/s2smanager.lua | file | annotate | diff | comparison | revisions |
--- a/core/s2smanager.lua Sun Nov 22 04:09:57 2009 +0000 +++ b/core/s2smanager.lua Sun Nov 22 04:42:03 2009 +0000 @@ -128,7 +128,7 @@ 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 @@ 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
