]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Add support for blocking tag messages with the deaf mode.
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 0fa90fca5b6028ed764f94f6878d470b530320cb..56b8178d235b733bb6c289b434d6b253c2a4a9a9 100644 (file)
@@ -1,16 +1,21 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2012 William Pitcock <nenolod@dereferenced.org>
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 Chris Novakovic <chrisnovakovic@users.noreply.github.com>
+ *   Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012-2013 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Ariadne Conill <ariadne@dereferenced.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2008-2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Burlex <???@???>
- *   Copyright (C) 2003 Craig McLure <craig@chatspike.net>
- *   Copyright (C) 2003 randomdan <???@???>
+ *   Copyright (C) 2006-2007 Oliver Lupton <om@inspircd.org>
+ *   Copyright (C) 2005-2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
  */
 
 
-/* $Core */
 #include "inspircd.h"
-#include "inspircd_version.h"
 #include <signal.h>
 
 #ifndef _WIN32
-       #include <dirent.h>
        #include <unistd.h>
        #include <sys/resource.h>
-       #include <dlfcn.h>
        #include <getopt.h>
-
-       /* Some systems don't define RUSAGE_SELF. This should fix them. */
-       #ifndef RUSAGE_SELF
-               #define RUSAGE_SELF 0
-       #endif
-
        #include <pwd.h> // setuid
        #include <grp.h> // setgid
 #else
-       WORD g_wOriginalColors;
-       WORD g_wBackgroundColor;
-       HANDLE g_hStdout;
+       /** Manages formatting lines written to stderr on Windows. */
+       WindowsStream StandardError(STD_ERROR_HANDLE);
+
+       /** Manages formatting lines written to stdout on Windows. */
+       WindowsStream StandardOutput(STD_OUTPUT_HANDLE);
 #endif
 
 #include <fstream>
 #include <iostream>
 #include "xline.h"
-#include "bancache.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
 #include "exitcodes.h"
-#include "caller.h"
-#include "testsuite.h"
 
 InspIRCd* ServerInstance = NULL;
 
-/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
  * if it must.
  *
  * This is provided as a pointer so that modules can change it to their custom mapping tables,
@@ -78,228 +69,385 @@ unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map;
  */
 const char* ExitCodes[] =
 {
-               "No error", /* 0 */
-               "DIE command", /* 1 */
-               "execv() failed", /* 2 */
-               "Internal error", /* 3 */
-               "Config file error", /* 4 */
-               "Logfile error", /* 5 */
-               "POSIX fork failed", /* 6 */
-               "Bad commandline parameters", /* 7 */
-               "No ports could be bound", /* 8 */
-               "Can't write PID file", /* 9 */
-               "SocketEngine could not initialize", /* 10 */
-               "Refusing to start up as root", /* 11 */
-               "Found a <die> tag!", /* 12 */
-               "Couldn't load module on startup", /* 13 */
-               "Could not create windows forked process", /* 14 */
-               "Received SIGTERM", /* 15 */
-               "Bad command handler loaded", /* 16 */
-               "RegisterServiceCtrlHandler failed", /* 17 */
-               "UpdateSCMStatus failed", /* 18 */
-               "CreateEvent failed" /* 19 */
+               "No error",                                                             // 0
+               "DIE command",                                                  // 1
+               "Config file error",                                    // 2
+               "Logfile error",                                                // 3
+               "POSIX fork failed",                                    // 4
+               "Bad commandline parameters",                   // 5
+               "Can't write PID file",                                 // 6
+               "SocketEngine could not initialize",    // 7
+               "Refusing to start up as root",                 // 8
+               "Couldn't load module on startup",              // 9
+               "Received SIGTERM"                                              // 10
 };
 
-template<typename T> static void DeleteZero(T*&n)
+namespace
 {
-       T* t = n;
-       n = NULL;
-       delete t;
-}
+       void VoidSignalHandler(int);
 
-void InspIRCd::Cleanup()
-{
-       for (unsigned int i = 0; i < ports.size(); i++)
+       // Warns a user running as root that they probably shouldn't.
+       void CheckRoot()
        {
-               /* This calls the constructor and closes the listening socket */
-               ports[i]->cull();
-               delete ports[i];
+#ifndef _WIN32
+               if (getegid() != 0 && geteuid() != 0)
+                       return;
+
+               std::cout << con_red << "Warning!" << con_reset << " You have started as root. Running as root is generally not required" << std::endl
+                       << "and may allow an attacker to gain access to your system if they find a way to" << std::endl
+                       << "exploit your IRC server." << std::endl
+                       << std::endl;
+               if (isatty(fileno(stdout)))
+               {
+                       std::cout << "InspIRCd will start in 30 seconds. If you are sure that you need to run as root" << std::endl
+                               << "then you can pass the " << con_bright << "--runasroot" << con_reset << " option to disable this wait." << std::endl;
+                       sleep(30);
+               }
+               else
+               {
+                       std::cout << "If you are sure that you need to run as root then you can pass the " << con_bright << "--runasroot" << con_reset << std::endl
+                               << "option to disable this error." << std::endl;
+                               ServerInstance->Exit(EXIT_STATUS_ROOT);
+               }
+#endif
        }
-       ports.clear();
 
-       /* Close all client sockets, or the new process inherits them */
-       LocalUserList::reverse_iterator i = Users->local_users.rbegin();
-       while (i != this->Users->local_users.rend())
+       // Collects performance statistics for the STATS command.
+       void CollectStats()
        {
-               User* u = *i++;
-               Users->QuitUser(u, "Server shutdown");
+#ifndef _WIN32
+               static rusage ru;
+               if (getrusage(RUSAGE_SELF, &ru) == -1)
+                       return; // Should never happen.
+
+               ServerInstance->stats.LastSampled.tv_sec = ServerInstance->Time();
+               ServerInstance->stats.LastSampled.tv_nsec = ServerInstance->Time_ns();
+               ServerInstance->stats.LastCPU = ru.ru_utime;
+#else
+               if (!QueryPerformanceCounter(&ServerInstance->stats.LastSampled))
+                       return; // Should never happen.
+
+               FILETIME CreationTime;
+               FILETIME ExitTime;
+               FILETIME KernelTime;
+               FILETIME UserTime;
+               GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime);
+
+               ServerInstance->stats.LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime;
+               ServerInstance->stats.LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime;
+#endif
        }
 
