X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_stats.cpp;h=906ad901f2201fb0b49329dc61cc6b4cba53bd0e;hb=1200d6285b1d64699c6fa2c8241e2ee40f52d2a3;hp=f9bb0d634fe34553954b9c633706ede17157d092;hpb=b2723d2577b124d5a3ed188b01136a3eae9e9343;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index f9bb0d634..906ad901f 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -20,6 +20,7 @@
 	#endif
 #else
 	#include <psapi.h>
+	#include "inspircd_win32wrapper.h"
 	#pragma comment(lib, "psapi.lib")
 #endif
 
@@ -50,7 +51,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 {
 	std::string sn(ServerInstance->Config->ServerName);
 
-	if ((!*ServerInstance->Config->UserStats && !IS_OPER(user)) || (!IS_OPER(user) && !ServerInstance->ULine(user->server) && !strchr(ServerInstance->Config->UserStats,statschar)))
+	if (!user->HasPrivPermission("servers/auspex") && !strchr(ServerInstance->Config->UserStats, statschar))
 	{
 		ServerInstance->SNO->WriteToSnoMask('t',
 				"%s '%c' denied for %s (%s@%s)",
@@ -61,9 +62,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 	}
 	
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnStats,OnStats(statschar,user,results));
+	FOREACH_RESULT(I_OnStats,OnStats(statschar, user, results));
 	if (MOD_RESULT)
+	{
+		results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
+		ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",
+			(IS_LOCAL(user) ? "Stats" : "Remote stats"), statschar, user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 		return;
+	}
 
 	switch (statschar)
 	{
@@ -82,11 +88,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		}
 		break;
 
+		/* These stats symbols must be handled by a linking module */
 		case 'n':
 		case 'c':
-		{
-			/* This stats symbol must be handled by a linking module */
-		}
 		break;
 	
 		case 'i':
@@ -208,9 +212,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 
 			ServerInstance->SE->GetStats(kbitpersec_in, kbitpersec_out, kbitpersec_total);
 
-			snprintf(kbitpersec_total_s, 30, "%03.5f%%", kbitpersec_total);
-			snprintf(kbitpersec_out_s, 30, "%03.5f%%", kbitpersec_out);
-			snprintf(kbitpersec_in_s, 30, "%03.5f%%", kbitpersec_in);
+			snprintf(kbitpersec_total_s, 30, "%03.5f", kbitpersec_total);
+			snprintf(kbitpersec_out_s, 30, "%03.5f", kbitpersec_out);
+			snprintf(kbitpersec_in_s, 30, "%03.5f", kbitpersec_in);
 
 			results.push_back(sn+" 249 "+user->nick+" :Bandwidth total:  "+ConvToStr(kbitpersec_total_s)+" kilobits/sec");
 			results.push_back(sn+" 249 "+user->nick+" :Bandwidth out:    "+ConvToStr(kbitpersec_out_s)+" kilobits/sec");
@@ -249,6 +253,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 				results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr((MemCounters.WorkingSetSize + MemCounters.PagefileUsage) / 1024)+"K");
 				results.push_back(sn+" 249 "+user->nick+" :Pagefile usage:   "+ConvToStr(MemCounters.PagefileUsage / 1024)+"K");
 				results.push_back(sn+" 249 "+user->nick+" :Page faults:      "+ConvToStr(MemCounters.PageFaultCount));
+				results.push_back(sn+" 249 "+user->nick+" :CPU Usage: " + ConvToStr(getcpu()) + "%");
 			}
 #endif
 		}