diff options
Diffstat (limited to 'net/xmppserver_listener.lua')
| -rw-r--r-- | net/xmppserver_listener.lua | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index ee3faa8f..51116a5e 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -5,8 +5,11 @@ local init_xmlhandlers = require "core.xmlhandlers" local sm_new_session = require "core.sessionmanager".new_session; local s2s_new_incoming = require "core.s2smanager".new_incoming; local s2s_streamopened = require "core.s2smanager".streamopened; +local s2s_streamclosed = require "core.s2smanager".streamclosed; local s2s_destroy_session = require "core.s2smanager".destroy_session; +local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed }; + local connlisteners_register = require "net.connlisteners".register; local t_insert = table.insert; @@ -24,7 +27,7 @@ local xmppserver = { default_port = 5269 }; local function session_reset_stream(session) -- Reset stream - local parser = lxp.new(init_xmlhandlers(session, s2s_streamopened), "|"); + local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); session.parser = parser; session.notopen = true; @@ -35,6 +38,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_close(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.sends2s(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.sends2s(stanza); + elseif reason.name then -- a stanza + log("info", "Disconnecting %s->%s[%s], <stream:error> is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason)); + session.sends2s(reason); + end + end + end + session.sends2s("</stream:stream>"); + session.conn.close(); + xmppserver.disconnect(session.conn, "stream error"); + end +end + + -- End of session methods -- function xmppserver.listener(conn, data) @@ -56,6 +92,7 @@ function xmppserver.listener(conn, data) print("Incoming s2s connection"); session.reset_stream = session_reset_stream; + session.close = session_close; session_reset_stream(session); -- Initialise, ready for use @@ -66,9 +103,6 @@ function xmppserver.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); @@ -78,6 +112,7 @@ end function xmppserver.disconnect(conn) local session = sessions[conn]; if session then + (session.log or log)("info", "s2s disconnected: %s->%s", tostring(session.from_host), tostring(session.to_host)); s2s_destroy_session(session); sessions[conn] = nil; session = nil; |