Refactor port binding, warning not yet tested fully

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

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index f6f68677cbac8252cc11af91272829db3289f14a..7a232e0330e4496f29a206de144a18e7cef40818 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -18,7 +18,7 @@
 #include "modules.h"
 #include "xline.h"
 #include "commands/cmd_stats.h"
-
+#include "commands/cmd_whowas.h"
 
 
 extern "C" command_t* init_command(InspIRCd* Instance)
@@ -28,7 +28,7 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (pcnt < 2)
+       if (IS_LOCAL(user))
        {
                string_list values;
                DoStats(this->ServerInstance, *parameters[0], user, values);
@@ -66,10 +66,15 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                                if (t->registered == REG_ALL)
                                        pc[t->GetPort()]++;
                        }
-                       for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
+                       for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
                        {
-                               results.push_back(sn+" 249 "+user->nick+" :p:"+ConvToStr(ServerInstance->Config->ports[i])+" (" + ConvToStr(pc[ServerInstance->Config->ports[i]])+" client" +
-                                               (pc[ServerInstance->Config->ports[i]] != 1 ? "s" : "") + "), "+ServerInstance->Config->openSockfd[i]->GetDescription());
+                               if (pc[ServerInstance->Config->ports[i]->GetPort()] >= 0)
+                               {
+                                       results.push_back(sn+" 249 "+user->nick+" :p:"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (" +
+                                                       ConvToStr(pc[ServerInstance->Config->ports[i]->GetPort()])+" client" + (pc[ServerInstance->Config->ports[i]->GetPort()] != 1 ? "s" : "") + "), "+
+                                                       ServerInstance->Config->ports[i]->GetDescription());
+                                       pc[ServerInstance->Config->ports[i]->GetPort()] = -1;
+                               }
                        }
                }
                break;
@@ -123,7 +128,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                                if ((*i->second->oper) && (!ServerInstance->ULine(i->second->server)))
                                {
                                        results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+
-                                                       (IS_LOCAL(i->second) ? ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg) : "unavailable"));
+                                                       (IS_LOCAL(i->second) ? ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg) + " secs" : "unavailable"));
                                        idx++;
                                }
                        }
@@ -153,7 +158,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 
                /* stats m (list number of times each command has been used, plus bytecount) */
                case 'm':
-                       for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+                       for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
                        {
                                if (i->second->use_count)
                                {
@@ -174,19 +179,20 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
 
                        if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
                        {
-                               int whowas_size = 0;
-                               int whowas_bytes = 0;
-                               irc::whowas::whowas_users_fifo::iterator iter;
-                               for (iter = ServerInstance->whowas_fifo.begin(); iter != ServerInstance->whowas_fifo.end(); iter++)
+                               command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+                               if (whowas_command)
                                {
-                                       irc::whowas::whowas_set* n = (irc::whowas::whowas_set*)ServerInstance->whowas.find(iter->second)->second;
-                                       if (n->size())
+                                       std::deque<classbase*> params;
+                                       Extensible whowas_stats;
+                                       params.push_back(&whowas_stats);
+                                       whowas_command->HandleInternal(WHOWAS_STATS, params);
+                                       if (whowas_stats.GetExt("stats"))
                                        {
-                                               whowas_size += n->size();
-                                               whowas_bytes += (sizeof(irc::whowas::whowas_set) + ( sizeof(irc::whowas::WhoWasGroup) * n->size() ) );
+                                               char* stats;
+                                               whowas_stats.GetExt("stats", stats);
+                                               results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(stats));
                                        }
                                }
-                               results.push_back(sn+" 249 "+user->nick+" :Whowas(MAPSETS) "+ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)");
                        }
 
                        results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
@@ -199,7 +205,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                                results.push_back(sn+" 249 "+user->nick+" :Signals:          "+ConvToStr(R.ru_nsignals));
                                results.push_back(sn+" 249 "+user->nick+" :Page faults:      "+ConvToStr(R.ru_majflt));
                                results.push_back(sn+" 249 "+user->nick+" :Swaps:            "+ConvToStr(R.ru_nswap));
-                               results.push_back(sn+" 249 "+user->nick+" :Context Switches: "+ConvToStr(R.ru_nvcsw+R.ru_nivcsw));
+                               results.push_back(sn+" 249 "+user->nick+" :Context Switches: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw));
 
                                timeval tv;
                                char percent[30];