# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1226267202 0
# Node ID 23585c323daad9f3642d0d94e76acdfdfeb54e85
# Parent  20745f8f4cf137fc055ce3fcd1dd2f67b0443472
Move some code about so that we don't leave connections hanging if they hit the connection timeout

diff -r 20745f8f4cf1 -r 23585c323daa core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Nov 09 20:15:31 2008 +0000
+++ b/core/s2smanager.lua	Sun Nov 09 21:46:42 2008 +0000
@@ -76,6 +76,12 @@
 		local cl = connlisteners_get("xmppserver");
 		
 		local conn, handler = socket.tcp()
+		
+		
+		-- Register this outgoing connection so that xmppserver_listener knows about it
+		-- otherwise it will assume it is a new incoming connection
+		cl.register_outgoing(conn, host_session);
+		
 		--FIXME: Below parameters (ports/ip) are incorrect (use SRV)
 		to_host = srvmap[to_host] or to_host;
 		conn:settimeout(0.1);
@@ -83,10 +89,6 @@
 		conn = wraptlsclient(cl, conn, to_host, 5269, 0, 1, hosts[from_host].ssl_ctx );
 		host_session.conn = conn;
 		
-		-- Register this outgoing connection so that xmppserver_listener knows about it
-		-- otherwise it will assume it is a new incoming connection
-		cl.register_outgoing(conn, host_session);
-		
 		do
 			local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$");
 			host_session.log = logger_init(conn_name);