Merge pull request #1139 from johanna-a/master

[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 a6df511d9641a18389ffec3f47a018ce196ab1b3..9fb232bc0192bb7a2e1d0210f1e580a09042df3d 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;
@@ -87,6 +99,11 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                                std::string ip = ls->bind_addr;
                                if (ip.empty())
                                        ip.assign("*");
+                               else if (ip.find_first_of(':') != std::string::npos)
+                               {
+                                       ip.insert(ip.begin(), '[');
+                                       ip.insert(ip.end(),  ']');
+                               }
                                std::string type = ls->bind_tag->getString("type", "clients");
                                std::string hook = ls->bind_tag->getString("ssl", "plaintext");
 
@@ -323,7 +340,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                                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'])
@@ -339,22 +356,9 @@ 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) */
@@ -379,7 +383,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);