]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/cmd_stats.cpp
Gorgonzola!
[user/henk/code/inspircd.git] / src / cmd_stats.cpp
index d784b02f6a085c0b67fc6783badb5635e74ec542..7197b15df7cf2a021bfa44ea79963c380033ff8b 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <sys/types.h>
-#include <sys/time.h>
+#include "configreader.h"
 #include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-#ifndef RUSAGE_SELF
-#define   RUSAGE_SELF     0
-#define   RUSAGE_CHILDREN     -1
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_stats.h"
+#include "commands/cmd_stats.h"
+#include "commands/cmd_whowas.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-void cmd_stats::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-       if (pcnt != 1)
-       {
-               return;
-       }
-       if (strlen(parameters[0])>1)
+       return new cmd_stats(Instance);
+}
+
+CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       if (IS_LOCAL(user))
        {
-               /* make the stats query 1 character long */
-               parameters[0][1] = '\0';
+               string_list values;
+               DoStats(this->ServerInstance, *parameters[0], user, values);
+               for (size_t i = 0; i < values.size(); i++)
+                       user->Write(":%s", values[i].c_str());
        }
 
-       if ((*Config->OperOnlyStats) && (strchr(Config->OperOnlyStats,*parameters[0])) && (!*user->oper))
+       return CMD_SUCCESS;
+}
+
+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)))
        {
-               WriteServ(user->fd,"481 %s :Permission denied - STATS %c is oper-only",user->nick,*parameters[0]);
+               results.push_back(sn+std::string(" 481 ")+user->nick+" :Permission denied - STATS "+statschar+" is oper-only");
                return;
        }
-
-
+       
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnStats,OnStats(*parameters[0],user));
+       FOREACH_RESULT(I_OnStats,OnStats(statschar,user,results));
        if (MOD_RESULT)
                return;
 
-       if (*parameters[0] == 'c')
+       switch (statschar)
        {
-               /* This stats symbol must be handled by a linking module */
-       }
+               /* stats p (show listening ports and registered clients on each) */
+               case 'p':
+               {
+                       std::map<int,int> pc;
+                       for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+                       {
+                               userrec* t = (userrec*)(*i);
+                               if (t->registered == REG_ALL)
+                                       pc[t->GetPort()]++;
+                       }
+                       for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; 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());
+                       }
+               }
+               break;
+
+               case 'n':
+               case 'c':
+               {
+                       /* This stats symbol must be handled by a linking module */
+               }
+               break;
        
-       if (*parameters[0] == 'i')
-       {
-               int idx = 0;
-               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+               case 'i':
                {
-                       WriteServ(user->fd,"215 %s I * * * %d %d %s *",user->nick,MAXCLIENTS,idx,Config->ServerName);
-                       idx++;
+                       int idx = 0;
+                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       {
+                               results.push_back(sn+" 215 "+user->nick+" I NOMATCH * "+i->GetHost()+" "+ConvToStr(MAXCLIENTS)+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
+                               idx++;
+                       }
                }
-       }
+               break;
        
-       if (*parameters[0] == 'y')
-       {
-               int idx = 0;
-               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+               case 'Y':
                {
-                       WriteServ(user->fd,"218 %s Y %d %d 0 %d %d",user->nick,idx,120,i->flood,i->registration_timeout);
-                       idx++;
+                       int idx = 0;
+                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       {
+                               results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(i->GetPingTime())+" 0 "+ConvToStr(i->GetSendqMax())+" :"+
+                                               ConvToStr(i->GetFlood())+" "+ConvToStr(i->GetRegTimeout()));
+                               idx++;
+                       }
                }
-       }
+               break;
 
-       if (*parameters[0] == 'U')
-       {
-               char ulined[MAXBUF];
-               for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++)
+               case 'U':
                {
-                       Config->ConfValue("uline","server",i,ulined,&Config->config_f);
-                       WriteServ(user->fd,"248 %s U %s",user->nick,ulined);
+                       char ulined[MAXBUF];
+                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "uline"); i++)
+                       {
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "uline","server", i, ulined, MAXBUF);
+                                       results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
+                       }
                }
-       }
+               break;
        
-       if (*parameters[0] == 'P')
-       {
-               int idx = 0;
-               for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+               case 'P':
                {
-                       if (*i->second->oper)
+                       int idx = 0;
+                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
                        {
-                               WriteServ(user->fd,"249 %s :%s (%s@%s) Idle: %d",user->nick,i->second->nick,i->second->ident,i->second->dhost,(TIME - i->second->idle_lastmsg));
-                               idx++;
+                               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) + " secs" : "unavailable"));
+                                       idx++;
+                               }
                        }
+                       results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(idx)+" OPER(s)");
                }
-               WriteServ(user->fd,"249 %s :%d OPER(s)",user->nick,idx);
-       }
-       
-       if (*parameters[0] == 'k')
-       {
-               stats_k(user);
-       }
+               break;
+               case 'k':
+                       ServerInstance->XLines->stats_k(user,results);
+               break;
 
