prosody
21edd42768b5
core/s2smanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/s2smanager.lua @ 4026:21edd42768b5

s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
author Matthew Wild <mwild1@gmail.com>
date Fri, 24 Dec 2010 04:56:37 +0000
parent 4025:cc2e75e49cfb
child 4027:81d0ed5787f6
line wrap: on
line diff
--- a/core/s2smanager.lua	Fri Dec 24 04:56:02 2010 +0000
+++ b/core/s2smanager.lua	Fri Dec 24 04:56:37 2010 +0000
@@ -125,7 +125,10 @@
 		log("debug", "stanza [%s] queued until connection complete", tostring(data.name));
 		if (not host_session.connecting) and (not host_session.conn) then
 			log("warn", "Connection to %s failed already, destroying session...", to_host);
-			destroy_session(host_session);
+			if not destroy_session(host_session, "Connection failed") then
+				-- Already destroyed, we need to bounce our stanza
+				bounce_sendq(host_session, host_session.destruction_reason);
+			end
 			return false;
 		end
 	end