diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-10 16:29:19 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-10 16:29:19 +0100 |
| commit | 3bbc4e33918539c38c8266cffd0495c68fcbebf6 (patch) | |
| tree | e7f84ad442da82e00b4b1ac874e85e01043bbe57 /core | |
| parent | c4d2deffc64a4d955e52d7e8b2dce3af444872c7 (diff) | |
| parent | eea12d2279cd8f1e41c9234430e961754be6ce76 (diff) | |
| download | prosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.tar.gz prosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.zip | |
Merging.
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 11 | ||||
| -rw-r--r-- | core/stanza_router.lua | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 2f2f1d92..aed10753 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -76,16 +76,19 @@ 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); conn:connect(to_host, 5269); 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); diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 0a5ff0be..9ae98f1c 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 @@ -327,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 |