Remove use of SendSNONotice to send to remote servers, this is done automagically now

[user/henk/code/inspircd.git] / src / commands / cmd_stats.cpp

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 3d81dd84f1715325db9aae75f864658f225f11da..fb1aaf20bc0554308dc9cbe8c3e57c30f29fa3cc 100644 (file)
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -31,7 +31,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandStats(Instance);
 }
 
-CmdResult CommandStats::Handle (const char** parameters, int /* pcnt */, User *user)
+CmdResult CommandStats::Handle (const char* const* parameters, int /* pcnt */, User *user)
 {
        if (IS_LOCAL(user))
        {
@@ -93,7 +93,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                                ConnectClass* c = *i;
-                               results.push_back(sn+" 215 "+user->nick+" I NOMATCH * "+c->GetHost()+" "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
+                               results.push_back(sn+" 215 "+user->nick+" I NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : ServerInstance->SE->GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
                                idx++;
                        }
                }
@@ -126,7 +126,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'P':
                {
                        int idx = 0;
-                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+                       for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
                        {
                                if (IS_OPER(i->second) && !ServerInstance->ULine(i->second->server))
                                {
@@ -154,6 +154,12 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'e':
                        ServerInstance->XLines->InvokeStats("E",223,user,results);
                break;
+               case 'E':
+                       results.push_back(sn+" 249 "+user->nick+" :Total events: "+ConvToStr(ServerInstance->SE->TotalEvents));
+                       results.push_back(sn+" 249 "+user->nick+" :Read events:  "+ConvToStr(ServerInstance->SE->ReadEvents));
+                       results.push_back(sn+" 249 "+user->nick+" :Write events: "+ConvToStr(ServerInstance->SE->WriteEvents));
+                       results.push_back(sn+" 249 "+user->nick+" :Error events: "+ConvToStr(ServerInstance->SE->ErrorEvents));
+               break;
 
                /* stats m (list number of times each command has been used, plus bytecount) */
                case 'm':
@@ -171,7 +177,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'z':
                {
                        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(User))+" bytes)");
+                       results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->Users->clientlist->size())+" ("+ConvToStr(ServerInstance->Users->clientlist->size()*sizeof(User))+" bytes)");
                        results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(Channel))+" bytes)");
                        results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(Command))+" bytes)");
 
@@ -255,7 +261,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                /* stats l (show user I/O stats) */
                case 'l':
                        results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+                       for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
                        {
                                User* i = *n;
                                if (ServerInstance->IsNick(i->nick))
@@ -268,7 +274,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
        /* stats L (show user I/O stats with IP addresses) */
                case 'L':
                        results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+                       for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
                        {
                                User* i = *n;
                                if (ServerInstance->IsNick(i->nick))