Passing invalid instance to dns isnt a good idea

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

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index f732cd7afd634dc62bc84b4e507abfe053334d87..6f124d6eb0f7ed1918a4007b03633d2b90678b1f 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -42,29 +42,26 @@
 #include "command_parse.h"
 #include "commands/cmd_stats.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 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);
        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)
 {
-       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 +80,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 +90,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 +100,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,7 +110,7 @@ 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)
                        {
@@ -167,10 +164,10 @@ 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+" 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+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->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))+")");
                if (!getrusage(RUSAGE_SELF,&R))
@@ -188,8 +185,8 @@ void DoStats(char statschar, userrec* user, string_list &results)
                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->statsDns)+" succeeded "+ConvToStr(ServerInstance->stats->statsDnsGood)+" failed "+ConvToStr(ServerInstance->stats->statsDnsBad));
-               results.push_back(sn+" 249 "+user->nick+" :connections "+ConvToStr(ServerInstance->stats->statsConnects));
+               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));
                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);
                results.push_back(sn+buffer);
@@ -198,14 +195,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,7 +211,7 @@ 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))
@@ -228,7 +225,7 @@ 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))
@@ -263,7 +260,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);
+       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;
 }