From a94c596c02852294020e5d1b86a70e04ec4b9e5d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 9 Nov 2008 20:14:58 +0000 Subject: Prevent slow connects for s2s from blocking for so long --- core/s2smanager.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'core') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 2f2f1d92..76edc8af 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -78,6 +78,7 @@ function new_outgoing(from_host, to_host) local conn, handler = socket.tcp() --FIXME: Below parameters (ports/ip) are incorrect (use SRV) to_host = srvmap[to_host] or to_host; + conn:settimeout(0.1); conn:connect(to_host, 5269); conn = wraptlsclient(cl, conn, to_host, 5269, 0, 1, hosts[from_host].ssl_ctx ); host_session.conn = conn; -- cgit v1.2.3 From 439b80fc6ee666302ecd7d7d50bdb9c5fa4e12cc Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 10 Nov 2008 01:30:52 +0500 Subject: Hack to allow s2s stanzas to work until we do proper namespace handling --- core/stanza_router.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'core') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 0a5ff0be..61c2dede 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -33,6 +33,7 @@ local print = print; function core_process_stanza(origin, stanza) log("debug", "Received["..origin.type.."]: "..tostring(st.reply(st.reply(stanza)))) + if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling. -- TODO verify validity of stanza (as well as JID validity) if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then if stanza.attr.type == "set" or stanza.attr.type == "get" then -- cgit v1.2.3 From 074f86605d713a42d55d3d9eb68536d0ee41c123 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 9 Nov 2008 21:46:42 +0000 Subject: Move some code about so that we don't leave connections hanging if they hit the connection timeout --- core/s2smanager.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core') 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); -- cgit v1.2.3 From b2b866b63d4cdc390498ea43ca54c8590de8ece7 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 10 Nov 2008 04:53:42 +0500 Subject: Fixed typo --- core/stanza_router.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 61c2dede..9ae98f1c 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -328,7 +328,7 @@ function core_route_stanza(origin, stanza) t_insert(recipients, session); end end - for _, session in pairs(recipient) do + for _, session in pairs(recipients) do session.send(stanza); end else -- cgit v1.2.3