Mercurial > lxmppd-hg-xmllex / changeset

--- a/core/s2smanager.lua	Fri Nov 14 02:23:43 2008 +0000
+++ b/core/s2smanager.lua	Fri Nov 14 02:33:20 2008 +0000
@@ -48,7 +48,7 @@
 		elseif host.type == "local" or host.type == "component" then
 			log("error", "Trying to send a stanza to ourselves??")
 			log("error", "Traceback: %s", get_traceback());
-			log("error", "Stanza: %s", stanza);
+			log("error", "Stanza: %s", data);
 		else
 			(host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host);
 			-- FIXME

--- a/core/stanza_router.lua	Fri Nov 14 02:23:43 2008 +0000
+++ b/core/stanza_router.lua	Fri Nov 14 02:33:20 2008 +0000
@@ -182,7 +182,8 @@
 		end -- TODO handle other stanzas
 	else
 		log("warn", "Unhandled origin: %s", origin.type);
-		origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
+		-- s2s stanzas can get here
+		(origin.sends2s or origin.send)(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
 	end
 end