aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-12-17 18:59:29 +0000
committerMatthew Wild <mwild1@gmail.com>2009-12-17 18:59:29 +0000
commite394e2f22252126dcb18dd38300a366e3ad6dba7 (patch)
treec74b5866e0d5fdd32b5e89ec13efa8bae1adcd67
parenta50ea05d63b1bee4e17b9f48d728df5666e901f8 (diff)
downloadprosody-e394e2f22252126dcb18dd38300a366e3ad6dba7.tar.gz
prosody-e394e2f22252126dcb18dd38300a366e3ad6dba7.zip
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
-rw-r--r--core/s2smanager.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 4891b499..34efc254 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -54,7 +54,7 @@ function compare_srv_priorities(a,b)
return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
end
-local function bounce_sendq(session)
+local function bounce_sendq(session, reason)
local sendq = session.sendq;
if sendq then
session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
@@ -72,6 +72,9 @@ local function bounce_sendq(session)
reply.attr.type = "error";
reply:tag("error", {type = "cancel"})
:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
+ if reason then
+ reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up();
+ end
core_process_stanza(dummy, reply);
end
sendq[i] = nil;
@@ -491,12 +494,12 @@ function mark_connected(session)
end
end
-function destroy_session(session)
+function destroy_session(session, reason)
(session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
if session.direction == "outgoing" then
hosts[session.from_host].s2sout[session.to_host] = nil;
- bounce_sendq(session);
+ bounce_sendq(session, reason);
elseif session.direction == "incoming" then
incoming_s2s[session] = nil;
end