# HG changeset patch # User Kim Alvefur # Date 1397141399 -7200 # Node ID 446148cad35e72e7aa11899f533a7ce93eb0e402 # Parent dab7ad6fa23ca147a834aa572e306789ee89516b mod_s2s: Revert e626ee2fe106 change, it broke Dialback diff -r dab7ad6fa23c -r 446148cad35e plugins/mod_s2s/mod_s2s.lua --- a/plugins/mod_s2s/mod_s2s.lua Thu Apr 10 13:15:11 2014 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Thu Apr 10 16:49:59 2014 +0200 @@ -510,6 +510,24 @@ end end +function session_open_stream(session, from, to) + 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(""); + 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); @@ -522,6 +540,8 @@ session.stream:reset(); end + session.open_stream = session_open_stream; + local filter = session.filter; function session.data(data) data = filter("bytes/in", data);