Mercurial > lxmppd-hg-xmllex / changeset

--- a/core/sessionmanager.lua	Sun Dec 07 18:44:23 2008 +0000
+++ b/core/sessionmanager.lua	Sun Dec 07 19:04:23 2008 +0000
@@ -69,7 +69,7 @@
 		local pres = st.presence{ type = "unavailable" };
 		if (not err) or err == "closed" then err = "connection closed"; end
 		pres:tag("status"):text("Disconnected: "..err);
-		session.stanza_dispatch(pres);
+		session:dispatch_stanza(pres);
 	end
 	
 	-- Remove session/resource from user's session list

--- a/net/xmppclient_listener.lua	Sun Dec 07 18:44:23 2008 +0000
+++ b/net/xmppclient_listener.lua	Sun Dec 07 19:04:23 2008 +0000
@@ -126,10 +126,7 @@
 		
 		session_reset_stream(session); -- Initialise, ready for use
 		
-		-- 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.stanza_dispatch = streamcallbacks.handlestanza;
 	end
 	if data then
 		session.data(conn, data);

--- a/net/xmppserver_listener.lua	Sun Dec 07 18:44:23 2008 +0000
+++ b/net/xmppserver_listener.lua	Sun Dec 07 19:04:23 2008 +0000
@@ -129,9 +129,7 @@
 		
 		session_reset_stream(session); -- Initialise, ready for use
 		
-		-- 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.stanza_dispatch = streamcallbacks.handlestanza;
 	end
 	if data then
 		session.data(conn, data);