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 8ab3008cc8a1ef93101ba7293250dde5b1c62dab..357516e9508f58297b9a53716c4893d042cededa 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -36,7 +36,21 @@ local sm_streamopened = sessionmanager.streamopened;
 local sm_streamclosed = sessionmanager.streamclosed;
 local st = stanza;
 
-local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed };
+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, default_mode = "*a" };
@@ -51,8 +65,11 @@ local function session_reset_stream(session)
                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
 
@@ -99,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.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);