Merge with Tobias

Wed, 02 Dec 2009 20:35:31 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Wed, 02 Dec 2009 20:35:31 +0000
changeset 2297
a67d06338db0
parent 2294
90e4941ea8b6 (current diff)
parent 2296
23e84604fb00 (diff)
child 2299
b7d25e1ac716

Merge with Tobias

--- 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

mercurial