Patch to not increment nickchange counter for nick changes that would be blocked...

[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 6c98e7b72d63a29c09aa25799a65ad035b63b032..f09fcf84fefba52d1e3b4e3b894ecbe9ff598ace 100644 (file)
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -39,7 +39,13 @@ CmdResult CommandStats::Handle (const std::vector<std::string>& parameters, User
        if (IS_LOCAL(user))
        {
                string_list values;
-               DoStats(this->ServerInstance, parameters[0][0], user, values);
+               if (parameters[0].empty())
+               {
+                       user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s STATS :Not enough parameters.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+               char search = parameters[0][0];
+               DoStats(this->ServerInstance, search, user, values);
                for (size_t i = 0; i < values.size(); i++)
                        user->Write(":%s", values[i].c_str());
        }
@@ -51,16 +57,16 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 {
        std::string sn(ServerInstance->Config->ServerName);
 
-       if (!user->HasPrivPermission("servers/auspex") && !strchr(ServerInstance->Config->UserStats, statschar)))
+       if (!user->HasPrivPermission("servers/auspex") && !strchr(ServerInstance->Config->UserStats, statschar))
        {
                ServerInstance->SNO->WriteToSnoMask('t',
                                "%s '%c' denied for %s (%s@%s)",
                                (IS_LOCAL(user) ? "Stats" : "Remote stats"),
                                statschar, user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-               results.push_back(sn + " 481 " + user->nick + " :Permission denied - STATS " + statschar + " is oper-only");
+               results.push_back(sn + " 481 " + user->nick + " :Permission denied - STATS " + statschar + " requires the servers/auspex priv.");
                return;
        }
-       
+
        int MOD_RESULT = 0;
        FOREACH_RESULT(I_OnStats,OnStats(statschar, user, results));
        if (MOD_RESULT)
@@ -76,14 +82,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                /* stats p (show listening ports and registered clients on each) */
                case 'p':
                {
-                       for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
+                       for (size_t i = 0; i < ServerInstance->ports.size(); i++)
                        {
-                               std::string ip = ServerInstance->Config->ports[i]->GetIP();
+                               std::string ip = ServerInstance->ports[i]->GetIP();
                                if (ip.empty())
                                        ip.assign("*");
 
-                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (client, " +
-                                               ServerInstance->Config->ports[i]->GetDescription() + ")");
+                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->ports[i]->GetPort())+" (client, " +
+                                               ServerInstance->ports[i]->GetDescription() + ")");
                        }
                }
                break;
@@ -92,19 +98,19 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'n':
                case 'c':
                break;
-       
+
                case 'i':
                {
                        int idx = 0;
                        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(c->limit ? c->limit : ServerInstance->SE->GetMaxFds())+" "+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++;
                        }
                }
                break;
-       
+
                case 'Y':
                {
                        int idx = 0;
@@ -112,7 +118,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        {
                                ConnectClass* c = *i;
                                results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(c->GetPingTime())+" 0 "+ConvToStr(c->GetSendqMax())+" :"+
-                                               ConvToStr(c->GetFlood())+" "+ConvToStr(c->GetRegTimeout()));
+                                               ConvToStr(c->GetRecvqMax())+" "+ConvToStr(c->GetRegTimeout()));
                                idx++;
                        }
                }
@@ -121,14 +127,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'U':
                {
                        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("uline"); i++)
                        {
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "uline","server", i, ulined, MAXBUF);
+                               ServerInstance->Config->ConfValue("uline","server", i, ulined, MAXBUF);
                                        results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
                        }
                }
                break;
-       
+
                case 'P':
                {
                        int idx = 0;
@@ -144,7 +150,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(idx)+" OPER(s)");
                }
                break;
- 
+
                case 'k':
                        ServerInstance->XLines->InvokeStats("K",216,user,results);
                break;
@@ -238,7 +244,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                                timeval tv;
                                char percent[30];
                                gettimeofday(&tv, NULL);
-                       
+
                                float n_elapsed = ((tv.tv_sec - ServerInstance->stats->LastSampled.tv_sec) * 1000000 + tv.tv_usec - ServerInstance->stats->LastSampled.tv_usec);
                                float n_eaten = ((R.ru_utime.tv_sec - ServerInstance->stats->LastCPU.tv_sec) * 1000000 + R.ru_utime.tv_usec - ServerInstance->stats->LastCPU.tv_usec);
                                float per = (n_eaten / n_elapsed) * 100;
@@ -258,7 +264,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 #endif
                }
                break;
-       
+
                case 'T':
                {
                        char buffer[MAXBUF];
@@ -274,14 +280,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 
                /* stats 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("oper"); i++)
                        {
                                char LoginName[MAXBUF];
                                char HostName[MAXBUF];
                                char 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);
+                               ServerInstance->Config->ConfValue("oper","name", i, LoginName, MAXBUF);
+                               ServerInstance->Config->ConfValue("oper","host", i, HostName, MAXBUF);
+                               ServerInstance->Config->ConfValue("oper","type", i, OperType, MAXBUF);
                                results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0");
                        }
                break;