]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/cmd_stats.cpp
extern time_t TIME -> InspIRCd::Time()
[user/henk/code/inspircd.git] / src / cmd_stats.cpp
index 1af031611196dee0c78b73182539b1778d6800a6..b3ae20a5ef81fd0773c5825fb44bd8dd4b29a344 100644 (file)
@@ -31,7 +31,6 @@
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "commands.h"
 #include "mode.h"
 #include "xline.h"
 #include "command_parse.h"
 #include "commands/cmd_stats.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> local_users;
-
 void cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
 {
        string_list values;
-       DoStats(*parameters[0], user, values);
+       DoStats(this->ServerInstance, *parameters[0], user, values);
        for (size_t i = 0; i < values.size(); i++)
-               Write(user->fd, ":%s", values[i].c_str());
+               user->Write(":%s", values[i].c_str());
 }
 
-void DoStats(char statschar, userrec* user, string_list &results)
+void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results)
 {
-       std::string sn = Config->ServerName;
+       std::string sn = ServerInstance->Config->ServerName;
 
-       if ((*Config->OperOnlyStats) && (strchr(Config->OperOnlyStats,statschar)) && (!*user->oper))
+       if ((*ServerInstance->Config->OperOnlyStats) && (strchr(ServerInstance->Config->OperOnlyStats,statschar)) && (!*user->oper))
        {
                results.push_back(sn+std::string(" 481 ")+user->nick+" :Permission denied - STATS "+statschar+" is oper-only");
                return;
@@ -83,9 +72,9 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'i')
        {
                int idx = 0;
-               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+               for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                {
-                       results.push_back(sn+" 215 "+user->nick+" I * * * "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+Config->ServerName+" *");
+                       results.push_back(sn+" 215 "+user->nick+" I * * * "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
                        idx++;
                }
        }
@@ -93,7 +82,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'y')
        {
                int idx = 0;
-               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+               for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                {
                        results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" 120 0 "+ConvToStr(i->flood)+" "+ConvToStr(i->registration_timeout));
                        idx++;
@@ -103,9 +92,9 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'U')
        {
                char ulined[MAXBUF];
-               for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "uline"); i++)
+               for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "uline"); i++)
                {
-                       Config->ConfValue(Config->config_data, "uline","server", i, ulined, MAXBUF);
+                       ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "uline","server", i, ulined, MAXBUF);
                        results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
                }
        }
@@ -113,11 +102,11 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'P')
        {
                int idx = 0;
-               for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+               for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
                {
                        if (*i->second->oper)
                        {
-                               results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+ConvToStr(TIME - i->second->idle_lastmsg));
+                               results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg));
                                idx++;
                        }
                }
@@ -167,12 +156,13 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'z')
        {
                rusage R;
-               results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(clientlist.size())+" ("+ConvToStr(clientlist.size()*sizeof(userrec))+" bytes, "+ConvToStr(clientlist.bucket_count())+" buckets)");
-               results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(chanlist.size())+" ("+ConvToStr(chanlist.size()*sizeof(chanrec))+" bytes, "+ConvToStr(chanlist.bucket_count())+" buckets)");
+               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)");
+               results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist.size())+" ("+ConvToStr(ServerInstance->chanlist.size()*sizeof(chanrec))+" bytes, "+ConvToStr(ServerInstance->chanlist.bucket_count())+" buckets)");
                results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
-               results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(Config->RULES.size()));
-               results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(modules.size())+" ("+ConvToStr(modules.size()*sizeof(Module))+")");
-               results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(factory.size())+" ("+ConvToStr(factory.size()*sizeof(ircd_module))+")");
+               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))+")");
+               results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+")");
                if (!getrusage(RUSAGE_SELF,&R))
                {
                        results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
@@ -198,14 +188,14 @@ void DoStats(char statschar, userrec* user, string_list &results)
        /* stats o */
        if (statschar == 'o')
        {
-               for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
+               for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
                {
                        char LoginName[MAXBUF];
                        char HostName[MAXBUF];
                        char OperType[MAXBUF];
-                       Config->ConfValue(Config->config_data, "oper","name", i, LoginName, MAXBUF);
-                       Config->ConfValue(Config->config_data, "oper","host", i, HostName, MAXBUF);
-                       Config->ConfValue(Config->config_data, "oper","type", i, OperType, MAXBUF);
+                       ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","name", i, LoginName, MAXBUF);
+                       ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","host", i, HostName, 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");
                }
        }
@@ -214,12 +204,12 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == '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<userrec*>::iterator n = local_users.begin(); n != local_users.end(); n++)
+               for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
                {
                        userrec* i = *n;
-                       if (isnick(i->nick))
+                       if (ServerInstance->IsNick(i->nick))
                        {
-                               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(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));
                        }
                }
        }
@@ -228,12 +218,12 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == '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<userrec*>::iterator n = local_users.begin(); n != local_users.end(); n++)
+               for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
                {
                        userrec* i = *n;
-                       if (isnick(i->nick))
+                       if (ServerInstance->IsNick(i->nick))
                        {
-                               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(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));
                        }
                }
        }
@@ -242,7 +232,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'u')
        {
                time_t current_time = 0;
-               current_time = TIME;
+               current_time = ServerInstance->Time();
                time_t server_uptime = current_time - ServerInstance->startup_time;
                struct tm* stime;
                stime = gmtime(&server_uptime);
@@ -263,7 +253,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
        }
 
        results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-       WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
+       ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
 
        return;
 }