net.http: destroy_request(): Remove update for new server API, pass request.handler...

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 01d73a36fedc56087eb5172b74fe0564823c2b98..3a0c65beaa98dfcbdf0a2a902edbe1b83465fb16 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -27,8 +27,10 @@ local sm_streamopened = sessionmanager.streamopened;
 local sm_streamclosed = sessionmanager.streamclosed;
 local st = require "util.stanza";
 
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", 
-               default_ns = "jabber:client",
+local config = require "core.configmanager";
+local opt_keepalives = config.get("*", "core", "tcp_keepalives");
+
+local stream_callbacks = { default_ns = "jabber:client",
                streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
 
 function stream_callbacks.error(session, error, data)
@@ -68,9 +70,8 @@ local function session_reset_stream(session)
                return true;
 end
 
-
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
@@ -100,15 +101,15 @@ local function session_close(session, reason)
                        end
                end
                session.send("</stream:stream>");
-               session.conn.close();
-               xmppclient.disconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
+               session.conn:close();
+               xmppclient.ondisconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
        end
 end
 
 
 -- End of session methods --
 
-function xmppclient.listener(conn, data)
+function xmppclient.onincoming(conn, data)
        local session = sessions[conn];
        if not session then
                session = sm_new_session(conn);
@@ -117,10 +118,14 @@ function xmppclient.listener(conn, data)
                session.log("info", "Client connected");
                
                -- Client is using legacy SSL (otherwise mod_tls sets this flag)
-               if conn.ssl() then
+               if conn:ssl() then
                        session.secure = true;
                end
                
+               if opt_keepalives ~= nil then
+                       conn:setoption("keepalive", opt_keepalives);
+               end
+               
                session.reset_stream = session_reset_stream;
                session.close = session_close;
                
@@ -133,14 +138,13 @@ function xmppclient.listener(conn, data)
        end
 end
        
-function xmppclient.disconnect(conn, err)
+function xmppclient.ondisconnect(conn, err)
        local session = sessions[conn];
        if session then
                (session.log or log)("info", "Client disconnected: %s", err);
                sm_destroy_session(session, err);
                sessions[conn]  = nil;
                session = nil;
-               collectgarbage("collect");
        end
 end