Merge pull request #1041 from SaberUK/master+ipv6-nameserver

[user/henk/code/inspircd.git] / src / coremods / core_stats.cpp

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index b8ea21731a85d3149e49ba4a3f844cc479e2c23e..180ece9b3b1f56ee883bc19aa42d35792524f85d 100644 (file)
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -50,6 +50,18 @@ class CommandStats : public Command
        }
 };
 
+static void GenerateStatsLl(User* user, string_list& results, char c)
+{
+       results.push_back(InspIRCd::Format("211 %s nick[ident@%s] sendq cmds_out bytes_out cmds_in bytes_in time_open", user->nick.c_str(), (c == 'l' ? "host" : "ip")));
+
+       const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+       for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
+       {
+               LocalUser* u = *i;
+               results.push_back("211 "+user->nick+" "+u->nick+"["+u->ident+"@"+(c == 'l' ? u->dhost : u->GetIPString())+"] "+ConvToStr(u->eh.getSendQSize())+" "+ConvToStr(u->cmds_out)+" "+ConvToStr(u->bytes_out)+" "+ConvToStr(u->cmds_in)+" "+ConvToStr(u->bytes_in)+" "+ConvToStr(ServerInstance->Time() - u->signon));
+       }
+}
+
 void CommandStats::DoStats(char statschar, User* user, string_list &results)
 {
        bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos;
@@ -103,7 +115,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
                case 'i':
                {
-                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
                        {
                                ConnectClass* c = *i;
                                std::stringstream res;
@@ -132,7 +144,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                case 'Y':
                {
                        int idx = 0;
-                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                                ConnectClass* c = *i;
                                results.push_back("215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : SocketEngine::GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
@@ -189,7 +201,9 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
                /* stats m (list number of times each command has been used, plus bytecount) */
                case 'm':
-                       for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+               {
+                       const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
+                       for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i)
                        {
                                if (i->second->use_count)
                                {
@@ -197,6 +211,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                                        results.push_back("212 "+user->nick+" "+i->second->name+" "+ConvToStr(i->second->use_count));
                                }
                        }
+               }
                break;
 
                /* stats z (debug and memory info) */
@@ -204,7 +219,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                {
                        results.push_back("249 "+user->nick+" :Users: "+ConvToStr(ServerInstance->Users->GetUsers().size()));
                        results.push_back("249 "+user->nick+" :Channels: "+ConvToStr(ServerInstance->GetChans().size()));
-                       results.push_back("249 "+user->nick+" :Commands: "+ConvToStr(ServerInstance->Parser->cmdlist.size()));
+                       results.push_back("249 "+user->nick+" :Commands: "+ConvToStr(ServerInstance->Parser.GetCommands().size()));
 
                        float kbitpersec_in, kbitpersec_out, kbitpersec_total;
                        char kbitpersec_in_s[30], kbitpersec_out_s[30], kbitpersec_total_s[30];
@@ -314,13 +329,13 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                break;
                case 'O':
                {
-                       for (OperIndex::const_iterator i = ServerInstance->Config->OperTypes.begin(); i != ServerInstance->Config->OperTypes.end(); ++i)
+                       for (ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->OperTypes.begin(); i != ServerInstance->Config->OperTypes.end(); ++i)
                        {
                                OperInfo* tag = i->second;
                                tag->init();
                                std::string umodes;
                                std::string cmodes;
-                               for(char c='A'; c < 'z'; c++)
+                               for(char c='A'; c <= 'z'; c++)
                                {
                                        ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER);
                                        if (mh && mh->NeedsOper() && tag->AllowedUserModes[c - 'A'])
@@ -336,46 +351,17 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
                /* stats l (show user I/O stats) */
                case 'l':
-                       results.push_back("211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (LocalUserList::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
-                       {
-                               LocalUser* i = *n;
-                               results.push_back("211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->eh.getSendQSize())+" "+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) */
                case 'L':
-                       results.push_back("211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-                       for (LocalUserList::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
-                       {
-                               LocalUser* i = *n;
-                               results.push_back("211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->eh.getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
-                       }
+                       GenerateStatsLl(user, results, statschar);
                break;
 
                /* stats u (show server uptime) */
                case 'u':
                {
-                       time_t current_time = 0;
-                       current_time = ServerInstance->Time();
-                       time_t server_uptime = current_time - ServerInstance->startup_time;
-                       struct tm* stime;
-                       stime = gmtime(&server_uptime);
-                       /* i dont know who the hell would have an ircd running for over a year nonstop, but
-                        * Craig suggested this, and it seemed a good idea so in it went */
-                       if (stime->tm_year > 70)
-                       {
-                               results.push_back(InspIRCd::Format("242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",
-                                       user->nick.c_str(), stime->tm_year - 70, stime->tm_yday, stime->tm_hour,
-                                       stime->tm_min, stime->tm_sec));
-                       }
-                       else
-                       {
-                               results.push_back(InspIRCd::Format("242 %s :Server up %d days, %.2d:%.2d:%.2d",
-                                       user->nick.c_str(), stime->tm_yday, stime->tm_hour, stime->tm_min,
-                                       stime->tm_sec));
-                       }
+                       unsigned int up = static_cast<unsigned int>(ServerInstance->Time() - ServerInstance->startup_time);
+                       results.push_back(InspIRCd::Format("242 %s :Server up %u days, %.2u:%.2u:%.2u", user->nick.c_str(),
+                               up / 86400, (up / 3600) % 24, (up / 60) % 60, up % 60));
                }
                break;
 
@@ -392,7 +378,13 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 CmdResult CommandStats::Handle (const std::vector<std::string>& parameters, User *user)
 {
        if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
+       {
+               // Give extra penalty if a non-oper does /STATS <remoteserver>
+               LocalUser* localuser = IS_LOCAL(user);
+               if ((localuser) && (!user->IsOper()))
+                       localuser->CommandFloodPenalty += 2000;
                return CMD_SUCCESS;
+       }
        string_list values;
        char search = parameters[0][0];
        DoStats(search, user, values);