mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable one way stream compression on s2s links.

Browse source
This commit is contained in:
Tobias Markmann 2009-11-29 21:32:39 +01:00
parent ad07122f42
commit 8db68f1762
1 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

43
plugins/mod_compression.lua
View file

@ -11,6 +11,7 @@ local pcall = pcall;
local xmlns_compression_feature = "http://jabber.org/features/compress" local xmlns_compression_feature = "http://jabber.org/features/compress"
local xmlns_compression_protocol = "http://jabber.org/protocol/compress" local xmlns_compression_protocol = "http://jabber.org/protocol/compress"
local xmlns_stream = "http://etherx.jabber.org/streams";
local compression_stream_feature = st.stanza("compression", {xmlns=xmlns_compression_feature}):tag("method"):text("zlib"):up(); local compression_stream_feature = st.stanza("compression", {xmlns=xmlns_compression_feature}):tag("method"):text("zlib"):up();
local compression_level = module:get_option("compression_level"); local compression_level = module:get_option("compression_level");
@ -34,8 +35,39 @@ module:add_event_hook("stream-features",
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
features:add_child(compression_stream_feature);
end
);
-- S2Sout handling aka the client perspective in the S2S connection
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
-- do we support the mechanism
for a in comp_st:children() do
local algorithm = a[1]
if algorithm == "zlib" then
session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):text("zlib"))
session.log("info", "Enabled compression using zlib.")
return true;
end
end
session.log("debug", "Remote server supports no compression algorithm we support.")
end
end
end
, 250);
-- TODO Support compression on S2S level too. -- TODO Support compression on S2S level too.
module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protocol, module:add_handler({"c2s_unauthed", "c2s", "s2sin_unauthed", "s2sin"}, "compress", xmlns_compression_protocol,
function(session, stanza) function(session, stanza)
-- fail if we are already compressed -- fail if we are already compressed
if session.compressed then if session.compressed then
@ -48,14 +80,14 @@ module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protoc
local method = stanza:child_with_name("method")[1]; local method = stanza:child_with_name("method")[1];
if method == "zlib" then if method == "zlib" then
session.log("info", method.." compression selected."); session.log("info", method.." compression selected.");
session.send(st.stanza("compressed", {xmlns=xmlns_compression_protocol})); (session.sends2s or session.send)(st.stanza("compressed", {xmlns=xmlns_compression_protocol}));
session:reset_stream(); session:reset_stream();
-- create deflate and inflate streams -- create deflate and inflate streams
local status, deflate_stream = pcall(zlib.deflate, compression_level); local status, deflate_stream = pcall(zlib.deflate, compression_level);
if status == false then if status == false then
local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
session.send(error_st); (session.sends2s or session.send)(error_st);
session.log("error", "Failed to create zlib.deflate filter."); session.log("error", "Failed to create zlib.deflate filter.");
module:log("error", deflate_stream); module:log("error", deflate_stream);
return return
@ -64,7 +96,7 @@ module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protoc
local status, inflate_stream = pcall(zlib.inflate); local status, inflate_stream = pcall(zlib.inflate);
if status == false then if status == false then
local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed"); local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("setup-failed");
session.send(error_st); (session.sends2s or session.send)(error_st);
session.log("error", "Failed to create zlib.deflate filter."); session.log("error", "Failed to create zlib.deflate filter.");
module:log("error", inflate_stream); module:log("error", inflate_stream);
return return
@ -116,7 +148,8 @@ module:add_handler({"c2s_unauthed", "c2s"}, "compress", xmlns_compression_protoc
else else
session.log("info", method.." compression selected. But we don't support it."); session.log("info", method.." compression selected. But we don't support it.");
local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method"); local error_st = st.stanza("failure", {xmlns=xmlns_compression_protocol}):tag("unsupported-method");
session.send(error_st); (session.sends2s or session.send)(error_st);
end end
end end
); );