# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1259786131 0
# Node ID a67d06338db09933676aa5b83ca48ab9cf844bed
# Parent  90e4941ea8b69b735a1764866bb1832a964474db# Parent  23e84604fb0088b30ae0cdebdb7c2df56bde6baa
Merge with Tobias

diff -r 90e4941ea8b6 -r a67d06338db0 plugins/mod_console.lua
--- a/plugins/mod_console.lua	Wed Dec 02 20:33:09 2009 +0000
+++ b/plugins/mod_console.lua	Wed Dec 02 20:35:31 2009 +0000
@@ -478,7 +478,7 @@
 		for remotehost, session in pairs(host_session.s2sout) do
 			if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
 				count_out = count_out + 1;
-				print("    "..host.." -> "..remotehost..(session.secure and " (encrypted)" or ""));
+				print("    "..host.." -> "..remotehost..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
 				if session.sendq then
 					print("        There are "..#session.sendq.." queued outgoing stanzas for this connection");
 				end
@@ -515,7 +515,7 @@
 				-- Pft! is what I say to list comprehensions
 				or (session.hosts and #array.collect(keys(session.hosts)):filter(subhost_filter)>0)) then
 				count_in = count_in + 1;
-				print("    "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or ""));
+				print("    "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
 				if session.type == "s2sin_unauthed" then
 						print("        Connection not yet authenticated");
 				end