diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
commit | a415748985aa2ec998caabb5baf1d7f083d6076a (patch) | |
tree | 521b9634144ac84ea608dbe47a15a0bcd1951695 /plugins/mod_s2s/mod_s2s.lua | |
parent | eae27a73d7439930ebe9732d72b14c795b17c528 (diff) | |
parent | b9751f2455a3a7a72c2505d3fc8296ee722726cc (diff) | |
download | prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.tar.gz prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 5531ca3e..d27f50af 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -510,24 +510,6 @@ local function session_close(session, reason, remote_reason) 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("<?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); @@ -540,8 +522,6 @@ local function initialize_session(session) session.stream:reset(); end - session.open_stream = session_open_stream; - local filter = session.filter; function session.data(data) data = filter("bytes/in", data); |