# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1410267946 -7200
# Node ID 166d1bd8fc38c32ee91bbab583c62bd2bb007dcb
# Parent  b058486e6a79f263ce78822bf110559a6945bc4c
core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from stanza_router

diff -r b058486e6a79 -r 166d1bd8fc38 core/stanza_router.lua
--- a/core/stanza_router.lua	Tue Sep 09 14:42:33 2014 +0200
+++ b/core/stanza_router.lua	Tue Sep 09 15:05:46 2014 +0200
@@ -46,7 +46,7 @@
 		if origin.send then
 			origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		end
-	elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
+	else
 		log("warn", "Unhandled %s stream element or stanza: %s; xmlns=%s: %s", origin_type, name, xmlns, tostring(stanza)); -- we didn't handle it
 		origin:close("unsupported-stanza-type");
 	end
diff -r b058486e6a79 -r 166d1bd8fc38 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Sep 09 14:42:33 2014 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Sep 09 15:05:46 2014 +0200
@@ -153,6 +153,7 @@
 			-- Stream is authenticated and we are seem to be done with feature negotiation,
 			-- so the stream is ready for stanzas.  RFC 6120 Section 4.3
 			mark_connected(session);
+			return true;
 		end
 	end, -1);
 end