-       GlobalCulls.Apply();
-       Modules->UnloadAll();
+       // Checks whether the server clock has skipped too much and warn about it if it has.
+       void CheckTimeSkip(time_t oldtime, time_t newtime)
+       {
+               if (!ServerInstance->Config->TimeSkipWarn)
+                       return;
 
-       /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
-       /* Must be deleted before modes as it decrements modelines */
-       if (FakeClient)
-               FakeClient->cull();
-       if (Res)
-               Res->cull();
-       DeleteZero(this->FakeClient);
-       DeleteZero(this->Users);
-       DeleteZero(this->Modes);
-       DeleteZero(this->XLines);
-       DeleteZero(this->Parser);
-       DeleteZero(this->stats);
-       DeleteZero(this->Modules);
-       DeleteZero(this->BanCache);
-       DeleteZero(this->SNO);
-       DeleteZero(this->Config);
-       DeleteZero(this->Res);
-       DeleteZero(this->chanlist);
-       DeleteZero(this->PI);
-       DeleteZero(this->Threads);
-       DeleteZero(this->Timers);
-       DeleteZero(this->SE);
-       /* Close logging */
-       this->Logs->CloseLogs();
-       DeleteZero(this->Logs);
-}
+               time_t timediff = newtime - oldtime;
 
-void InspIRCd::Restart(const std::string &reason)
-{
-       /* SendError flushes each client's queue,
-        * regardless of writeability state
-        */
-       this->SendError(reason);
+               if (timediff > ServerInstance->Config->TimeSkipWarn)
+                       ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff);
 
-       /* Figure out our filename (if theyve renamed it, we're boned) */
-       std::string me;
+               else if (timediff < -ServerInstance->Config->TimeSkipWarn)
+                       ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff));
+       }
 
