Changeset

11609:6dcc45a2e3bc

mod_s2s: Bail if connection is destroyed after attempting to open stream Fixes "attempt to compare number with nil" because `session.version` has been cleared by s2smanager.destroy_session. This can happen with the server_epoll setting opportunistic_writes enabled, which means that it can notice that the connection failed at this point, after which it triggers the whole chain of events that leads to session destruction and "cleaning" most of the session fields.
author Kim Alvefur <zash@zash.se>
date Wed, 16 Jun 2021 23:53:00 +0200 (2021-06-16)
parents 11608:b2610460d9ab
children 11610:d221d764741a
files plugins/mod_s2s.lua
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_s2s.lua	Wed Jun 16 00:00:17 2021 +0200
+++ b/plugins/mod_s2s.lua	Wed Jun 16 23:53:00 2021 +0200
@@ -461,6 +461,11 @@
 		end
 
 		session:open_stream(session.to_host, session.from_host)
+		if session.destroyed then
+			-- sending the stream opening could have failed during an opportunistic write
+			return
+		end
+
 		session.notopen = nil;
 		if session.version >= 1.0 then
 			local features = st.stanza("stream:features");