From e38e915ef50ec62f1724ef55018b6b4120988a0d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 26 Aug 2022 18:53:00 +0200 Subject: mod_s2s: Fix firing buffer drain events Fixes the same kind of issue as in 65563530375b but once and for all, while improving similarity between incoming and outgoing connections. --- plugins/mod_s2s.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/mod_s2s.lua b/plugins/mod_s2s.lua index e810c6cd..300a747e 100644 --- a/plugins/mod_s2s.lua +++ b/plugins/mod_s2s.lua @@ -464,6 +464,7 @@ function stream_callbacks._streamopened(session, attr) end if session.type == "s2sin_unauthed" and to and not session.to_host then session.to_host = to; + session.host = to; elseif to ~= session.to_host then session:close({ condition = "improper-addressing", text = "New stream 'to' attribute does not match original" }); return; @@ -888,8 +889,7 @@ end function listener.onreadtimeout(conn) local session = sessions[conn]; if session then - local host = session.host or session.to_host; - return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); + return (hosts[session.host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); end end -- cgit v1.2.3