aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-01-24 00:59:32 +0100
committerKim Alvefur <zash@zash.se>2013-01-24 00:59:32 +0100
commit255bd1e311f7dfe1dd48651666d677ed0161d272 (patch)
tree1d6709adb9ac9908309024974e17d0626a957d1d /plugins/mod_s2s
parent4517552d8ba7d8c57794e2c74c7d73c64cbeb960 (diff)
downloadprosody-255bd1e311f7dfe1dd48651666d677ed0161d272.tar.gz
prosody-255bd1e311f7dfe1dd48651666d677ed0161d272.zip
mod_s2s: Don't try to close sessions that were destroyed before timeout
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index ad628a9b..15c89ced 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -429,6 +429,8 @@ local function initialize_session(session)
add_task(connect_timeout, function ()
if session.type == "s2sin" or session.type == "s2sout" then
return; -- Ok, we're connected
+ elseif session.type == "s2s_destroyed" then
+ return; -- Session already destroyed
end
-- Not connected, need to close session and clean up
(session.log or log)("debug", "Destroying incomplete session %s->%s due to inactivity",