-       char** argv = Config->cmdline.argv;
+       // Drops to the unprivileged user/group specified in <security:runas{user,group}>.
+       void DropRoot()
+       {
+#ifndef _WIN32
+               ConfigTag* security = ServerInstance->Config->ConfValue("security");
+
+               const std::string SetGroup = security->getString("runasgroup");
+               if (!SetGroup.empty())
+               {
+                       errno = 0;
+                       if (setgroups(0, NULL) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+
+                       struct group* g = getgrnam(SetGroup.c_str());
+                       if (!g)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+
+                       if (setgid(g->gr_gid) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgid(%d) failed (wrong group?): %s", g->gr_gid, strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+               }
+
+               const std::string SetUser = security->getString("runasuser");
+               if (!SetUser.empty())
+               {
+                       errno = 0;
+                       struct passwd* u = getpwnam(SetUser.c_str());
+                       if (!u)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
 
+                       if (setuid(u->pw_uid) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setuid(%d) failed (wrong user?): %s", u->pw_uid, strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+               }
+#endif
+       }
+
+       // Expands a path relative to the current working directory.
+       std::string ExpandPath(const char* path)
+       {
 #ifdef _WIN32
-       char module[MAX_PATH];
-       if (GetModuleFileNameA(NULL, module, MAX_PATH))
-               me = module;
+               TCHAR configPath[MAX_PATH + 1];
+               if (GetFullPathName(path, MAX_PATH, configPath, NULL) > 0)
+                       return configPath;
 #else
-       me = argv[0];
+               char configPath[PATH_MAX + 1];
+               if (realpath(path, configPath))
+                       return configPath;
 #endif
+               return path;
+       }
+
+       // Locates a config file on the file system.
+       bool FindConfigFile(std::string& path)
+       {
+               if (FileSystem::FileExists(path))
+                       return true;
+
+#ifdef _WIN32
+               // Windows hides file extensions by default so try appending .txt to the path
+               // to help users who have that feature enabled and can't create .conf files.
+               const std::string txtpath = path + ".txt";
+               if (FileSystem::FileExists(txtpath))
+               {
+                       path.assign(txtpath);
+                       return true;
+               }
+#endif
+               return false;
+       }
 
-       this->Cleanup();
+       // Attempts to fork into the background.
+       void ForkIntoBackground()
+       {
+#ifndef _WIN32
+               // We use VoidSignalHandler whilst forking to avoid breaking daemon scripts
+               // if the parent process exits with SIGTERM (15) instead of EXIT_STATUS_NOERROR (0).
+               signal(SIGTERM, VoidSignalHandler);
+
+               errno = 0;
+               int childpid = fork();
+               if (childpid < 0)
+               {
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "fork() failed: %s", strerror(errno));
+                       std::cout << con_red << "Error:" << con_reset << " unable to fork into background: " << strerror(errno);
+                       ServerInstance->Exit(EXIT_STATUS_FORK);
+               }
+               else if (childpid > 0)
+               {
+                       // Wait until the child process kills the parent so that the shell prompt
+                       // doesnt display over the output. Sending a kill with a signal of 0 just
+                       // checks that the child pid is still running. If it is not then an error
+                       // happened and the parent should exit.
+                       while (kill(childpid, 0) != -1)
+                               sleep(1);
+                       exit(EXIT_STATUS_NOERROR);
+               }
+               else
+               {
+                       setsid();
+                       signal(SIGTERM, InspIRCd::SetSignal);
+                       SocketEngine::RecoverFromFork();
+               }
+#endif
+       }
 
-       if (execv(me.c_str(), argv) == -1)
+       // Increase the size of a core dump file to improve debugging problems.
+       void IncreaseCoreDumpSize()
        {
-               /* Will raise a SIGABRT if not trapped */
-               throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
+#ifndef _WIN32
+               errno = 0;
+               rlimit rl;
+               if (getrlimit(RLIMIT_CORE, &rl) == -1)
+               {
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: getrlimit(RLIMIT_CORE) failed: %s", strerror(errno));
+                       return;
+               }
+
+               rl.rlim_cur = rl.rlim_max;
+               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: setrlimit(RLIMIT_CORE) failed: %s", strerror(errno));
+#endif
        }
-}
 
-void InspIRCd::ResetMaxBans()
-{
-       for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++)
-               i->second->ResetMaxBans();
-}
+       // Parses the command line options.
+       void ParseOptions()
+       {
+               int do_debug = 0, do_nofork = 0,    do_nolog = 0;
+               int do_nopid = 0, do_runasroot = 0, do_version = 0;
+               struct option longopts[] =
+               {
+                       { "config",    required_argument, NULL,          'c' },
+                       { "debug",     no_argument,       &do_debug,     1 },
+                       { "nofork",    no_argument,       &do_nofork,    1 },
+                       { "nolog",     no_argument,       &do_nolog,     1 },
+                       { "nopid",     no_argument,       &do_nopid,     1 },
+                       { "runasroot", no_argument,       &do_runasroot, 1 },
+                       { "version",   no_argument,       &do_version,   1 },
+                       { 0, 0, 0, 0 }
+               };
+
+               char** argv = ServerInstance->Config->cmdline.argv;
+               int ret;
+               while ((ret = getopt_long(ServerInstance->Config->cmdline.argc, argv, ":c:", longopts, NULL)) != -1)
+               {
+                       switch (ret)
+                       {
+                               case 0:
+                                       // A long option was specified.
+                                       break;
+
+                               case 'c':
+                                       // The -c option was specified.
+                                       ServerInstance->ConfigFileName = ExpandPath(optarg);
+                                       break;
+
+                               default:
+                                       // An unknown option was specified.
+                                       std::cout << con_red << "Error:" <<  con_reset << " unknown option '" << argv[optind] << "'." << std::endl
+                                               << con_bright << "Usage: " << con_reset << argv[0] << " [--config <file>] [--debug] [--nofork] [--nolog]" << std::endl
+                                               << std::string(strlen(argv[0]) + 8, ' ') << "[--nopid] [--runasroot] [--version]" << std::endl;
+                                       ServerInstance->Exit(EXIT_STATUS_ARGV);
+                                       break;
+                       }
+               }
 
-/** Because hash_map doesn't free its buckets when we delete items, we occasionally
- * recreate the hash to free them up.
- * We do this by copying the entries from the old hash to a new hash, causing all
- * empty buckets to be weeded out of the hash.
- * Since this is quite expensive, it's not done very often.
- */
-void InspIRCd::RehashUsersAndChans()
-{
-       user_hash* old_users = Users->clientlist;
-       Users->clientlist = new user_hash;
-       for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
-               Users->clientlist->insert(*n);
-       delete old_users;
-
-       user_hash* old_uuid = Users->uuidlist;
-       Users->uuidlist = new user_hash;
-       for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++)
-               Users->uuidlist->insert(*n);
-       delete old_uuid;
-
-       chan_hash* old_chans = chanlist;
-       chanlist = new chan_hash;
-       for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
-               chanlist->insert(*n);
-       delete old_chans;
-
-       // Reset the already_sent IDs so we don't wrap it around and drop a message
-       LocalUser::already_sent_id = 0;
-       for (LocalUserList::const_iterator i = Users->local_users.begin(); i != Users->local_users.end(); i++)
+               if (do_version)
+               {
+                       std::cout << INSPIRCD_VERSION << std::endl;
+                       ServerInstance->Exit(EXIT_STATUS_NOERROR);
+               }
+
+               // Store the relevant parsed arguments
+               ServerInstance->Config->cmdline.forcedebug = !!do_debug;
+               ServerInstance->Config->cmdline.nofork = !!do_nofork;
+               ServerInstance->Config->cmdline.runasroot = !!do_runasroot;
+               ServerInstance->Config->cmdline.writelog = !do_nolog;
+               ServerInstance->Config->cmdline.writepid = !do_nopid;
+       }
+       // Seeds the random number generator if applicable.
+       void SeedRng(timespec ts)
        {
-               (**i).already_sent = 0;
-               (**i).RemoveExpiredInvites();
+#if defined _WIN32
+               srand(ts.tv_nsec ^ ts.tv_sec);
+#elif !defined HAS_ARC4RANDOM_BUF
+               srandom(ts.tv_nsec ^ ts.tv_sec);
+#endif
        }
-}
 
-void InspIRCd::SetSignals()
-{
+       // Sets handlers for various process signals.
+       void SetSignals()
+       {
 #ifndef _WIN32
-       signal(SIGALRM, SIG_IGN);
-       signal(SIGHUP, InspIRCd::SetSignal);
-       signal(SIGPIPE, SIG_IGN);
-       signal(SIGCHLD, SIG_IGN);
-       /* We want E2BIG not a signal! */
-       signal(SIGXFSZ, SIG_IGN);
+               signal(SIGALRM, SIG_IGN);
+               signal(SIGCHLD, SIG_IGN);
+               signal(SIGHUP, InspIRCd::SetSignal);
+               signal(SIGPIPE, SIG_IGN);
+               signal(SIGUSR1, SIG_IGN);
+               signal(SIGUSR2, SIG_IGN);
+               signal(SIGXFSZ, SIG_IGN);
 #endif
-       signal(SIGTERM, InspIRCd::SetSignal);
-}
+               signal(SIGTERM, InspIRCd::SetSignal);
+       }
 
-void InspIRCd::QuickExit(int status)
-{
-       exit(status);
-}
+       void TryBindPorts()
+       {
+               FailedPortList pl;
+               ServerInstance->BindPorts(pl);
 
-// Required for returning the proper value of EXIT_SUCCESS for the parent process
-static void VoidSignalHandler(int signalreceived)
-{
-       exit(0);
-}
+               if (!pl.empty())
+               {
+                       std::cout << con_red << "Warning!" << con_reset << " Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl
+                               << std::endl;
 
-bool InspIRCd::DaemonSeed()
-{
-#ifdef _WIN32
-       std::cout << "InspIRCd Process ID: " << con_green << GetCurrentProcessId() << con_reset << std::endl;
-       return true;
-#else
-       // Do not use QuickExit here: It will exit with status SIGTERM which would break e.g. daemon scripts
-       signal(SIGTERM, VoidSignalHandler);
+                       for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter)
+                       {
+                               const FailedPort& fp = *iter;
+                               std::cout << "  " << con_bright << fp.sa.str() << con_reset << ": " << strerror(fp.error) << '.' << std::endl
+                                       << "  " << "Created from <bind> tag at " << fp.tag->getTagLocation() << std::endl
+                                       << std::endl;
+                       }
 
-       int childpid;
-       if ((childpid = fork ()) < 0)
-               return false;
-       else if (childpid > 0)
-       {
-               /* We wait here for the child process to kill us,
-                * so that the shell prompt doesnt come back over
-                * the output.
-                * Sending a kill with a signal of 0 just checks
-                * if the child pid is still around. If theyre not,
-                * they threw an error and we should give up.
-                */
-               while (kill(childpid, 0) != -1)
-                       sleep(1);
-               exit(0);
+                       std::cout << con_bright << "Hints:" << con_reset << std::endl
+                               << "- For TCP/IP listeners try using a public IP address in <bind:address> instead" << std::endl
+                               << "  of * or leaving it blank." << std::endl
+                               << "- For UNIX socket listeners try enabling <bind:rewrite> to replace old sockets." << std::endl;
+               }
        }
-       setsid ();
-       std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
 
-       signal(SIGTERM, InspIRCd::SetSignal);
+       // Required for returning the proper value of EXIT_SUCCESS for the parent process.
+       void VoidSignalHandler(int)
+       {
+               exit(EXIT_STATUS_NOERROR);
+       }
+}
 
-       rlimit rl;
-       if (getrlimit(RLIMIT_CORE, &rl) == -1)
+void InspIRCd::Cleanup()
+{
+       // Close all listening sockets
+       for (unsigned int i = 0; i < ports.size(); i++)
        {
-               this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!");
-               return false;
+               ports[i]->cull();
+               delete ports[i];
        }
-       rl.rlim_cur = rl.rlim_max;
+       ports.clear();
 
-       if (setrlimit(RLIMIT_CORE, &rl) == -1)
-                       this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size.");
+       // Tell modules that we're shutting down.
+       const std::string quitmsg = "Server shutting down";
+       FOREACH_MOD(OnShutdown, (quitmsg));
 
-       return true;
-#endif
+       // Disconnect all local users
+       const UserManager::LocalList& list = Users.GetLocalUsers();
+       while (!list.empty())
+               ServerInstance->Users.QuitUser(list.front(), quitmsg);
+
+       GlobalCulls.Apply();
+       Modules->UnloadAll();
+
+       /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
+       /* Must be deleted before modes as it decrements modelines */
+       if (FakeClient)
+       {
+               delete FakeClient->server;
+               FakeClient->cull();
+       }
+       stdalgo::delete_zero(this->FakeClient);
+       stdalgo::delete_zero(this->XLines);
+       stdalgo::delete_zero(this->Config);
+       SocketEngine::Deinit();
+       Logs->CloseLogs();
 }
 
 void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
 {
 #ifndef _WIN32
-       std::string fname(filename);
-       if (fname.empty())
-               fname = DATA_PATH "/inspircd.pid";
+       if (!ServerInstance->Config->cmdline.writepid)
+       {
+               this->Logs->Log("STARTUP", LOG_DEFAULT, "--nopid specified on command line; PID file not written.");
+               return;
+       }
+
+       std::string fname = ServerInstance->Config->Paths.PrependRuntime(filename.empty() ? "inspircd.pid" : filename);
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -307,314 +455,112 @@ void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
                outfile.close();
        }
        else
-       {\r
-               if (exitonfail)\r
+       {
+               if (exitonfail)
                        std::cout << "Failed to write PID-file '" << fname << "', exiting." << std::endl;
-               this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s'%s",fname.c_str(), (exitonfail ? ", exiting." : ""));\r
+               this->Logs->Log("STARTUP", LOG_DEFAULT, "Failed to write PID-file '%s'%s", fname.c_str(), (exitonfail ? ", exiting." : ""));
                if (exitonfail)
-                       Exit(EXIT_STATUS_PID);\r
+                       Exit(EXIT_STATUS_PID);
        }
 #endif
 }
 
-InspIRCd::InspIRCd(int argc, char** argv) :
-        ConfigFileName(CONFIG_PATH "/inspircd.conf"),
-
-        /* Functor pointer initialisation.
-         *
-         * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
-         * themselves within the class.
-         */
-        NICKForced("NICKForced", NULL),
-        OperQuit("OperQuit", NULL),
-        GenRandom(&HandleGenRandom),
-        IsChannel(&HandleIsChannel),
-        IsSID(&HandleIsSID),
-        Rehash(&HandleRehash),
-        IsNick(&HandleIsNick),
-        IsIdent(&HandleIsIdent),
-        FloodQuitUser(&HandleFloodQuitUser),
-        OnCheckExemption(&HandleOnCheckExemption)
+InspIRCd::InspIRCd(int argc, char** argv)
+       : FakeClient(NULL)
+       , ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf")
+       , ConfigThread(NULL)
+       , Config(NULL)
+       , XLines(NULL)
+       , PI(&DefaultProtocolInterface)
+       , GenRandom(&DefaultGenRandom)
+       , IsChannel(&DefaultIsChannel)
+       , IsNick(&DefaultIsNick)
+       , IsIdent(&DefaultIsIdent)
 {
        ServerInstance = this;
 
-       Extensions.Register(&NICKForced);
-       Extensions.Register(&OperQuit);
-
-       FailedPortList pl;
-       int do_version = 0, do_nofork = 0, do_debug = 0,
-           do_nolog = 0, do_root = 0, do_testsuite = 0;    /* flag variables */
-       int c = 0;
-
-       // Initialize so that if we exit before proper initialization they're not deleted
-       this->Logs = 0;
-       this->Threads = 0;
-       this->PI = 0;
-       this->Users = 0;
-       this->chanlist = 0;
-       this->Config = 0;
-       this->SNO = 0;
-       this->BanCache = 0;
-       this->Modules = 0;
-       this->stats = 0;
-       this->Timers = 0;
-       this->Parser = 0;
-       this->XLines = 0;
-       this->Modes = 0;
-       this->Res = 0;
-       this->ConfigThread = NULL;
-       this->FakeClient = NULL;
-
        UpdateTime();
        this->startup_time = TIME.tv_sec;
 
-       // This must be created first, so other parts of Insp can use it while starting up
-       this->Logs = new LogManager;
-
-       SE = CreateSocketEngine();
-
-       this->Threads = new ThreadEngine;
-
-       /* Default implementation does nothing */
-       this->PI = new ProtocolInterface;
-
-       this->s_signal = 0;
-
-       // Create base manager classes early, so nothing breaks
-       this->Users = new UserManager;
-
-       this->Users->clientlist = new user_hash();
-       this->Users->uuidlist = new user_hash();
-       this->chanlist = new chan_hash();
+       IncreaseCoreDumpSize();
+       SeedRng(TIME);
+       SocketEngine::Init();
 
        this->Config = new ServerConfig;
-       this->SNO = new SnomaskManager;
-       this->BanCache = new BanCacheManager;
-       this->Modules = new ModuleManager();
-       this->stats = new serverstats();
-       this->Timers = new TimerManager;
-       this->Parser = new CommandParser;
+       dynamic_reference_base::reset_all();
        this->XLines = new XLineManager;
 
        this->Config->cmdline.argv = argv;
        this->Config->cmdline.argc = argc;
+       ParseOptions();
 
-#ifdef _WIN32
-       srand(TIME.tv_nsec ^ TIME.tv_sec);
-
-       // Initialize the console values
-       g_hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
-       CONSOLE_SCREEN_BUFFER_INFO bufinf;
-       if(GetConsoleScreenBufferInfo(g_hStdout, &bufinf))
        {
-               g_wOriginalColors = bufinf.wAttributes & 0x00FF;
-               g_wBackgroundColor = bufinf.wAttributes & 0x00F0;
-       }
-       else
-       {
-               g_wOriginalColors = FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN;
-               g_wBackgroundColor = 0;
-       }
-#else
-       srandom(TIME.tv_nsec ^ TIME.tv_sec);
-#endif
-
-       struct option longopts[] =
-       {
-               { "nofork",     no_argument,            &do_nofork,     1       },
-               { "logfile",    required_argument,      NULL,           'f'     },
-               { "config",     required_argument,      NULL,           'c'     },
-               { "debug",      no_argument,            &do_debug,      1       },
-               { "nolog",      no_argument,            &do_nolog,      1       },
-               { "runasroot",  no_argument,            &do_root,       1       },
-               { "version",    no_argument,            &do_version,    1       },
-               { "testsuite",  no_argument,            &do_testsuite,  1       },
-               { 0, 0, 0, 0 }
-       };
-
-       int index;
-       while ((c = getopt_long(argc, argv, ":c:f:", longopts, &index)) != -1)
-       {
-               switch (c)
+               ServiceProvider* provs[] =
                {
-                       case 'f':
-                               /* Log filename was set */
-                               Config->cmdline.startup_log = optarg;
-                       break;
-                       case 'c':
-                               /* Config filename was set */
-                               ConfigFileName = optarg;
-                       break;
-                       case 0:
-                               /* getopt_long_only() set an int variable, just keep going */
-                       break;
-                       case '?':
-                               /* Unknown parameter */
-                       default:
-                               /* Fall through to handle other weird values too */
-                               std::cout << "Unknown parameter '" << argv[optind-1] << "'" << std::endl;
-                               std::cout << "Usage: " << argv[0] << " [--nofork] [--nolog] [--debug] [--logfile <filename>] " << std::endl <<
-                                       std::string(static_cast<int>(8+strlen(argv[0])), ' ') << "[--runasroot] [--version] [--config <config>] [--testsuite]" << std::endl;
-                               Exit(EXIT_STATUS_ARGV);
-                       break;
-               }
+                       &rfcevents.numeric, &rfcevents.join, &rfcevents.part, &rfcevents.kick, &rfcevents.quit, &rfcevents.nick,
+                       &rfcevents.mode, &rfcevents.topic, &rfcevents.privmsg, &rfcevents.invite, &rfcevents.ping, &rfcevents.pong,
+                       &rfcevents.error
+               };
+               Modules.AddServices(provs, sizeof(provs)/sizeof(provs[0]));
        }
 
-       if (do_testsuite)
-               do_nofork = do_debug = true;
+       std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << std::endl
+               << "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl
+               << std::endl;
 
-       if (do_version)
+       if (Config->cmdline.forcedebug)
        {
-               std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
-               Exit(EXIT_STATUS_NOERROR);
-       }
-
-#ifdef _WIN32
-       // Set up winsock
-       WSADATA wsadata;
-       WSAStartup(MAKEWORD(2,2), &wsadata);
-#endif
-
-       /* Set the finished argument values */
-       Config->cmdline.nofork = (do_nofork != 0);
-       Config->cmdline.forcedebug = (do_debug != 0);
-       Config->cmdline.writelog = !do_nolog;
-       Config->cmdline.TestSuite = (do_testsuite != 0);
-
-       if (do_debug)
-       {
-               FileWriter* fw = new FileWriter(stdout);
-               FileLogStream* fls = new FileLogStream(RAWIO, fw);
+               FILE* newstdout = fdopen(dup(STDOUT_FILENO), "w");
+               FileWriter* fw = new FileWriter(newstdout, 1);
+               FileLogStream* fls = new FileLogStream(LOG_RAWIO, fw);
                Logs->AddLogTypes("*", fls, true);
        }
-       else if (!this->OpenLog(argv, argc))
-       {
-               std::cout << "ERROR: Could not open initial logfile " << Config->cmdline.startup_log << ": " << strerror(errno) << std::endl << std::endl;
-               Exit(EXIT_STATUS_LOG);
-       }
-
-       if (!ServerConfig::FileExists(ConfigFileName.c_str()))
-       {
-#ifdef _WIN32
-               /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
-               std::string txtconf = this->ConfigFileName;
-               txtconf.append(".txt");
-
-               if (ServerConfig::FileExists(txtconf.c_str()))
-               {
-                       ConfigFileName = txtconf;
-               }
-               else
-#endif
-               {
-                       std::cout << "ERROR: Cannot open config file: " << ConfigFileName << std::endl << "Exiting..." << std::endl;
-                       this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", ConfigFileName.c_str());
-                       Exit(EXIT_STATUS_CONFIG);
-               }
-       }
-
-       std::cout << con_green << "Inspire Internet Relay Chat Server" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
-       std::cout << con_green << "(C) InspIRCd Development Team." << con_reset << std::endl << std::endl;
-       std::cout << "Developers:" << std::endl;
-       std::cout << con_green << "\tBrain, FrostyCoolSlug, w00t, Om, Special, peavey" << std::endl;
-       std::cout << "\taquanight, psychon, dz, danieldg, jackmcbarn" << std::endl;\r
-       std::cout << "\tAttila" << con_reset << std::endl << std::endl;
-       std::cout << "Others:\t\t\t" << con_green << "See /INFO Output" << con_reset << std::endl;
-
-       this->Modes = new ModeParser;
 
-#ifndef _WIN32
-       if (!do_root)
-               this->CheckRoot();
-       else
+       if (!FindConfigFile(ConfigFileName))
        {
-               std::cout << "* WARNING * WARNING * WARNING * WARNING * WARNING *" << std::endl\r
-               << "YOU ARE RUNNING INSPIRCD AS ROOT. THIS IS UNSUPPORTED" << std::endl\r
-               << "AND IF YOU ARE HACKED, CRACKED, SPINDLED OR MUTILATED" << std::endl\r
-               << "OR ANYTHING ELSE UNEXPECTED HAPPENS TO YOU OR YOUR" << std::endl\r
-               << "SERVER, THEN IT IS YOUR OWN FAULT. IF YOU DID NOT MEAN" << std::endl\r
-               << "TO START INSPIRCD AS ROOT, HIT CTRL+C NOW AND RESTART" << std::endl\r
-               << "THE PROGRAM AS A NORMAL USER. YOU HAVE BEEN WARNED!" << std::endl << std::endl\r
-               << "InspIRCd starting in 20 seconds, ctrl+c to abort..." << std::endl;\r
-               sleep(20);
+               this->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to open config file %s", ConfigFileName.c_str());
+               std::cout << "ERROR: Cannot open config file: " << ConfigFileName << std::endl << "Exiting..." << std::endl;
+               Exit(EXIT_STATUS_CONFIG);
        }
-#endif
-
-       this->SetSignals();
 
+       SetSignals();
+       if (!Config->cmdline.runasroot)
+               CheckRoot();
        if (!Config->cmdline.nofork)
-       {
-               if (!this->DaemonSeed())
-               {
-                       std::cout << "ERROR: could not go into daemon mode. Shutting down." << std::endl;
-                       Logs->Log("STARTUP", DEFAULT, "ERROR: could not go into daemon mode. Shutting down.");
-                       Exit(EXIT_STATUS_FORK);
-               }
-       }
+               ForkIntoBackground();
 
-       SE->RecoverFromFork();
+       std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
 
-       /* During startup we don't actually initialize this
-        * in the thread engine.
+       /* During startup we read the configuration now, not in
+        * a separate thread
         */
        this->Config->Read();
        this->Config->Apply(NULL, "");
        Logs->OpenFileLogs();
 
-       this->Res = new DNS();
-
-       /*
-        * Initialise SID/UID.
-        * For an explanation as to exactly how this works, and why it works this way, see GetUID().
-        *   -- w00t
-        */
+       // If we don't have a SID, generate one based on the server name and the server description
        if (Config->sid.empty())
-       {
-               // Generate one
-               unsigned int sid = 0;
-               char sidstr[4];
-
-               for (const char* x = Config->ServerName.c_str(); *x; ++x)
-                       sid = 5 * sid + *x;
-               for (const char* y = Config->ServerDesc.c_str(); *y; ++y)
-                       sid = 5 * sid + *y;
-               sprintf(sidstr, "%03d", sid % 1000);
+               Config->sid = UIDGenerator::GenerateSID(Config->ServerName, Config->ServerDesc);
 
-               Config->sid = sidstr;
-       }
+       // Initialize the UID generator with our sid
+       this->UIDGen.init(Config->sid);
 
-       /* set up fake client again this time with the correct uid */
-       this->FakeClient = new FakeUser(Config->sid, Config->ServerName);
+       // Create the server user for this server
+       this->FakeClient = new FakeUser(Config->sid, Config->ServerName, Config->ServerDesc);
 
-       // Get XLine to do it's thing.
-       this->XLines->CheckELines();
+       // This is needed as all new XLines are marked pending until ApplyLines() is called
        this->XLines->ApplyLines();
 
-       int bounditems = BindPorts(pl);
-
        std::cout << std::endl;
 
-       this->Modules->LoadAll();
-
-       /* Just in case no modules were loaded - fix for bug #101 */
-       this->BuildISupport();
-       Config->ApplyDisabledCommands(Config->DisabledCommands);
+       TryBindPorts();
 
-       if (!pl.empty())
-       {
-               std::cout << std::endl << "WARNING: Not all your client ports could be bound -- " << std::endl << "starting anyway with " << bounditems
-                       << " of " << bounditems + (int)pl.size() << " client ports bound." << std::endl << std::endl;
-               std::cout << "The following port(s) failed to bind:" << std::endl << std::endl;
-               int j = 1;
-               for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
-               {
-                       std::cout << j << ".\tAddress: " << (i->first.empty() ? "<all>" : i->first) << " \tReason: " << i->second << std::endl;
-               }
+       this->Modules->LoadAll();
 
-               std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl;
-       }
+       // Build ISupport as ModuleManager::LoadAll() does not do it
+       this->ISupport.Build();
 
-       std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SE->GetMaxFds() << " max open sockets" << std::endl;
+       std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl;
 
 #ifndef _WIN32
        if (!Config->cmdline.nofork)
@@ -622,7 +568,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                if (kill(getppid(), SIGTERM) == -1)
                {
                        std::cout << "Error killing parent process: " << strerror(errno) << std::endl;
-                       Logs->Log("STARTUP", DEFAULT, "Error killing parent process: %s",strerror(errno));
+                       Logs->Log("STARTUP", LOG_DEFAULT, "Error killing parent process: %s",strerror(errno));
                }
        }
 
