mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 22:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_c2s: Break out stream opening into a separate function

Browse source
This commit is contained in:
Florian Zeitz 2014-01-31 12:01:12 +01:00
parent e5faa1bfa2
commit c5c7ef5b0f
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/mod_c2s.lua
View file

@ -38,7 +38,6 @@ local runner_callbacks = {};
--- Stream events handlers --- Stream events handlers
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
function stream_callbacks.streamopened(session, attr) function stream_callbacks.streamopened(session, attr)
local send = session.send; local send = session.send;
@ -58,9 +57,7 @@ function stream_callbacks.streamopened(session, attr)
return; return;
end end
send("<?xml version='1.0'?>"..st.stanza("stream:stream", { session:open_stream();
xmlns = 'jabber:client', ["xmlns:stream"] = 'http://etherx.jabber.org/streams';
id = session.streamid, from = session.host, version = '1.0', ["xml:lang"] = 'en' }):top_tag());
(session.log or log)("debug", "Sent reply <stream:stream> to client"); (session.log or log)("debug", "Sent reply <stream:stream> to client");
session.notopen = nil; session.notopen = nil;
@ -129,8 +126,7 @@ local function session_close(session, reason)
local log = session.log or log; local log = session.log or log;
if session.conn then if session.conn then
if session.notopen then if session.notopen then
session.send("<?xml version='1.0'?>"); session:open_stream();
session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
end end
if reason then -- nil == no err, initiated by us, false == initiated by client if reason then -- nil == no err, initiated by us, false == initiated by client
local stream_error = st.stanza("stream:error"); local stream_error = st.stanza("stream:error");
@ -178,6 +174,19 @@ local function session_close(session, reason)
end end
end end
local function session_open_stream(session)
local attr = {
["xmlns:stream"] = 'http://etherx.jabber.org/streams',
xmlns = stream_callbacks.default_ns,
version = "1.0",
["xml:lang"] = 'en',
id = session.streamid or "",
from = session.host
};
session.send("<?xml version='1.0'?>");
session.send(st.stanza("stream:stream", attr):top_tag());
end
module:hook_global("user-deleted", function(event) module:hook_global("user-deleted", function(event)
local username, host = event.username, event.host; local username, host = event.username, event.host;
local user = hosts[host].sessions[username]; local user = hosts[host].sessions[username];
@ -225,6 +234,7 @@ function listener.onconnect(conn)
conn:setoption("keepalive", opt_keepalives); conn:setoption("keepalive", opt_keepalives);
end end
session.open_stream = session_open_stream;
session.close = session_close; session.close = session_close;
local stream = new_xmpp_stream(session, stream_callbacks); local stream = new_xmpp_stream(session, stream_callbacks);