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

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 4b41afbdd5aa8b67de9a63db7b84e5f7e2a5d883..36b4c47680e18be74b8241480a6050fde2519924 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -28,7 +28,21 @@ local s2s_streamopened = require "core.s2smanager".streamopened;
 local s2s_streamclosed = require "core.s2smanager".streamclosed;
 local s2s_destroy_session = require "core.s2smanager".destroy_session;
 local s2s_attempt_connect = require "core.s2smanager".attempt_connection;
-local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza =  core_process_stanza };
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", streamopened = s2s_streamopened, streamclosed = s2s_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", "Server-to-server XML parse error: %s", tostring(error));
+               session:close("xml-not-well-formed");
+       end
+end
+
+local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
+function stream_callbacks.handlestanza(a, b)
+       xpcall(function () core_process_stanza(a, b) end, handleerr);
+end
 
 local connlisteners_register = require "net.connlisteners".register;
 
@@ -53,8 +67,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
 
@@ -101,28 +118,18 @@ function xmppserver.listener(conn, data)
 
                -- Logging functions --
 
-               local mainlog, log = log;
-               do
-                       local conn_name = "s2sin"..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("Incoming s2s connection");
+               
+               local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
+               session.log = logger.init(conn_name);
+               
+               session.log("info", "Incoming s2s connection");
                
                session.reset_stream = session_reset_stream;
                session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
-               -- FIXME: 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);
@@ -152,11 +159,8 @@ function xmppserver.register_outgoing(conn, session)
        session.reset_stream = session_reset_stream;    
        session_reset_stream(session); -- Initialise, ready for use
        
-       -- FIXME: 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)
-       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
+       --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
 end
 
 connlisteners_register("xmppserver", xmppserver);