Merge 0.6->0.7

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index dcc561f373dd844af220b04382a3d472b7dc06b6..94daa2b2f7c95f8f846cf451da31ebe85620288a 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -27,17 +27,38 @@ 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|stream", 
-               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 };
 
+local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
+
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
                session.log("debug", "Invalid opening stream header");
                session:close("invalid-namespace");
-       elseif session.close then
-               (session.log or log)("debug", "Client XML parse error: %s", tostring(error));
+       elseif error == "parse-error" then
+               (session.log or log)("debug", "Client XML parse error: %s", tostring(data));
                session:close("xml-not-well-formed");
+       elseif error == "stream-error" then
+               local condition, text = "undefined-condition";
+               for child in data:children() do
+                       if child.attr.xmlns == xmlns_xmpp_streams then
+                               if child.name ~= "text" then
+                                       condition = child.name;
+                               else
+                                       text = child:get_text();
+                               end
+                               if condition ~= "undefined-condition" and text then
+                                       break;
+                               end
+                       end
+               end
+               text = condition .. (text and (" ("..text..")") or "");
+               session.log("info", "Session closed by remote with error: %s", text);
+               session:close(nil, text);
        end
 end
 
@@ -53,7 +74,7 @@ local xmppclient = { default_port = 5222, default_mode = "*a" };
 
 local function session_reset_stream(session)
        -- Reset stream
-               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|");
+               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1");
                session.parser = parser;
                
                session.notopen = true;
@@ -61,16 +82,15 @@ local function session_reset_stream(session)
                function session.data(conn, data)
                        local ok, err = parser:parse(data);
                        if ok then return; end
-                       log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+                       log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
                        session:close("xml-not-well-formed");
                end
                
                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:gsub("%|[^|]+$", ""), 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,32 +120,31 @@ 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);
                sessions[conn] = session;
 
-               -- Logging functions --
-
-               local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
-               session.log = logger.init(conn_name);
-               
                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;
                
@@ -138,14 +157,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