Software / code / prosody
Changeset
6085:2f911644f527
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 18 Apr 2014 07:51:41 +0200 |
| parents | 6084:3c02a9ed399e |
| children | 6086:3b4fde51fa25 |
| files | plugins/mod_s2s/mod_s2s.lua |
| diffstat | 1 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua Fri Apr 18 07:50:44 2014 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Fri Apr 18 07:51:41 2014 +0200 @@ -510,22 +510,10 @@ 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, - } +function session_stream_attrs(session, from, to, attr) 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 @@ -540,7 +528,7 @@ session.stream:reset(); end - session.open_stream = session_open_stream; + session.stream_attrs = session_stream_attrs; local filter = session.filter; function session.data(data)
