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

mod_smacks: Improve activation of smacks on outgoing s2s

Browse source 
Using a timer was a hack to get around that stream features are not
available at the right time and sendq stanzas were stored as strings
so could not be counted properly. The later has now been fixed and the
former is fixed by recording the relevant stream feature on the session
so that the correct version of XEP-0198 can be activated once the
connection has been authenticated and is ready to start.
This commit is contained in:
Kim Alvefur 2022-04-24 16:17:32 +02:00
parent 300813b68b
commit 5db031e070
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
plugins/mod_smacks.lua
View file

@ -2,7 +2,7 @@
-- --
-- Copyright (C) 2010-2015 Matthew Wild -- Copyright (C) 2010-2015 Matthew Wild
-- Copyright (C) 2010 Waqas Hussain -- Copyright (C) 2010 Waqas Hussain
-- Copyright (C) 2012-2021 Kim Alvefur -- Copyright (C) 2012-2022 Kim Alvefur
-- Copyright (C) 2012 Thijs Alkemade -- Copyright (C) 2012 Thijs Alkemade
-- Copyright (C) 2014 Florian Zeitz -- Copyright (C) 2014 Florian Zeitz
-- Copyright (C) 2016-2020 Thilo Molitor -- Copyright (C) 2016-2020 Thilo Molitor
@ -10,6 +10,7 @@
-- This project is MIT/X11 licensed. Please see the -- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information. -- COPYING file in the source package for more information.
-- --
-- TODO unify sendq and smqueue
local tonumber = tonumber; local tonumber = tonumber;
local tostring = tostring; local tostring = tostring;
@ -322,26 +323,20 @@ end
module:hook_tag(xmlns_sm2, "enable", function (session, stanza) return handle_enable(session, stanza, xmlns_sm2); end, 100); module:hook_tag(xmlns_sm2, "enable", function (session, stanza) return handle_enable(session, stanza, xmlns_sm2); end, 100);
module:hook_tag(xmlns_sm3, "enable", function (session, stanza) return handle_enable(session, stanza, xmlns_sm3); end, 100); module:hook_tag(xmlns_sm3, "enable", function (session, stanza) return handle_enable(session, stanza, xmlns_sm3); end, 100);
module:hook_tag("http://etherx.jabber.org/streams", "features", module:hook_tag("http://etherx.jabber.org/streams", "features", function(session, stanza)
function (session, stanza) if can_do_smacks(session) then
-- Needs to be done after flushing sendq since those aren't stored as session.smacks_feature = stanza:get_child("sm", xmlns_sm3) or stanza:get_child("sm", xmlns_sm2);
-- stanzas and counting them is weird. end
-- TODO unify sendq and smqueue end);
timer.add_task(1e-6, function ()
if can_do_smacks(session) then module:hook("s2sout-established", function (event)
if stanza:get_child("sm", xmlns_sm3) then local session = event.session;
session.sends2s(st.stanza("enable", sm3_attr)); if not session.smacks_feature then return end
session.smacks = xmlns_sm3;
elseif stanza:get_child("sm", xmlns_sm2) then session.smacks = session.smacks_feature.attr.xmlns;
session.sends2s(st.stanza("enable", sm2_attr)); session.sends2s(st.stanza("enable", { xmlns = session.smacks }));
session.smacks = xmlns_sm2; wrap_session_out(session, false);
else end);
return;
end
wrap_session_out(session, false);
end
end);
end);
function handle_enabled(session, stanza, xmlns_sm) -- luacheck: ignore 212/stanza function handle_enabled(session, stanza, xmlns_sm) -- luacheck: ignore 212/stanza
module:log("debug", "Enabling stream management"); module:log("debug", "Enabling stream management");