-       if (*parameters[0] == 'g')
-       {
-               stats_g(user);
-       }
+               case 'g':
+                       ServerInstance->XLines->stats_g(user,results);
+               break;
 
-       if (*parameters[0] == 'q')
-       {
-               stats_q(user);
-       }
+               case 'q':
+                       ServerInstance->XLines->stats_q(user,results);
+               break;
 
-       if (*parameters[0] == 'Z')
-       {
-               stats_z(user);
-       }
+               case 'Z':
+                       ServerInstance->XLines->stats_z(user,results);
+               break;
 
-       if (*parameters[0] == 'e')
-       {
-               stats_e(user);
-       }
+               case 'e':
+                       ServerInstance->XLines->stats_e(user,results);
+               break;
 
-       /* stats m (list number of times each command has been used, plus bytecount) */
-       if (*parameters[0] == 'm')
-       {
-               for (nspace::hash_map<std::string,command_t*>::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+               /* 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++)
+                       {
+                               if (i->second->use_count)
+                               {
+                                       /* RPL_STATSCOMMANDS */
+                                       results.push_back(sn+" 212 "+user->nick+" "+i->second->command+" "+ConvToStr(i->second->use_count)+" "+ConvToStr(i->second->total_bytes));
+                               }
+                       }
+               break;
+
+               /* stats z (debug and memory info) */
+               case 'z':
                {
-                       if (i->second->use_count)
+                       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)");
+
+                       if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
                        {
-                               /* RPL_STATSCOMMANDS */
-                               WriteServ(user->fd,"212 %s %s %d %d",user->nick,i->second->command.c_str(),i->second->use_count,i->second->total_bytes);
+                               command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+                               if (whowas_command)
+                               {
+                                       std::deque<classbase*> params;
+                                       Extensible whowas_stats;
+                                       params.push_back(&whowas_stats);
+                                       whowas_command->HandleInternal(WHOWAS_STATS, params);
+                                       if (whowas_stats.GetExt("stats"))
+                                       {
+                                               char* stats;
+                                               whowas_stats.GetExt("stats", stats);
+                                               results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(stats));
+                                       }
+                               }
                        }
-               }
+
+                       results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
+                       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)");
+
+                       if (!getrusage(0,&R))   /* RUSAGE_SELF */
+                       {
+                               results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
+                               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: Voluntary; "+ConvToStr(R.ru_nvcsw)+" Involuntary; "+ConvToStr(R.ru_nivcsw));
+
+                               timeval tv;
+                               char percent[30];
+                               gettimeofday(&tv, NULL);
                        
-       }
+                               float n_elapsed = ((tv.tv_sec - ServerInstance->stats->LastSampled.tv_sec) * 1000000 + tv.tv_usec - ServerInstance->stats->LastSampled.tv_usec);
+                               float n_eaten = ((R.ru_utime.tv_sec - ServerInstance->stats->LastCPU.tv_sec) * 1000000 + R.ru_utime.tv_usec - ServerInstance->stats->LastCPU.tv_usec);
+                               float per = (n_eaten / n_elapsed) * 100;
 
-       /* stats z (debug and memory info) */
-       if (*parameters[0] == 'z')
-       {
-               rusage R;
-               WriteServ(user->fd,"249 %s :Users(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,clientlist.size(),clientlist.size()*sizeof(userrec),clientlist.bucket_count());
-               WriteServ(user->fd,"249 %s :Channels(HASH_MAP) %d (%d bytes, %d buckets)",user->nick,chanlist.size(),chanlist.size()*sizeof(chanrec),chanlist.bucket_count());
-               WriteServ(user->fd,"249 %s :Commands(VECTOR) %d (%d bytes)",user->nick,ServerInstance->Parser->cmdlist.size(),ServerInstance->Parser->cmdlist.size()*sizeof(command_t));
-               WriteServ(user->fd,"249 %s :MOTD(VECTOR) %d, RULES(VECTOR) %d",user->nick,Config->MOTD.size(),Config->RULES.size());
-               WriteServ(user->fd,"249 %s :Modules(VECTOR) %d (%d)",user->nick,modules.size(),modules.size()*sizeof(Module));
-               WriteServ(user->fd,"249 %s :ClassFactories(VECTOR) %d (%d)",user->nick,factory.size(),factory.size()*sizeof(ircd_module));
-               if (!getrusage(RUSAGE_SELF,&R))
-               {
-                       WriteServ(user->fd,"249 %s :Total allocation: %luK (0x%lx)",user->nick,R.ru_maxrss,R.ru_maxrss);
-                       WriteServ(user->fd,"249 %s :Signals:          %lu  (0x%lx)",user->nick,R.ru_nsignals,R.ru_nsignals);
-                       WriteServ(user->fd,"249 %s :Page faults:      %lu  (0x%lx)",user->nick,R.ru_majflt,R.ru_majflt);
-                       WriteServ(user->fd,"249 %s :Swaps:            %lu  (0x%lx)",user->nick,R.ru_nswap,R.ru_nswap);
-                       WriteServ(user->fd,"249 %s :Context Switches: %lu  (0x%lx)",user->nick,R.ru_nvcsw+R.ru_nivcsw,R.ru_nvcsw+R.ru_nivcsw);
+                               snprintf(percent, 30, "%03.5f%%", per);
+                               results.push_back(sn+" 249 "+user->nick+" :CPU Usage: "+percent);
+                       }
                }
-       }
-
-       if (*parameters[0] == 'T')
-       {
-               WriteServ(user->fd,"249 Brain :accepts %d refused %d",ServerInstance->stats->statsAccept,ServerInstance->stats->statsRefused);
-               WriteServ(user->fd,"249 Brain :unknown commands %d",ServerInstance->stats->statsUnknown);
-               WriteServ(user->fd,"249 Brain :nick collisions %d",ServerInstance->stats->statsCollisions);
-               WriteServ(user->fd,"249 Brain :dns requests %d succeeded %d failed %d",ServerInstance->stats->statsDns,ServerInstance->stats->statsDnsGood,ServerInstance->stats->statsDnsBad);
-               WriteServ(user->fd,"249 Brain :connections %d",ServerInstance->stats->statsConnects);
-               WriteServ(user->fd,"249 Brain :bytes sent %dK recv %dK",(ServerInstance->stats->statsSent / 1024),(ServerInstance->stats->statsRecv / 1024));
-       }
+               break;
        
