Add initial mod_console

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 85430308584ccc8cb72f59c068ce3a312f630b46..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;
@@ -35,7 +38,7 @@ end
 
 
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local function session_disconnect(session, reason)
+local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
                if reason then
@@ -87,7 +90,7 @@ function xmppclient.listener(conn, data)
                print("Client connected");
                
                session.reset_stream = session_reset_stream;
-               session.disconnect = session_disconnect;
+               session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
@@ -107,12 +110,6 @@ 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 or log)("info", "Client disconnected: %s", err);
                sm_destroy_session(session);
                sessions[conn]  = nil;