Software / code / prosody
Changeset
233:23585c323daa
Move some code about so that we don't leave connections hanging if they hit the connection timeout
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 09 Nov 2008 21:46:42 +0000 |
| parents | 232:20745f8f4cf1 |
| children | 236:eb4ac201aad2 |
| files | core/s2smanager.lua |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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);