-       /* stats o */
-       if (*parameters[0] == 'o')
-       {
-               for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++)
+               case 'T':
                {
-                       char LoginName[MAXBUF];
-                       char HostName[MAXBUF];
-                       char OperType[MAXBUF];
-                       Config->ConfValue("oper","name",i,LoginName,&Config->config_f);
-                       Config->ConfValue("oper","host",i,HostName,&Config->config_f);
-                       Config->ConfValue("oper","type",i,OperType,&Config->config_f);
-                       WriteServ(user->fd,"243 %s O %s * %s %s 0",user->nick,HostName,LoginName,OperType);
+                       char buffer[MAXBUF];
+                       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->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));
+                       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);
                }
-       }
-       
-       /* stats l (show user I/O stats) */
-       if (*parameters[0] == 'l')
-       {
-               WriteServ(user->fd,"211 %s :server:port nick bytes_in cmds_in bytes_out cmds_out",user->nick);
-               for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+               break;
+
+               /* stats o */
+               case 'o':
+                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
+                       {
+                               char LoginName[MAXBUF];
+                               char HostName[MAXBUF];
+                               char OperType[MAXBUF];
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","name", i, LoginName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","host", i, HostName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","type", i, OperType, MAXBUF);
+                               results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0");
+                       }
+               break;
+
+               /* stats l (show user I/O stats) */
+               case 'l':
+                       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 = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+                       {
+                               userrec* i = *n;
+                               if (ServerInstance->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(ServerInstance->Time() - i->age));
+                               }
+                       }
+               break;
+
+       /* stats L (show user I/O stats with IP addresses) */
+               case '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 = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+                       {
+                               userrec* i = *n;
+                               if (ServerInstance->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(ServerInstance->Time() - i->age));
+                               }
+                       }
+               break;
+
+               /* stats u (show server uptime) */
+               case 'u':
                {
-                       if (isnick(i->second->nick))
+                       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)
                        {
-                               WriteServ(user->fd,"211 %s :%s:%d %s %d %d %d %d",user->nick,i->second->server,i->second->port,i->second->nick,i->second->bytes_in,i->second->cmds_in,i->second->bytes_out,i->second->cmds_out);
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF," 242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",user->nick,(stime->tm_year-70),stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
+                               results.push_back(sn+buffer);
                        }
                        else
                        {
-                               WriteServ(user->fd,"211 %s :%s:%d (unknown@%d) %d %d %d %d",user->nick,i->second->server,i->second->port,i->second->fd,i->second->bytes_in,i->second->cmds_in,i->second->bytes_out,i->second->cmds_out);
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF," 242 %s :Server up %d days, %.2d:%.2d:%.2d",user->nick,stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
+                               results.push_back(sn+buffer);
                        }
-                       
                }
-       }
-       
-       /* stats u (show server uptime) */
-       if (*parameters[0] == 'u')
-       {
-               time_t current_time = 0;
-               current_time = 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)
-               {
-                       WriteServ(user->fd,"242 %s :Server up %d years, %d days, %.2d:%.2d:%.2d",user->nick,(stime->tm_year-70),stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-               }
-               else
-               {
-                       WriteServ(user->fd,"242 %s :Server up %d days, %.2d:%.2d:%.2d",user->nick,stime->tm_yday,stime->tm_hour,stime->tm_min,stime->tm_sec);
-               }
-       }
+               break;
 
-       WriteServ(user->fd,"219 %s %s :End of /STATS report",user->nick,parameters[0]);
-       WriteOpers("*** Notice: Stats '%s' requested by %s (%s@%s)",parameters[0],user->nick,user->ident,user->host);
-       
-}
+               default:
+               break;
+       }
 
+       results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
+       ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
 
+       return;
+}