aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-05 05:23:42 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-05 05:23:42 +0000
commit7c9f4818c3558c260b2f37df92371c1b33a3b121 (patch)
treeff8caf06849642257e1664d30d19aefa428179bb /core
parentffd26762181bfbbd870e91ae39ac77876f9e5382 (diff)
downloadprosody-7c9f4818c3558c260b2f37df92371c1b33a3b121.tar.gz
prosody-7c9f4818c3558c260b2f37df92371c1b33a3b121.zip
Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings.
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 09e163f0..5eb28b50 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -52,11 +52,10 @@ module "s2smanager"
local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end
function send_to_host(from_host, to_host, data)
- if data.name then data = tostring(data); end
local host = hosts[from_host].s2sout[to_host];
if host then
-- We have a connection to this host already
- if host.type == "s2sout_unauthed" and (data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
+ if host.type == "s2sout_unauthed" and data.name ~= "db:verify" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
if not host.notopen and not host.dialback_key then
host.log("debug", "dialback had not been initiated");
@@ -64,9 +63,9 @@ function send_to_host(from_host, to_host, data)
end
-- Queue stanza until we are able to send it
- if host.sendq then t_insert(host.sendq, data);
- else host.sendq = { data }; end
- host.log("debug", "stanza queued");
+ if host.sendq then t_insert(host.sendq, tostring(data));
+ else host.sendq = { tostring(data) }; end
+ host.log("debug", "stanza [%s] queued ", data.name);
elseif host.type == "local" or host.type == "component" then
log("error", "Trying to send a stanza to ourselves??")
log("error", "Traceback: %s", get_traceback());
@@ -85,7 +84,7 @@ function send_to_host(from_host, to_host, data)
log("debug", "opening a new outgoing connection for this stanza");
local host_session = new_outgoing(from_host, to_host);
-- Store in buffer
- host_session.sendq = { data };
+ host_session.sendq = { tostring(data) };
end
end