aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
commit87020b4789013b1d8ff33d7929d455392b1d9638 (patch)
tree521b9634144ac84ea608dbe47a15a0bcd1951695 /plugins/mod_s2s
parent35ef31bd9b827f325f17180dfa77a66578df0983 (diff)
parentae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (diff)
downloadprosody-87020b4789013b1d8ff33d7929d455392b1d9638.tar.gz
prosody-87020b4789013b1d8ff33d7929d455392b1d9638.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua20
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);