Add initial mod_console

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index b475237f11ce5e211dc3adb7048ccc2886a77eb7..0f5511b4011699d7eafaac569105ca6383970da9 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -13,8 +13,11 @@ local m_random = math.random;
 local format = string.format;
 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session");
 local sm_streamopened = sessionmanager.streamopened;
+local sm_streamclosed = sessionmanager.streamclosed;
 local st = stanza;
 
+local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed };
+
 local sessions = {};
 local xmppclient = { default_port = 5222 };
 
@@ -22,7 +25,7 @@ local xmppclient = { default_port = 5222 };
 
 local function session_reset_stream(session)
        -- Reset stream
-               local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), "|");
+               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|");
                session.parser = parser;
                
                session.notopen = true;
@@ -33,6 +36,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 client, <stream:error> is: %s", 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 client, <stream:error> is: %s", tostring(stanza));
+                                       session.send(stanza);
+                               elseif reason.name then -- a stanza
+                                       log("info", "Disconnecting client, <stream:error> is: %s", tostring(reason));
+                                       session.send(reason);
+                               end
+                       end
+               end
+               session.send("</stream:stream>");
+               session.conn.close();
+               xmppclient.disconnect(session.conn, "stream error");
+       end
+end
+
+
 -- End of session methods --
 
 function xmppclient.listener(conn, data)
@@ -54,6 +90,7 @@ function xmppclient.listener(conn, data)
                print("Client connected");
                
                session.reset_stream = session_reset_stream;
+               session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
@@ -64,9 +101,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);
@@ -76,13 +110,7 @@ end
 function xmppclient.disconnect(conn, err)
        local session = sessions[conn];
        if session then
-               if session.presence and session.presence.attr.type ~= "unavailable" then
-                       local pres = st.presence{ type = "unavailable" };
-                       if err == "closed" then err = "connection closed"; end
-                       pres:tag("status"):text("Disconnected: "..err);
-                       session.stanza_dispatch(pres);
-               end
-               session.log("info", "Client disconnected: %s", err);
+               (session.log or log)("info", "Client disconnected: %s", err);
                sm_destroy_session(session);
                sessions[conn]  = nil;
                session = nil;