Same tweak, again

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

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index a23dc250e1d06b1917029295454b9f1952500d7c..1059745c69f1eb5cdd73934f9ac07845f98ef320 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -13,7 +13,9 @@
 
 #include "inspircd.h"
 #include "configreader.h"
+#ifndef WIN32
 #include <sys/resource.h>
+#endif
 #include "users.h"
 #include "modules.h"
 #include "xline.h"
@@ -21,7 +23,7 @@
 #include "commands/cmd_whowas.h"
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_stats(Instance);
 }
@@ -39,11 +41,11 @@ CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
        return CMD_SUCCESS;
 }
 
-void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results)
+DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
 
-       if ((*ServerInstance->Config->UserStats) && (!*user->oper) && (!strchr(ServerInstance->Config->UserStats,statschar)))
+       if ((*ServerInstance->Config->UserStats) && !IS_OPER(user) && !strchr(ServerInstance->Config->UserStats,statschar))
        {
                results.push_back(sn+std::string(" 481 ")+user->nick+" :Permission denied - STATS "+statschar+" is oper-only");
                return;
@@ -66,13 +68,14 @@ 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++)
                        {
-                               if (pc[ServerInstance->Config->ports[i]] >= 0)
+                               if (pc[ServerInstance->Config->ports[i]->GetPort()] >= 0)
                                {
-                                       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());
-                                       pc[ServerInstance->Config->ports[i]] = -1;
+                                       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;
                                }
                        }
                }
@@ -124,7 +127,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                        int idx = 0;
                        for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
                        {
-                               if ((*i->second->oper) && (!ServerInstance->ULine(i->second->server)))
+                               if (IS_OPER(i->second) && !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) + " secs" : "unavailable"));
@@ -170,12 +173,18 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                /* stats z (debug and memory info) */
                case 'z':
                {
+#ifndef WIN32
                        rusage R;
                        results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
                        results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes, "+ConvToStr(ServerInstance->clientlist->bucket_count())+" buckets)");
                        results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes, "+ConvToStr(ServerInstance->chanlist->bucket_count())+" buckets)");
                        results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
-
+#else
+                       results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
+                       results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes)");
+                       results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes)");
+                       results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
+#endif
                        if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
                        {
                                command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
@@ -198,6 +207,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                        results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->modules.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+" bytes)");
                        results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+" bytes)");
 
+#ifndef WIN32
                        if (!getrusage(0,&R))   /* RUSAGE_SELF */
                        {
                                results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
@@ -217,6 +227,7 @@ void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_lis
                                snprintf(percent, 30, "%03.5f%%", per);
                                results.push_back(sn+" 249 "+user->nick+" :CPU Usage: "+percent);
                        }
+#endif
                }
                break;