# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1258864923 0
# Node ID be3c906f4770c5e9aa010959bf8c2d6cc0afb645
# Parent  12669db7ed4a6684bb8898ec949b2cbfbf75a118
s2smanager: Update for new net.server API (s2s still doesn't work with libevent for other reasons)

diff -r 12669db7ed4a -r be3c906f4770 core/s2smanager.lua
--- 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