X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_stats.cpp;h=846af57db30741b9c24ef0c1d0385f81b0d8944d;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=ccf753956f701ab5b3c50aace927299df970ef5e;hpb=ca0083cba90c8830f5018b73eb715665a8db9dd7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index ccf753956..846af57db 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -205,7 +205,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				if (i->second->use_count)
 				{
 					/* RPL_STATSCOMMANDS */
-					results.push_back(sn+" 212 "+user->nick+" "+i->second->name+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes));
+					results.push_back(sn+" 212 "+user->nick+" "+i->second->name+" "+ConvToStr(i->second->use_count));
 				}
 			}
 		break;
@@ -271,9 +271,9 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			}
 
 			FILETIME CreationTime;
-  		FILETIME ExitTime;
-  		FILETIME KernelTime;
-  		FILETIME UserTime;
+			FILETIME ExitTime;
+			FILETIME KernelTime;
+			FILETIME UserTime;
 			LARGE_INTEGER ThisSample;
 			if(GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime) &&
 				QueryPerformanceCounter(&ThisSample))
@@ -283,7 +283,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 				double n_eaten = (double)( ( (uint64_t)(KernelTime.dwHighDateTime - ServerInstance->stats->LastCPU.dwHighDateTime) << 32 ) + (uint64_t)(KernelTime.dwLowDateTime - ServerInstance->stats->LastCPU.dwLowDateTime) )/100000;
 				double n_elapsed = (double)(ThisSample.QuadPart - ServerInstance->stats->LastSampled.QuadPart) / ServerInstance->stats->QPFrequency.QuadPart;
 				double per = (n_eaten/n_elapsed);
-				
+
 				char percent[30];
 
 				snprintf(percent, 30, "%03.5f%%", per);
@@ -301,15 +301,13 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
 		case 'T':
 		{
-			char buffer[MAXBUF];
 			results.push_back(sn+" 249 "+user->nick+" :accepts "+ConvToStr(ServerInstance->stats->statsAccept)+" refused "+ConvToStr(ServerInstance->stats->statsRefused));
 			results.push_back(sn+" 249 "+user->nick+" :unknown commands "+ConvToStr(ServerInstance->stats->statsUnknown));
 			results.push_back(sn+" 249 "+user->nick+" :nick collisions "+ConvToStr(ServerInstance->stats->statsCollisions));
 			results.push_back(sn+" 249 "+user->nick+" :dns requests "+ConvToStr(ServerInstance->stats->statsDnsGood+ServerInstance->stats->statsDnsBad)+" succeeded "+ConvToStr(ServerInstance->stats->statsDnsGood)+" failed "+ConvToStr(ServerInstance->stats->statsDnsBad));
 			results.push_back(sn+" 249 "+user->nick+" :connection count "+ConvToStr(ServerInstance->stats->statsConnects));
-			snprintf(buffer,MAXBUF," 249 %s :bytes sent %5.2fK recv %5.2fK",
-				user->nick.c_str(),ServerInstance->stats->statsSent / 1024.0,ServerInstance->stats->statsRecv / 1024.0);
-			results.push_back(sn+buffer);
+			results.push_back(InspIRCd::Format("%s 249 %s :bytes sent %5.2fK recv %5.2fK", sn.c_str(), user->nick.c_str(),
+				ServerInstance->stats->statsSent / 1024.0, ServerInstance->stats->statsRecv / 1024.0));
 		}
 		break;
 
@@ -327,11 +325,8 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 		break;
 		case 'O':
 		{
-			for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++)
+			for (OperIndex::const_iterator i = ServerInstance->Config->OperTypes.begin(); i != ServerInstance->Config->OperTypes.end(); ++i)
 			{
-				// just the types, not the actual oper blocks...
-				if (i->first[0] != ' ')
-					continue;
 				OperInfo* tag = i->second;
 				tag->init();
 				std::string umodes;
@@ -345,7 +340,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 					if (mh && mh->NeedsOper() && tag->AllowedChanModes[c - 'A'])
 						cmodes.push_back(c);
 				}
-				results.push_back(sn+" 243 "+user->nick+" O "+tag->NameStr() + " " + umodes + " " + cmodes);
+				results.push_back(sn+" 243 "+user->nick+" O "+tag->name.c_str() + " " + umodes + " " + cmodes);
 			}
 		}
 		break;
@@ -382,15 +377,15 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			 * Craig suggested this, and it seemed a good idea so in it went */
 			if (stime->tm_year > 70)
 			{
-				char buffer[MAXBUF];
-				snprintf(buffer,MAXBUF," 242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",user->nick.c_str(),(stime->tm_year-70),stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-				results.push_back(sn+buffer);
+				results.push_back(InspIRCd::Format("%s 242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",
+					sn.c_str(), user->nick.c_str(), stime->tm_year - 70, stime->tm_yday, stime->tm_hour,
+					stime->tm_min, stime->tm_sec));
 			}
 			else
 			{
-				char buffer[MAXBUF];
-				snprintf(buffer,MAXBUF," 242 %s :Server up %d days, %.2d:%.2d:%.2d",user->nick.c_str(),stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-				results.push_back(sn+buffer);
+				results.push_back(InspIRCd::Format("%s 242 %s :Server up %d days, %.2d:%.2d:%.2d",
+					sn.c_str(), user->nick.c_str(), stime->tm_yday, stime->tm_hour, stime->tm_min,
+					stime->tm_sec));
 			}
 		}
 		break;