ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-21 00:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate stats p patch by peaveydk (shows port numbers and number of clients on each port)

Browse Source 
Tidy up cmd_stats.cpp in general, turn it into a large case statement


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5599 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-10-31 17:06:32 +00:00
parent e81b8faed7
commit be77f42a97
1 changed files with 184 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/cmd_stats.cpp
View File

@ -57,12 +57,35 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
if (MOD_RESULT) if (MOD_RESULT)
return; return;
if (statschar == 'c') switch (statschar)
{
/* stats p (show listening ports and registered clients on each) */
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" : "") + ")");
}
}
break;
case 'c':
{ {
/* This stats symbol must be handled by a linking module */ /* This stats symbol must be handled by a linking module */
} }
break;
if (statschar == 'i') case 'i':
{ {
int idx = 0; int idx = 0;
for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
@ -71,8 +94,9 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
idx++; idx++;
} }
} }
break;
if (statschar == 'y') case 'Y':
{ {
int idx = 0; int idx = 0;
for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
@ -81,8 +105,9 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
idx++; idx++;
} }
} }
break;
if (statschar == 'U') case 'U':
{ {
char ulined[MAXBUF]; char ulined[MAXBUF];
for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "uline"); i++) for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "uline"); i++)
@ -91,8 +116,9 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined)); results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
} }
} }
break;
if (statschar == 'P') case 'P':
{ {
int idx = 0; int idx = 0;
for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++) for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
@ -105,35 +131,30 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
} }
results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(idx)+" OPER(s)"); results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(idx)+" OPER(s)");
} }
break;
if (statschar == 'k') case 'k':
{
ServerInstance->XLines->stats_k(user,results); ServerInstance->XLines->stats_k(user,results);
} break;
if (statschar == 'g') case 'g':
{
ServerInstance->XLines->stats_g(user,results); ServerInstance->XLines->stats_g(user,results);
} break;
if (statschar == 'q') case 'q':
{
ServerInstance->XLines->stats_q(user,results); ServerInstance->XLines->stats_q(user,results);
} break;
if (statschar == 'Z') case 'Z':
{
ServerInstance->XLines->stats_z(user,results); ServerInstance->XLines->stats_z(user,results);
} break;
if (statschar == 'e') case 'e':
{
ServerInstance->XLines->stats_e(user,results); ServerInstance->XLines->stats_e(user,results);
} break;
/* stats m (list number of times each command has been used, plus bytecount) */ /* stats m (list number of times each command has been used, plus bytecount) */
if (statschar == 'm') case 'm':
{
for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
{ {
if (i->second->use_count) if (i->second->use_count)
@ -142,11 +163,10 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
results.push_back(sn+" 212 "+user->nick+" "+i->second->command+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes)); results.push_back(sn+" 212 "+user->nick+" "+i->second->command+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes));
} }
} }
break;
}
/* stats z (debug and memory info) */ /* stats z (debug and memory info) */
if (statschar == 'z') case 'z':
{ {
rusage R; rusage R;
results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes"); results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
@ -165,22 +185,23 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
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: "+ConvToStr(R.ru_nvcsw+R.ru_nivcsw));
} }
} }
break;
if (statschar == 'T') 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+" :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+" :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+" :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+" :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)); results.push_back(sn+" 249 "+user->nick+" :connection count "+ConvToStr(ServerInstance->stats->statsConnects));
char buffer[MAXBUF];
snprintf(buffer,MAXBUF," 249 %s :bytes sent %5.2fK recv %5.2fK",user->nick,ServerInstance->stats->statsSent / 1024,ServerInstance->stats->statsRecv / 1024); snprintf(buffer,MAXBUF," 249 %s :bytes sent %5.2fK recv %5.2fK",user->nick,ServerInstance->stats->statsSent / 1024,ServerInstance->stats->statsRecv / 1024);
results.push_back(sn+buffer); results.push_back(sn+buffer);
} }
break;
/* stats o */ /* stats o */
if (statschar == 'o') case 'o':
{
for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++) for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
{ {
char LoginName[MAXBUF]; char LoginName[MAXBUF];
@ -191,11 +212,10 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","type", i, OperType, MAXBUF); ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","type", i, OperType, MAXBUF);
results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0"); results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0");
} }
} break;
/* stats l (show user I/O stats) */ /* stats l (show user I/O stats) */
if (statschar == 'l') case 'l':
{
results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open"); results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
{ {
@ -205,11 +225,10 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age)); results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
} }
} }
} break;
/* stats L (show user I/O stats with IP addresses) */ /* stats L (show user I/O stats with IP addresses) */
if (statschar == 'L') case 'L':
{
results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open"); results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
{ {
@ -219,10 +238,10 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age)); results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
} }
} }
} break;
/* stats u (show server uptime) */ /* stats u (show server uptime) */
if (statschar == 'u') case 'u':
{ {
time_t current_time = 0; time_t current_time = 0;
current_time = ServerInstance->Time(); current_time = ServerInstance->Time();
@ -244,6 +263,11 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
results.push_back(sn+buffer); results.push_back(sn+buffer);
} }
} }
break;
default:
break;
}
results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report"); results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host); ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);