aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-18 07:51:41 +0200
committerKim Alvefur <zash@zash.se>2014-04-18 07:51:41 +0200
commit5d015f7fb0852703c254167f2a8db2e2173162eb (patch)
tree616081abceacca46b1494c99938a8b782d6afa9e
parent0c1de192aba22db364e9eb3e0e9aadf5f63b3828 (diff)
downloadprosody-5d015f7fb0852703c254167f2a8db2e2173162eb.tar.gz
prosody-5d015f7fb0852703c254167f2a8db2e2173162eb.zip
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header
-rw-r--r--plugins/mod_s2s/mod_s2s.lua16
1 files changed, 2 insertions, 14 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 5531ca3e..73d95970 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -510,22 +510,10 @@ 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,
- }
+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 @@ local function initialize_session(session)
session.stream:reset();
end
- session.open_stream = session_open_stream;
+ session.stream_attrs = session_stream_attrs;
local filter = session.filter;
function session.data(data)