Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 85430308584ccc8cb72f59c068ce3a312f630b46..357516e9508f58297b9a53716c4893d042cededa 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,3 +1,23 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 
 local logger = require "logger";
 local lxp = require "lxp"
@@ -13,29 +33,49 @@ 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 = { stream_tag = "http://etherx.jabber.org/streams|stream", streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
+
+function stream_callbacks.error(session, error, data)
+       if error == "no-stream" then
+               session:close("invalid-namespace");
+       else
+               session.log("debug", "Client XML parse error: %s", tostring(error));
+               session:close("xml-not-well-formed");
+       end
+end
+
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
+function stream_callbacks.handlestanza(a, b)
+       xpcall(function () core_process_stanza(a, b) end, handleerr);
+end
+
 local sessions = {};
-local xmppclient = { default_port = 5222 };
+local xmppclient = { default_port = 5222, default_mode = "*a" };
 
 -- These are session methods --
 
 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;
                
                function session.data(conn, data)
-                       parser:parse(data);
+                       local ok, err = parser:parse(data);
+                       if ok then return; end
+                       session:close("xml-not-well-formed");
                end
+               
                return true;
 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
@@ -76,28 +116,17 @@ function xmppclient.listener(conn, data)
 
                -- Logging functions --
 
-               local mainlog, log = log;
-               do
-                       local conn_name = tostring(conn):match("[a-f0-9]+$");
-                       log = logger.init(conn_name);
-               end
-               local print = function (...) log("info", t_concatall({...}, "\t")); end
-               session.log = log;
-
-               print("Client connected");
+               local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+               session.log = logger.init(conn_name);
+               
+               session.log("info", "Client connected");
                
                session.reset_stream = session_reset_stream;
-               session.disconnect = session_disconnect;
+               session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
-               -- TODO: Below function should be session,stanza - and xmlhandlers should use :method() notation to call,
-               -- this will avoid the useless indirection we have atm
-               -- (I'm on a mission, no time to fix now)
-
-               -- 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.dispatch_stanza = stream_callbacks.handlestanza;
        end
        if data then
                session.data(conn, data);
@@ -107,12 +136,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;