kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index f4db48538f558cb03556a09f3a7df9bb42c1f881..1af031611196dee0c78b73182539b1778d6800a6 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -188,8 +188,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);
@@ -213,13 +213,27 @@ void DoStats(char statschar, userrec* user, string_list &results)
        /* stats l (show user I/O stats) */
        if (statschar == 'l')
        {
-               results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_idle");
+               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++)
                {
                        userrec* i = *n;
                        if (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(TIME - i->age));
+                       }
+               }
+       }
+
+       /* stats L (show user I/O stats with IP addresses) */
+       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++)
+               {
+                       userrec* i = *n;
+                       if (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));
                        }
                }
        }