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

mod_s2s: Bail if connection is destroyed after attempting to open stream

Browse source 
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.
This commit is contained in:
Kim Alvefur 2021-06-16 23:53:00 +02:00
parent aa041ffa10
commit f55f6be0ff
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/mod_s2s.lua
View file

@ -461,6 +461,11 @@ function stream_callbacks._streamopened(session, attr)
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");