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

s2s sessions can now be disconnected, with or without a stream error. Fixes #8

Browse source
This commit is contained in:
Matthew Wild 2008-11-18 14:42:45 +00:00
parent f21f55bb1e
commit f4e0920042
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/xmppclient_listener.lua
View file

@ -98,9 +98,6 @@ function xmppclient.listener(conn, data)
-- Debug version --
local function handleerr(err) print("Traceback:", err, debug.traceback()); end
session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
-- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
end
if data then
session.data(conn, data);

34
net/xmppserver_listener.lua
View file

@ -35,6 +35,39 @@ local function session_reset_stream(session)
return true;
end
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
local function session_disconnect(session, reason)
local log = session.log or log;
if session.conn then
if reason then
if type(reason) == "string" then -- assume stream error
log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason);
session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' }));
elseif type(reason) == "table" then
if reason.condition then
local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up();
if reason.text then
stanza:tag("text", stream_xmlns_attr):text(reason.text):up();
end
if reason.extra then
stanza:add_child(reason.extra);
end
log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(stanza));
session.send(stanza);
elseif reason.name then -- a stanza
log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(reason));
session.send(reason);
end
end
end
session.send("</stream:stream>");
session.conn.close();
xmppserver.disconnect(session.conn, "stream error");
end
end
-- End of session methods --
function xmppserver.listener(conn, data)
@ -56,6 +89,7 @@ function xmppserver.listener(conn, data)
print("Incoming s2s connection");
session.reset_stream = session_reset_stream;
session.disconnect = session_disconnect;
session_reset_stream(session); -- Initialise, ready for use