Mercurial > lxmppd-hg-xmllex / changeset

--- a/core/s2smanager.lua	Thu Nov 20 02:59:40 2008 +0000
+++ b/core/s2smanager.lua	Thu Nov 20 03:00:43 2008 +0000
@@ -141,20 +141,20 @@
 	
 	session.version = tonumber(attr.version) or 0;
 	if session.version >= 1.0 and not (attr.to and attr.from) then
-		print("to: "..tostring(attr.to).." from: "..tostring(attr.from));
+		--print("to: "..tostring(attr.to).." from: "..tostring(attr.from));
 		log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC");
 	end
 	
 	if session.direction == "incoming" then
 		-- Send a reply stream header
 		
-		for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end
+		--for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end
 		
 		session.to_host = attr.to;
 		session.from_host = attr.from;
 	
 		session.streamid = uuid_gen();
-		print(session, session.from_host, "incoming s2s stream opened");
+		(session.log or log)("debug", "incoming s2s received <stream:stream>");
 		send("<?xml version='1.0'?>");
 		send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag());
 		if session.to_host and not hosts[session.to_host] then

--- a/core/stanza_router.lua	Thu Nov 20 02:59:40 2008 +0000
+++ b/core/stanza_router.lua	Thu Nov 20 03:00:43 2008 +0000
@@ -300,8 +300,6 @@
 	elseif origin.type == "component" or origin.type == "local" then
 		-- Route via s2s for components and modules
 		log("debug", "Routing outgoing stanza for %s to %s", origin.host, host);
-		for k,v in pairs(origin) do print("origin:", tostring(k), tostring(v)); end
-		print(tostring(host), tostring(from_host))
 		send_s2s(origin.host, host, stanza);
 	else
 		log("warn", "received stanza from unhandled connection type: %s", origin.type);

--- a/util/logger.lua	Thu Nov 20 02:59:40 2008 +0000
+++ b/util/logger.lua	Thu Nov 20 03:00:43 2008 +0000
@@ -33,4 +33,4 @@
 			end
 end
 
-return _M;
\ No newline at end of file
+return _M;