aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-09 21:46:42 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-09 21:46:42 +0000
commit074f86605d713a42d55d3d9eb68536d0ee41c123 (patch)
tree7952056fb3e8dd8ff3b05e44d4b0649e53db2d5f
parentbc83d650a03de76cad050fda72b1108924cb282b (diff)
downloadprosody-074f86605d713a42d55d3d9eb68536d0ee41c123.tar.gz
prosody-074f86605d713a42d55d3d9eb68536d0ee41c123.zip
Move some code about so that we don't leave connections hanging if they hit the connection timeout
-rw-r--r--core/s2smanager.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 76edc8af..aed10753 100644
--- 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);