X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_console.lua;h=a95eb5dcb19c4e07c881723afd5715bf56839d3a;hb=3f9a02bee5e142846bf7da49dd2c6a1be72c86d5;hp=feff195e2fc5b8984009f77c8b5f6ea88351bda0;hpb=45289b6d04478cfbced664c0a4d2cf59ef12cb7b;p=prosody.git

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index feff195e..a95eb5dc 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -194,46 +194,96 @@ end
 function def_env.hosts:add(name)
 end
 
+def_env.c2s = {};
+
+local function show_c2s(callback)
+	for hostname, host in pairs(hosts) do
+		for username, user in pairs(host.sessions or {}) do
+			for resource, session in pairs(user.sessions or {}) do
+				local jid = username.."@"..hostname.."/"..resource;
+				callback(jid, session);
+			end
+		end
+	end
+end
+
+function def_env.c2s:show(match_jid)
+	local print, count = self.session.print, 0;
+	show_c2s(function (jid)
+		if (not match_jid) or jid:match(match_jid) then
+			count = count + 1;
+			print(jid);
+		end		
+	end);
+	return true, "Total: "..count.." clients";
+end
+
+function def_env.c2s:show_insecure(match_jid)
+	local print, count = self.session.print, 0;
+	show_c2s(function (jid, session)
+		if ((not match_jid) or jid:match(match_jid)) and not session.secure then
+			count = count + 1;
+			print(jid);
+		end		
+	end);
+	return true, "Total: "..count.." insecure client connections";
+end
+
+function def_env.c2s:show_secure(match_jid)
+	local print, count = self.session.print, 0;
+	show_c2s(function (jid, session)
+		if ((not match_jid) or jid:match(match_jid)) and session.secure then
+			count = count + 1;
+			print(jid);
+		end		
+	end);
+	return true, "Total: "..count.." secure client connections";
+end
+
+
 def_env.s2s = {};
-function def_env.s2s:show()
+function def_env.s2s:show(match_jid)
 	local _print = self.session.print;
 	local print = self.session.print;
 	for host, host_session in pairs(hosts) do
 		print = function (...) _print(host); _print(...); print = _print; end
 		for remotehost, session in pairs(host_session.s2sout) do
-			print("    "..host.." -> "..remotehost);
-			if session.sendq then
-				print("        There are "..#session.sendq.." queued outgoing stanzas for this connection");
-			end
-			if session.type == "s2sout_unauthed" then
-				if session.connecting then
-					print("        Connection not yet established");
-					if not session.srv_hosts then
-						if not session.conn then
-							print("        We do not yet have a DNS answer for this host's SRV records");
-						else
-							print("        This host has no SRV records, using A record instead");
+			if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
+				print("    "..host.." -> "..remotehost);
+				if session.sendq then
+					print("        There are "..#session.sendq.." queued outgoing stanzas for this connection");
+				end
+				if session.type == "s2sout_unauthed" then
+					if session.connecting then
+						print("        Connection not yet established");
+						if not session.srv_hosts then
+							if not session.conn then
+								print("        We do not yet have a DNS answer for this host's SRV records");
+							else
+								print("        This host has no SRV records, using A record instead");
+							end
+						elseif session.srv_choice then
+							print("        We are on SRV record "..session.srv_choice.." of "..#session.srv_hosts);
+							local srv_choice = session.srv_hosts[session.srv_choice];
+							print("        Using "..(srv_choice.target or ".")..":"..(srv_choice.port or 5269));
 						end
-					elseif session.srv_choice then
-						print("        We are on SRV record "..session.srv_choice.." of "..#session.srv_hosts);
-						local srv_choice = session.srv_hosts[session.srv_choice];
-						print("        Using "..(srv_choice.target or ".")..":"..(srv_choice.port or 5269));
+					elseif session.notopen then
+						print("        The <stream> has not yet been opened");
+					elseif not session.dialback_key then
+						print("        Dialback has not been initiated yet");
+					elseif session.dialback_key then
+						print("        Dialback has been requested, but no result received");
 					end
-				elseif session.notopen then
-					print("        The <stream> has not yet been opened");
-				elseif not session.dialback_key then
-					print("        Dialback has not been initiated yet");
-				elseif session.dialback_key then
-					print("        Dialback has been requested, but no result received");
 				end
 			end
-		end
+		end	
 		
 		for session in pairs(incoming_s2s) do
-			if session.to_host == host then
+			if session.to_host == host and ((not match_jid) or host:match(match_jid) 
+				or (session.from_host and session.from_host:match(match_jid))) then
 				print("    "..host.." <- "..(session.from_host or "(unknown)"));
 				if session.type == "s2sin_unauthed" then
-					print("        Connection not yet authenticated");
+						print("        Connection not yet authenticated");
 				end
 				for name in pairs(session.hosts) do
 					if name ~= session.from_host then
@@ -242,10 +292,12 @@ function def_env.s2s:show()
 				end
 			end
 		end
+		
 		print = _print;
 	end
+	
 	for session in pairs(incoming_s2s) do
-		if not session.to_host then
+		if not session.to_host and ((not match_jid) or session.from_host and session.from_host:match(match_jid)) then
 			print("Other incoming s2s connections");
 			print("    (unknown) <- "..(session.from_host or "(unknown)"));			
 		end