http://hg.omfa.de/prosody-hg/ en-us prosody-hg: core/s2smanager.lua history core/s2smanager.lua revision history mod_s2s, s2smanager: Experimental s2s_block_immediate_retries option http://hg.omfa.de/prosody-hg/log/4067a95336dd/core/s2smanager.lua
Currently, if Prosody fails to connect to a remote domain, any pending stanzas
are bounced back to the sender. If the code processing these stanzas responds
to the error, we will begin a new outgoing connection before we've even
finished processing the last one.

This generally hasn't been a problem, Prosody handles it fine.

However, it is questionable whether this is sensible behaviour (if we *just*
failed to connect, will an immediate retry even work most of the time?). It
can also lead to some awkward traffic patterns, e.g. when combined with MUC.

For example, when a MUC receives an error from a remote user, it may kick that
user from the MUC. This will cause a stanza to be sent to everyone else in the
MUC. If other users from the same domain are present, the notification will be
sent to the remote domain, triggering a new connection attempt for no reason
(the user was likely about to be kicked anyway after the sendq had finished
being bounced).

This new option enables an alternative strategy, where attempts to send to the
remote domain that failed will be rejected until the sendq has finished being
processed.

To enable the new behaviour, set the global option:

s2s_block_immediate_retries = true]]> Matthew Wild <mwild1@gmail.com> Thu, 16 Oct 2025 18:29:03 +0100 core: Prefix module imports with prosody namespace http://hg.omfa.de/prosody-hg/log/ead41e25ebc0/core/s2smanager.lua Kim Alvefur <zash@zash.se> Fri, 17 Mar 2023 16:23:07 +0100 core.s2smanager: Don't remove unrelated session on close of bidi session http://hg.omfa.de/prosody-hg/log/4c8941b5b05e/core/s2smanager.lua
Normally with bidi, any outgoing connection should be the same as the
incoming, hence when closing a bidi connection it should be removed as a
route to the remote server. However it is not guaranteed, a remote bidi-capable server
might have decided to open a new connection for some reason. This can
lead to a situation where there are two bidi connections, and the s2sout
route is a locally initiated s2sout connection. In this case, such a
s2sout connection should be kept.

Noticed in a rare case where bidi has just been enabled on a running
server, and something establishes new connections immediately when a
connection is closed.]]> Kim Alvefur <zash@zash.se> Mon, 27 Jun 2022 01:22:36 +0200 s2smanager: Fire s2s-destroyed event to mirror s2s-created http://hg.omfa.de/prosody-hg/log/60676b607b6d/core/s2smanager.lua
The existing events do not fire for unauthed sessions, for example (because
the type does not match). I deemed changing their behaviour too risky, and
the current behaviour may even be more desirable for some uses.

This means we now have roughly paired events:

