From a81cb9c790823c75a8c931dfd572cd21df81a57a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Apr 2014 23:33:38 +0200
Subject: mod_compression: Remove checks for impossible conditions
---
plugins/mod_compression.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 9da5254e..3b000303 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -26,7 +26,7 @@ end
module:hook("stream-features", function(event)
local origin, features = event.origin, event.features;
- if not origin.compressed and (origin.type == "c2s" or origin.type == "s2sin" or origin.type == "s2sout") then
+ if not origin.compressed and origin.type == "c2s" then
-- FIXME only advertise compression support when TLS layer has no compression enabled
features:add_child(compression_stream_feature);
end
@@ -35,7 +35,7 @@ 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 and (origin.type == "c2s" or origin.type == "s2sin" or origin.type == "s2sout") then
+ if not origin.compressed and origin.type == "s2sin" then
features:add_child(compression_stream_feature);
end
end);
@@ -43,7 +43,7 @@ end);
-- Hook to activate compression if remote server supports it.
module:hook_stanza(xmlns_stream, "features",
function (session, stanza)
- if not session.compressed and (session.type == "c2s" or session.type == "s2sin" or session.type == "s2sout") then
+ if not session.compressed and session.type == "s2sout" then
-- does remote server support compression?
local comp_st = stanza:child_with_name("compression");
if comp_st then
--
cgit v1.2.3
From d63fe29bc27fb1460f4ee457d3b98640155d61b8 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Apr 2014 23:40:20 +0200
Subject: mod_compression: Use get_child() and get_child_text()
---
plugins/mod_compression.lua | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 3b000303..e4e521b7 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -45,7 +45,7 @@ module:hook_stanza(xmlns_stream, "features",
function (session, stanza)
if not session.compressed and session.type == "s2sout" then
-- does remote server support compression?
- local comp_st = stanza:child_with_name("compression");
+ local comp_st = stanza:get_child("compression", xmlns_compression_feature);
if comp_st then
-- do we support the mechanism
for a in comp_st:children() do
@@ -160,8 +160,7 @@ module:hook("stanza/http://jabber.org/protocol/compress:compress", function(even
end
-- checking if the compression method is supported
- local method = stanza:child_with_name("method");
- method = method and (method[1] or "");
+ local method = stanza:get_child_text("method");
if method == "zlib" then
session.log("debug", "zlib compression enabled.");
--
cgit v1.2.3
From 548ee2aa2b7df77d898c0058d0afa4e3fda6d5fb Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Apr 2014 23:48:12 +0200
Subject: mod_compression: Only iterate over correctly named and namespaced
child tags of compression feature
---
plugins/mod_compression.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index e4e521b7..969172fd 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -48,8 +48,8 @@ module:hook_stanza(xmlns_stream, "features",
local comp_st = stanza:get_child("compression", xmlns_compression_feature);
if comp_st then
-- do we support the mechanism
- for a in comp_st:children() do
- local algorithm = a[1]
+ for a in comp_st:childtags("method") do
+ local algorithm = a:get_text();
if algorithm == "zlib" then
session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib"))
session.log("debug", "Enabled compression using zlib.")
--
cgit v1.2.3