prosody
873ad1023eb0
plugins/mod_s2s/mod_s2s.lua

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

Software / code / prosody

Diff

plugins/mod_s2s/mod_s2s.lua @ 6683:873ad1023eb0

mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data after session was closed
author Kim Alvefur <zash@zash.se>
date Wed, 13 May 2015 21:55:08 +0200
parent 6600:b1c84d220c40
child 6684:53635a91c95c
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua	Wed May 13 21:47:39 2015 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Wed May 13 21:55:08 2015 +0200
@@ -147,7 +147,7 @@
 
 -- Stream is authorised, and ready for normal stanzas
 function mark_connected(session)
-	local sendq, send = session.sendq, session.sends2s;
+	local sendq = session.sendq;
 	
 	local from, to = session.from_host, session.to_host;
 	
@@ -170,6 +170,7 @@
 	if session.direction == "outgoing" then
 		if sendq then
 			session.log("debug", "sending %d queued stanzas across new outgoing connection to %s", #sendq, session.to_host);
+			local send = session.sends2s;
 			for i, data in ipairs(sendq) do
 				send(data[1]);
 				sendq[i] = nil;
@@ -269,8 +270,6 @@
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
 function stream_callbacks.streamopened(session, attr)
-	local send = session.sends2s;
-	
 	session.version = tonumber(attr.version) or 0;
 	
 	-- TODO: Rename session.secure to session.encrypted
@@ -360,7 +359,7 @@
 			end
 			
 			log("debug", "Sending stream features: %s", tostring(features));
-			send(features);
+			session.sends2s(features);
 		end
 		session.notopen = nil;
 	elseif session.direction == "outgoing" then