@@ -636,7 +582,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
         *
         *    -- nenolod
         */
-       if ((!do_nofork) && (!do_testsuite) && (!Config->cmdline.forcedebug))
+       if ((!Config->cmdline.nofork) && (!Config->cmdline.forcedebug))
        {
                int fd = open("/dev/null", O_RDWR);
 
@@ -645,140 +591,67 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                fclose(stdout);
 
                if (dup2(fd, STDIN_FILENO) < 0)
-                       Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdin.");
+                       Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stdin.");
                if (dup2(fd, STDOUT_FILENO) < 0)
-                       Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdout.");
+                       Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stdout.");
                if (dup2(fd, STDERR_FILENO) < 0)
-                       Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stderr.");
+                       Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stderr.");
                close(fd);
        }
        else
        {
-               Logs->Log("STARTUP", DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
+               Logs->Log("STARTUP", LOG_DEFAULT, "Keeping pseudo-tty open as we are running in the foreground.");
        }
 #else
        /* Set win32 service as running, if we are running as a service */
        SetServiceRunning();
 
        // Handle forking
-       if(!do_nofork)
+       if(!Config->cmdline.nofork)
        {
                FreeConsole();
        }
 
-       QueryPerformanceFrequency(&stats->QPFrequency);
+       QueryPerformanceFrequency(&stats.QPFrequency);
 #endif
 
-       Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds());
-
-#ifndef _WIN32
-       std::string SetUser = Config->ConfValue("security")->getString("runasuser");
-       std::string SetGroup = Config->ConfValue("security")->getString("runasgroup");
-       if (!SetGroup.empty())
-       {
-               int ret;
-
-               // setgroups
-               ret = setgroups(0, NULL);
-
-               if (ret == -1)
-               {
-                       this->Logs->Log("SETGROUPS", DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
-                       this->QuickExit(0);
-               }
-
-               // setgid
-               struct group *g;
-
-               errno = 0;
-               g = getgrnam(SetGroup.c_str());
-
-               if (!g)
-               {
-                       this->Logs->Log("SETGUID", DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
-                       this->QuickExit(0);
-               }
-
-               ret = setgid(g->gr_gid);
-
-               if (ret == -1)
-               {
-                       this->Logs->Log("SETGUID", DEFAULT, "setgid() failed (wrong group?): %s", strerror(errno));
-                       this->QuickExit(0);
-               }
-       }
-
-       if (!SetUser.empty())
-       {
-               // setuid
-               struct passwd *u;
-
-               errno = 0;
-               u = getpwnam(SetUser.c_str());
-
-               if (!u)
-               {
-                       this->Logs->Log("SETGUID", DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
-                       this->QuickExit(0);
-               }
-
-               int ret = setuid(u->pw_uid);
+       WritePID(Config->PID);
+       DropRoot();
 
-               if (ret == -1)
-               {
-                       this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (wrong user?): %s", strerror(errno));
-                       this->QuickExit(0);
-               }
-       }
-
-       this->WritePID(Config->PID);
-#endif
+       Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %lu max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
 }
 
 void InspIRCd::UpdateTime()
 {
-#ifdef _WIN32
+#if defined HAS_CLOCK_GETTIME
+       clock_gettime(CLOCK_REALTIME, &TIME);
+#elif defined _WIN32
        SYSTEMTIME st;
        GetSystemTime(&st);
 
        TIME.tv_sec = time(NULL);
        TIME.tv_nsec = st.wMilliseconds;
 #else
-       #ifdef HAS_CLOCK_GETTIME
-               clock_gettime(CLOCK_REALTIME, &TIME);
-       #else
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               TIME.tv_sec = tv.tv_sec;
-               TIME.tv_nsec = tv.tv_usec * 1000;
-       #endif
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+
+       TIME.tv_sec = tv.tv_sec;
+       TIME.tv_nsec = tv.tv_usec * 1000;
 #endif
 }
 
-int InspIRCd::Run()
+void InspIRCd::Run()
 {
-       /* See if we're supposed to be running the test suite rather than entering the mainloop */
-       if (Config->cmdline.TestSuite)
-       {
-               TestSuite* ts = new TestSuite;
-               delete ts;
-               Exit(0);
-       }
-
        UpdateTime();
        time_t OLDTIME = TIME.tv_sec;
 
        while (true)
        {
-#ifndef _WIN32
-               static rusage ru;
-#endif
-
                /* Check if there is a config thread which has finished executing but has not yet been freed */
                if (this->ConfigThread && this->ConfigThread->IsDone())
                {
                        /* Rehash has completed */
-                       this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up...");
+                       this->Logs->Log("CONFIG", LOG_DEBUG, "Detected ConfigThread exiting, tidying up...");
 
                        this->ConfigThread->Finish();
 
@@ -790,53 +663,26 @@ int InspIRCd::Run()
                UpdateTime();
 
                /* Run background module timers every few seconds
-                * (the docs say modules shouldnt rely on accurate
+                * (the docs say modules should not rely on accurate
                 * timing using this event, so we dont have to
                 * time this exactly).
                 */
                if (TIME.tv_sec != OLDTIME)
                {
-#ifndef _WIN32
-                       getrusage(RUSAGE_SELF, &ru);
-                       stats->LastSampled = TIME;
-                       stats->LastCPU = ru.ru_utime;
-#else
-                       if(QueryPerformanceCounter(&stats->LastSampled))
-                       {
-                               FILETIME CreationTime;
-                               FILETIME ExitTime;
-                               FILETIME KernelTime;
-                               FILETIME UserTime;
-                               GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime);
-                               stats->LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime;
-                               stats->LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime;
-                       }
-#endif
+                       CollectStats();
+                       CheckTimeSkip(OLDTIME, TIME.tv_sec);
 
-                       /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */
-                       if (TIME.tv_sec < OLDTIME - 2)
-                       {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)(OLDTIME-TIME.tv_sec));
-                       }
-                       else if (TIME.tv_sec > OLDTIME + 2)
-                       {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
-                       }
-\r
                        OLDTIME = TIME.tv_sec;
 
                        if ((TIME.tv_sec % 3600) == 0)
-                       {
-                               this->RehashUsersAndChans();
-                               FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
-                       }
+                               FOREACH_MOD(OnGarbageCollect, ());
 
-                       Timers->TickTimers(TIME.tv_sec);
-                       this->DoBackgroundUserStuff();
+                       Timers.TickTimers(TIME.tv_sec);
+                       Users->DoBackgroundUserStuff();
 
                        if ((TIME.tv_sec % 5) == 0)
                        {
-                               FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec));
+                               FOREACH_MOD(OnBackgroundTimer, (TIME.tv_sec));
                                SNO->FlushSnotices();
                        }
                }
@@ -848,8 +694,8 @@ int InspIRCd::Run()
                 * This will cause any read or write events to be
                 * dispatched to their handlers.
                 */
-               this->SE->DispatchTrialWrites();
-               this->SE->DispatchEvents();
+               SocketEngine::DispatchTrialWrites();
+               SocketEngine::DispatchEvents();
 
                /* if any users were quit, take them out */
                GlobalCulls.Apply();
@@ -861,25 +707,6 @@ int InspIRCd::Run()
                        s_signal = 0;
                }
        }
-
-       return 0;
-}
-
-/**********************************************************************************/
-
-/**
- * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
- */
-
-/* this returns true when all modules are satisfied that the user should be allowed onto the irc server
- * (until this returns true, a user will block in the waiting state, waiting to connect up to the
- * registration timeout maximum seconds)
- */
-bool InspIRCd::AllModulesReportReady(LocalUser* user)
-{
-       ModResult res;
-       FIRST_MOD_RESULT(OnCheckReady, res, (user));
-       return (res == MOD_RES_PASSTHRU);
 }
 
 sig_atomic_t InspIRCd::s_signal = 0;