Move some code about so that we don't leave connections hanging if they hit the conne...

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 76edc8afd8b9c43075de14ddd48b3590442128c8..aed1075312874f5f18dffeb1e0870b57b0450450 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -76,6 +76,12 @@ function new_outgoing(from_host, to_host)
                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 @@ function new_outgoing(from_host, to_host)
                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);