X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_compression.lua;h=638b8e13acdc7c4b2a9cb79f2176d37ecf45dcf2;hb=04cac3474b5d2ef6b40863e683ddb78997d739ee;hp=e160faedab8f6bdcf7046f8b14775747dadd9e6b;hpb=fd54730be51440c58f4281b3e641a22ff43e36ed;p=prosody.git

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index e160faed..638b8e13 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -39,17 +39,15 @@ module:hook("s2s-stream-features",
 			local session, features = data.session, data.features;
 			-- FIXME only advertise compression support when TLS layer has no compression enabled
 			if not session.compressed then 
-				module:log("debug", "s2s-stream-features YAY YAHOO")
 				features:add_child(compression_stream_feature);
 			end
 		end
 );
 
--- S2Sout handling aka the client perspective in the S2S connection
+-- Hook to activate compression if remote server supports it.
 module:hook_stanza(xmlns_stream, "features",
 		function (session, stanza)
 			if not session.compressed then
-				module:log("debug", "FEATURES: "..stanza:pretty_print())
 				-- does remote server support compression?
 				local comp_st = stanza:child_with_name("compression");
 				if comp_st then
@@ -137,15 +135,14 @@ local function setup_decompression(session, inflate_stream)
 		end;
 end
 
--- TODO Support compression on S2S level too.
 module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compression_protocol, 
 		function(session ,stanza)
 			session.log("debug", "Activating compression...")
 			-- create deflate and inflate streams
-			deflate_stream = get_deflate_stream(session);
+			local deflate_stream = get_deflate_stream(session);
 			if not deflate_stream then return end
 			
-			inflate_stream = get_inflate_stream(session);
+			local inflate_stream = get_inflate_stream(session);
 			if not inflate_stream then return end
 			
 			-- setup compression for session.w
@@ -161,9 +158,9 @@ module:add_handler({"s2sout_unauthed", "s2sout"}, "compressed", xmlns_compressio
 				end;
 			session:reset_stream();
 			local default_stream_attr = {xmlns = "jabber:server", ["xmlns:stream"] = "http://etherx.jabber.org/streams",
-										version = "1.0", to = session.to_host, from = session.from_host};
+										["xmlns:db"] = 'jabber:server:dialback', version = "1.0", to = session.to_host, from = session.from_host};
 			session.sends2s("<?xml version='1.0'?>");
-			session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag());			
+			session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag());
 			session.compressed = true;
 		end
 );
@@ -180,13 +177,13 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
 			-- checking if the compression method is supported
 			local method = stanza:child_with_name("method")[1];
 			if method == "zlib" then
-				session.log("info", method.." compression selected.");
+				session.log("debug", method.." compression selected.");
 				
 				-- create deflate and inflate streams
-				deflate_stream = get_deflate_stream(session);
+				local deflate_stream = get_deflate_stream(session);
 				if not deflate_stream then return end
 				
-				inflate_stream = get_inflate_stream(session);
+				local inflate_stream = get_inflate_stream(session);
 				if not inflate_stream then return end
 				
 				(session.sends2s or session.send)(st.stanza("compressed", {xmlns=xmlns_compression_protocol}));
@@ -206,7 +203,7 @@ module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress
 					end;
 				session.compressed = true;
 			else
-				session.log("info", method.." compression selected. But we don't support it.");
+				session.log("warn", method.." compression selected. But we don't support it.");
 				local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
 				(session.sends2s or session.send)(error_st);
 			end