Comparison

mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header

comparison

equal deleted inserted replaced

-:3c02a9ed399e
+:2f911644f527
 			conn:close(); -- Close immediately, as this is an outgoing connection or is not authed
 		end
 	end
 end
-function session_open_stream(session, from, to)
+function session_stream_attrs(session, from, to, attr)
-	local attr = {
-		["xmlns:stream"] = 'http://etherx.jabber.org/streams',
-		xmlns = 'jabber:server',
-		version = session.version and (session.version > 0 and "1.0" or nil),
-		["xml:lang"] = 'en',
-		id = session.streamid,
-		from = from, to = to,
-	}
 	if not from or (hosts[from] and hosts[from].modules.dialback) then
 		attr["xmlns:db"] = 'jabber:server:dialback';
 	end
-	session.sends2s("<?xml version='1.0'?>");
-	session.sends2s(st.stanza("stream:stream", attr):top_tag());
-	return true;
 end
 -- Session initialization logic shared by incoming and outgoing
 local function initialize_session(session)
 	local stream = new_xmpp_stream(session, stream_callbacks);
 	function session.reset_stream()
 		session.notopen = true;
 		session.stream:reset();
 	end
-	session.open_stream = session_open_stream;
+	session.stream_attrs = session_stream_attrs;
 	local filter = session.filter;
 	function session.data(data)
 		data = filter("bytes/in", data);
 		if data then