diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-11-18 14:42:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-11-18 14:42:45 +0000 |
| commit | f4e09200420e410c608ef9b841a0669b5c0d88a9 (patch) | |
| tree | 020b96ec7b606dcdf4235bfcc3f5692f2ea0baea /net | |
| parent | f21f55bb1e757f27cf9d2263469eb9ae6c63b91e (diff) | |
| download | prosody-f4e09200420e410c608ef9b841a0669b5c0d88a9.tar.gz prosody-f4e09200420e410c608ef9b841a0669b5c0d88a9.zip | |
s2s sessions can now be disconnected, with or without a stream error. Fixes #8
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppclient_listener.lua | 3 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 34 |
2 files changed, 34 insertions, 3 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 1f6691da..85430308 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -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); diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index ee3faa8f..21351c12 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -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 |