mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

s2s: Allow passing a custom error for bouncing queued stanzas (#770)

Browse source 
Since stream errors and stanza errors are different
This commit is contained in:
Kim Alvefur 2019-11-23 01:29:03 +01:00
parent e130b37797
commit 3aee8e24a6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/s2smanager.lua
View file

@ -84,14 +84,14 @@ local function retire_session(session, reason)
return setmetatable(session, resting_session); return setmetatable(session, resting_session);
end end
local function destroy_session(session, reason) local function destroy_session(session, reason, bounce_reason)
if session.destroyed then return; end if session.destroyed then return; end
local log = session.log or log; local log = session.log or log;
log("debug", "Destroying %s session %s->%s%s%s", session.direction, session.from_host, session.to_host, reason and ": " or "", reason or ""); log("debug", "Destroying %s session %s->%s%s%s", session.direction, session.from_host, session.to_host, reason and ": " or "", reason or "");
if session.direction == "outgoing" then if session.direction == "outgoing" then
hosts[session.from_host].s2sout[session.to_host] = nil; hosts[session.from_host].s2sout[session.to_host] = nil;
session:bounce_sendq(reason); session:bounce_sendq(bounce_reason or reason);
elseif session.direction == "incoming" then elseif session.direction == "incoming" then
if session.outgoing then if session.outgoing then
hosts[session.to_host].s2sout[session.from_host] = nil; hosts[session.to_host].s2sout[session.from_host] = nil;

6
plugins/mod_s2s/mod_s2s.lua
View file

@ -487,7 +487,7 @@ end
--- Session methods --- Session methods
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local function session_close(session, reason, remote_reason) local function session_close(session, reason, remote_reason, bounce_reason)
local log = session.log or log; local log = session.log or log;
if session.conn then if session.conn then
if session.notopen then if session.notopen then
@ -537,12 +537,12 @@ local function session_close(session, reason, remote_reason)
add_task(stream_close_timeout, function () add_task(stream_close_timeout, function ()
if not session.destroyed then if not session.destroyed then
session.log("warn", "Failed to receive a stream close response, closing connection anyway..."); session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
s2s_destroy_session(session, reason); s2s_destroy_session(session, reason, bounce_reason);
conn:close(); conn:close();
end end
end); end);
else else
s2s_destroy_session(session, reason); s2s_destroy_session(session, reason, bounce_reason);
conn:close(); -- Close immediately, as this is an outgoing connection or is not authed conn:close(); -- Close immediately, as this is an outgoing connection or is not authed
end end
end end