s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s...

[prosody.git] / plugins / mod_compression.lua

diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 8fdf9dcce592983219bf53fa3f7669dd0bff45ec..4b1fa79f12f24b9b1aa347912473bc190dac4149 100644 (file)
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -25,24 +25,21 @@ if not compression_level or compression_level < 1 or compression_level > 9 then
        return;
 end
 
-module:add_event_hook("stream-features",
-               function (session, features)
-                       if not session.compressed then
-                               -- FIXME only advertise compression support when TLS layer has no compression enabled
-                               features:add_child(compression_stream_feature);
-                       end
-               end
-);
+module:hook("stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       if not origin.compressed then
+               -- FIXME only advertise compression support when TLS layer has no compression enabled
+               features:add_child(compression_stream_feature);
+       end
+end);
 
-module:hook("s2s-stream-features",
-               function (data)
-                       local session, features = data.session, data.features;
-                       -- FIXME only advertise compression support when TLS layer has no compression enabled
-                       if not session.compressed then 
-                               features:add_child(compression_stream_feature);
-                       end
-               end
-);
+module:hook("s2s-stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       -- FIXME only advertise compression support when TLS layer has no compression enabled
+       if not origin.compressed then 
+               features:add_child(compression_stream_feature);
+       end
+end);
 
 -- Hook to activate compression if remote server supports it.
 module:hook_stanza(xmlns_stream, "features",
@@ -177,7 +174,7 @@ 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
                                local deflate_stream = get_deflate_stream(session);
@@ -203,7 +200,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