net/xmppclient_listener.lua

changeset 551
53dc98ffde16
parent 545
60002993be04
child 557
c9b3ffb08fe3
--- a/net/xmppclient_listener.lua	Fri Dec 05 00:16:38 2008 +0500
+++ b/net/xmppclient_listener.lua	Thu Dec 04 19:21:50 2008 +0000
@@ -36,7 +36,7 @@
 local sm_streamclosed = sessionmanager.streamclosed;
 local st = stanza;
 
-local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed };
+local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
 
 local sessions = {};
 local xmppclient = { default_port = 5222, default_mode = "*a" };
@@ -101,7 +101,7 @@
 
 		local mainlog, log = log;
 		do
-			local conn_name = tostring(conn):match("[a-f0-9]+$");
+			local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
 			log = logger.init(conn_name);
 		end
 		local print = function (...) log("info", t_concatall({...}, "\t")); end
@@ -119,8 +119,9 @@
 		-- (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
+		--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
 	if data then
 		session.data(conn, data);

mercurial