- s2s-created -> s2s-destroyed (global only)
- s2sin-established -> s2sin-destroyed (global + host)
- s2sout-established -> s2sout-destroyed (global + host)]]> Matthew Wild <mwild1@gmail.com> Fri, 12 Nov 2021 13:30:39 +0000 core.s2smanager: Set "direction" on destroyed sessions (fixes #1641) http://hg.omfa.de/prosody-hg/log/f4b76e500768/core/s2smanager.lua
Should prevent errors in certain places where it logs
session.direction captialized using gsub.

Might cause bugs tho, but then the session is destroyed so maybe it
doesn't matter?]]> Kim Alvefur <zash@zash.se> Wed, 03 Mar 2021 13:30:19 +0100 s2s: Allow passing a custom error for bouncing queued stanzas (#770) http://hg.omfa.de/prosody-hg/log/42cf93ff4618/core/s2smanager.lua
Since stream errors and stanza errors are different]]> Kim Alvefur <zash@zash.se> Sat, 23 Nov 2019 01:29:03 +0100 core.s2smanager: Fix traceback due to mixup with to/from http://hg.omfa.de/prosody-hg/log/56522bb3bca5/core/s2smanager.lua
Forgot to swap to and from in 3123a13cf577]]> Kim Alvefur <zash@zash.se> Sat, 05 Oct 2019 17:09:24 +0200 core.s2smanager: Remove bidi-enabled s2sin from outgoing routing table http://hg.omfa.de/prosody-hg/log/3123a13cf577/core/s2smanager.lua
Caused creation of new s2sout instead of proper bidi-enabled s2sin.]]> Kim Alvefur <zash@zash.se> Sat, 05 Oct 2019 16:21:41 +0200 core.s2smanager: Add map of names authenticate for remote on s2sout for parity with s2sin http://hg.omfa.de/prosody-hg/log/483cc47f15f8/core/s2smanager.lua
Making s2sin and -out look more alike in preparation for bidi support]]> Kim Alvefur <zash@zash.se> Sat, 07 Sep 2019 17:32:55 +0200 core.s2smanager: Add [direction] boolean flags to s2s connections http://hg.omfa.de/prosody-hg/log/b36765ab0ae3/core/s2smanager.lua
This will allow representing connections that go both directions]]> Kim Alvefur <zash@zash.se> Sat, 07 Sep 2019 17:31:26 +0200 core.s2smanager: Rewrite log line to use formatting instead of concatenation http://hg.omfa.de/prosody-hg/log/18cab054364a/core/s2smanager.lua
Makes it more in line with logging elsewhere. Potentially avoids or at
least delays creation of new string.]]> Kim Alvefur <zash@zash.se> Tue, 30 Jul 2019 02:14:50 +0200 core.s2smanager: Remove use of tostring in logging http://hg.omfa.de/prosody-hg/log/77a21eef243b/core/s2smanager.lua
This is now performed by loggingmanager]]> Kim Alvefur <zash@zash.se> Mon, 29 Jul 2019 23:15:30 +0200 core.s2smanager: Fix previous commit (Thanks Martin) http://hg.omfa.de/prosody-hg/log/4e8ba156738b/core/s2smanager.lua Kim Alvefur <zash@zash.se> Sat, 30 Mar 2019 09:04:33 +0100 core.s2smanager: Use util.session to create sessions http://hg.omfa.de/prosody-hg/log/8695b50368cd/core/s2smanager.lua Kim Alvefur <zash@zash.se> Fri, 29 Mar 2019 22:40:53 +0100 core.s2smanager: Spread out session tables over multiple lines http://hg.omfa.de/prosody-hg/log/3dfd5f22e3c6/core/s2smanager.lua
Improves readability]]> Kim Alvefur <zash@zash.se> Fri, 29 Mar 2019 22:37:12 +0100 core.s2smanager: Rename variable to be same in two functions http://hg.omfa.de/prosody-hg/log/69982753fe4b/core/s2smanager.lua Kim Alvefur <zash@zash.se> Fri, 29 Mar 2019 22:45:54 +0100 core.s2smanager: Add stub reset_stream method to destroyed sessions http://hg.omfa.de/prosody-hg/log/6625efab91e2/core/s2smanager.lua
Fixes traceback if connection is closed from the 's2s-authenticated' event]]> Kim Alvefur <zash@zash.se> Wed, 16 Jan 2019 20:01:38 +0100 s2smanager: Explicitly export the incoming_s2s table [luacheck] http://hg.omfa.de/prosody-hg/log/d3d74e923e4e/core/s2smanager.lua Kim Alvefur <zash@zash.se> Fri, 23 Mar 2018 13:14:05 +0100 vairious: Add annotation when an empty environment is set [luacheck] http://hg.omfa.de/prosody-hg/log/4f0f5b49bb03/core/s2smanager.lua Kim Alvefur <zash@zash.se> Wed, 28 Feb 2018 20:06:26 +0100 Merge 0.10->trunk http://hg.omfa.de/prosody-hg/log/f91e7ec9654e/core/s2smanager.lua Kim Alvefur <zash@zash.se> Mon, 06 Mar 2017 01:14:32 +0100 core: Split some very long lines [luacheck] http://hg.omfa.de/prosody-hg/log/24170d74b00b/core/s2smanager.lua Kim Alvefur <zash@zash.se> Sat, 04 Mar 2017 17:49:48 +0100 s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve) http://hg.omfa.de/prosody-hg/log/d916703d5e18/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 09 Jun 2016 14:04:50 +0200 core.*: Remove use of module() function http://hg.omfa.de/prosody-hg/log/6236668da30a/core/s2smanager.lua Kim Alvefur <zash@zash.se> Sat, 21 Feb 2015 10:42:19 +0100 Merge 0.9->0.10 http://hg.omfa.de/prosody-hg/log/93eefa92527d/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 14 May 2015 00:22:56 +0200 s2smanager: Make sure destroyed sessions have a sends2s method http://hg.omfa.de/prosody-hg/log/c6c996410064/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 14 May 2015 00:22:13 +0200 portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager, util.xml: Add luacheck annotations http://hg.omfa.de/prosody-hg/log/d3023dd07cb6/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Wed, 06 May 2015 19:20:07 +0100 Remove all trailing whitespace http://hg.omfa.de/prosody-hg/log/bd0ff8ae98a8/core/s2smanager.lua Florian Zeitz <florob@babelmonkeys.de> Fri, 09 Aug 2013 17:48:21 +0200 sessionmanager, s2smanager: Remove unused imports http://hg.omfa.de/prosody-hg/log/3a821511b9ec/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Thu, 11 Apr 2013 17:35:39 +0100 sessionmanager, s2smanager: Remove open_session tracing http://hg.omfa.de/prosody-hg/log/92b88476873a/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Mon, 08 Apr 2013 15:53:18 +0100 s2smanager: Remove unused function parameter http://hg.omfa.de/prosody-hg/log/56db8f2c8563/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Fri, 22 Mar 2013 14:50:43 +0000 s2smanager: Access prosody.hosts instead of hosts global directly http://hg.omfa.de/prosody-hg/log/c1357b7fbca3/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Fri, 22 Mar 2013 14:50:29 +0000 s2smanager, mod_s2s, mod_dialback, mod_saslauth: Move s2smanager.make_authenticated() to mod_s2s, and plugins now signal authentication via the s2s-authenticated event http://hg.omfa.de/prosody-hg/log/612467e263af/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Fri, 22 Mar 2013 14:18:23 +0000 s2smanager: Use unused local, reduce table indexing http://hg.omfa.de/prosody-hg/log/0d11e393201f/core/s2smanager.lua Kim Alvefur <zash@zash.se> Wed, 13 Mar 2013 07:33:36 +0100 s2smanager: Generate session names used for logging the same way everywhere http://hg.omfa.de/prosody-hg/log/10bc0e2aa55e/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 24 Jan 2013 00:58:17 +0100 s2smanager: missing return on session.send function. http://hg.omfa.de/prosody-hg/log/50688a2856f7/core/s2smanager.lua Marco Cirillo <maranda@lightwitch.org> Sun, 26 Aug 2012 22:54:10 +0000 s2smanager: Remove logging of (unknown) in a case where from_host and to_host should always be set http://hg.omfa.de/prosody-hg/log/d4e6a07a7c33/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Mon, 23 Jul 2012 17:35:18 +0100 Hopefully inert commit to clean up logging across a number of modules, removing all cases of concatenation when building log messages http://hg.omfa.de/prosody-hg/log/5243b74a4cbb/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Mon, 23 Jul 2012 17:32:33 +0100 s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks for the testing Zash). http://hg.omfa.de/prosody-hg/log/42ac50c0382e/core/s2smanager.lua Waqas Hussain <waqas20@gmail.com> Wed, 13 Jun 2012 11:47:04 +0500 Merge with Zash http://hg.omfa.de/prosody-hg/log/b7a6e86ab87d/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Thu, 10 May 2012 23:10:56 +0100 s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s http://hg.omfa.de/prosody-hg/log/6b3aec1e0d9f/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 10 May 2012 23:05:03 +0200 s2smanager: Clean up unused imports. http://hg.omfa.de/prosody-hg/log/da2c49a9ab99/core/s2smanager.lua Kim Alvefur <zash@zash.se> Thu, 10 May 2012 23:01:10 +0200 mod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin to after they are authenticated (thus from mod_s2s to s2smanager). Update mod_dialback to fire route/remote directly, as session.send() is no longer available for s2sin_unauthed. Fixes #291. http://hg.omfa.de/prosody-hg/log/5ef05f32bc42/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Thu, 10 May 2012 22:59:01 +0100 Merge timber->trunk - thanks everyone! http://hg.omfa.de/prosody-hg/log/dc70c4ffb66d/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Tue, 24 Apr 2012 21:59:20 +0100 s2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s http://hg.omfa.de/prosody-hg/log/f9f5230d7a9c/core/s2smanager.lua Kim Alvefur <zash@zash.se> Sun, 11 Mar 2012 19:14:28 +0100 s2smanager, mod_s2s: clear up ip_hosts after s2s is marked as established, remove useless space from mod_s2s code http://hg.omfa.de/prosody-hg/log/79c813c4ecc0/core/s2smanager.lua Marco Cirillo <maranda@lightwitch.org> Fri, 24 Feb 2012 18:03:27 +0000 s2smanager: remove send_to_host. http://hg.omfa.de/prosody-hg/log/afd09bfa0884/core/s2smanager.lua Florian Zeitz <florob@babelmonkeys.de> Fri, 24 Feb 2012 15:15:43 +0000 s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smanager into mod_s2s, and further split connection logic for s2sout to a module lib, s2sout.lib.lua http://hg.omfa.de/prosody-hg/log/3dce04129693/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Mon, 23 Jan 2012 16:28:20 +0000 Merge 0.9->trunk http://hg.omfa.de/prosody-hg/log/f2d695d2e31e/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Fri, 09 Mar 2012 18:46:19 +0000 core.s2smanager: Log the entire stream header. http://hg.omfa.de/prosody-hg/log/23b540ab346a/core/s2smanager.lua Kim Alvefur <zash@zash.se> Sun, 04 Mar 2012 17:38:47 +0100 Merge with 0.9 http://hg.omfa.de/prosody-hg/log/eb97612bf42b/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Sat, 25 Feb 2012 17:21:15 +0000 core.s2smanager: Fix check_cert_status() for when the stream has no from attr http://hg.omfa.de/prosody-hg/log/92597f6223de/core/s2smanager.lua Kim Alvefur <zash@zash.se> Tue, 21 Feb 2012 21:13:13 +0100 s2smanager: Fix traceback when socket.tcp6 isn't available http://hg.omfa.de/prosody-hg/log/b827401581c5/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Sat, 25 Feb 2012 02:03:26 +0000 Merge with 0.9 http://hg.omfa.de/prosody-hg/log/694491140a67/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Thu, 26 Jan 2012 18:48:21 +0000 s2smanager: Log the host when marking it authenticated http://hg.omfa.de/prosody-hg/log/cad62a675b60/core/s2smanager.lua Paul Aurich <paul@darkrain42.org> Tue, 24 Jan 2012 14:58:54 -0800 s2smanager: Fix missing import of 'type' (thanks darkrain) http://hg.omfa.de/prosody-hg/log/a81d045e7d16/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Tue, 20 Dec 2011 17:36:38 +0000 s2smanager: Don't throw an error when the "interface" config option is a string (which it is by default). http://hg.omfa.de/prosody-hg/log/9f6c68cb3fbd/core/s2smanager.lua Waqas Hussain <waqas20@gmail.com> Wed, 14 Dec 2011 06:46:24 +0500 s2smanager: Remove unused reference to modulemanager http://hg.omfa.de/prosody-hg/log/447234173e9e/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Tue, 13 Dec 2011 15:40:37 +0000 s2smanager: Store port specified by SRV records http://hg.omfa.de/prosody-hg/log/7456ddcc0b14/core/s2smanager.lua Florian Zeitz <florob@babelmonkeys.de> Wed, 07 Dec 2011 23:37:56 +0100 s2smanager: Use config over xmppserver's default interface http://hg.omfa.de/prosody-hg/log/bbede0141f7e/core/s2smanager.lua Matthew Wild <mwild1@gmail.com> Mon, 28 Nov 2011 14:30:12 +0000 s2smanager, net.dns: Fix handling for NXNAME and SRV target of "." http://hg.omfa.de/prosody-hg/log/c25dee24623f/core/s2smanager.lua Florian Zeitz <florob@babelmonkeys.de> Wed, 26 Oct 2011 02:03:33 +0200