X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_stats.cpp;h=30f45be690184b10df520e52563a4b51d607eb1a;hb=fa923bb5549eba6807ebd1274d0b5cbfa503667a;hp=5985703ea5969038ae9b5d5b76c3a5e4351a6071;hpb=397a77259a21f730c8fe06d2df65ecf51119549c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 5985703ea..30f45be69 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -18,7 +18,7 @@
 #include "modules.h"
 #include "xline.h"
 #include "commands/cmd_stats.h"
-
+#include "commands/cmd_whowas.h"
 
 
 extern "C" command_t* init_command(InspIRCd* Instance)
@@ -60,18 +60,16 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 		case 'p':
 		{
 			std::map<int,int> pc;
-	
 			for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
 			{
 				userrec* t = (userrec*)(*i);
 				if (t->registered == REG_ALL)
 					pc[t->GetPort()]++;
 			}
-	
 			for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
 			{
 				results.push_back(sn+" 249 "+user->nick+" :p:"+ConvToStr(ServerInstance->Config->ports[i])+" (" + ConvToStr(pc[ServerInstance->Config->ports[i]])+" client" +
-						(pc[ServerInstance->Config->ports[i]] != 1 ? "s" : "") + ")");
+						(pc[ServerInstance->Config->ports[i]] != 1 ? "s" : "") + "), "+ServerInstance->Config->openSockfd[i]->GetDescription());
 			}
 		}
 		break;
@@ -124,7 +122,8 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 			{
 				if ((*i->second->oper) && (!ServerInstance->ULine(i->second->server)))
 				{
-					results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg));
+					results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+
+							(IS_LOCAL(i->second) ? ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg) : "unavailable"));
 					idx++;
 				}
 			}
@@ -167,7 +166,6 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 		/* stats z (debug and memory info) */
 		case 'z':
 		{
-
 			rusage R;
 			results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
 			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes, "+ConvToStr(ServerInstance->clientlist->bucket_count())+" buckets)");
@@ -176,24 +174,25 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 
 			if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
 			{
-				int whowas_size = 0;
-				int whowas_bytes = 0;
-				irc::whowas::whowas_users_fifo::iterator iter;
-				for (iter = ServerInstance->whowas_fifo.begin(); iter != ServerInstance->whowas_fifo.end(); iter++)
+				command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+				if (whowas_command)
 				{
-					irc::whowas::whowas_set* n = (irc::whowas::whowas_set*)ServerInstance->whowas.find(iter->second)->second;
-					if (n->size())
+					std::deque<classbase*> params;
+					Extensible whowas_stats;
+					params.push_back(&whowas_stats);
+					whowas_command->HandleInternal(WHOWAS_STATS, params);
+					if (whowas_stats.GetExt("stats"))
 					{
-						whowas_size += n->size();
-						whowas_bytes += (sizeof(irc::whowas::whowas_set) + ( sizeof(irc::whowas::WhoWasGroup) * n->size() ) );
+						char* stats;
+						whowas_stats.GetExt("stats", stats);
+						results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(stats));
 					}
 				}
-				results.push_back(sn+" 249 "+user->nick+" :Whowas(MAPSETS) "+ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)");
 			}
 
 			results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
-			results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->modules.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+") bytes");
-			results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+") bytes");
+			results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->modules.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+" bytes)");
+			results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+" bytes)");
 
 			if (!getrusage(0,&R))	/* RUSAGE_SELF */
 			{
@@ -201,7 +200,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 				results.push_back(sn+" 249 "+user->nick+" :Signals:          "+ConvToStr(R.ru_nsignals));
 				results.push_back(sn+" 249 "+user->nick+" :Page faults:      "+ConvToStr(R.ru_majflt));
 				results.push_back(sn+" 249 "+user->nick+" :Swaps:            "+ConvToStr(R.ru_nswap));
-				results.push_back(sn+" 249 "+user->nick+" :Context Switches: "+ConvToStr(R.ru_nvcsw+R.ru_nivcsw));
+				results.push_back(sn+" 249 "+user->nick+" :Context Switches: Volountary; "+ConvToStr(R.ru_nvcsw)+" Involountary; "+ConvToStr(R.ru_nivcsw));
 
 				timeval tv;
 				char percent[30];