]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
m_namedmodes Only show chan key to members and opers with channels/auspex
[user/henk/code/inspircd.git] / src / inspircd.cpp
index cf8c22633315e3538c25a7d50da04bf732ea6c8b..656be220f6c60d37469dd88f793a5b00bcc7daa2 100644 (file)
@@ -31,7 +31,7 @@
 #include "inspircd_version.h"
 #include <signal.h>
 
-#ifndef WIN32
+#ifndef _WIN32
        #include <dirent.h>
        #include <unistd.h>
        #include <sys/resource.h>
 
        #include <pwd.h> // setuid
        #include <grp.h> // setgid
+#else
+       WORD g_wOriginalColors;
+       WORD g_wBackgroundColor;
+       HANDLE g_hStdout;
 #endif
 
 #include <fstream>
+#include <iostream>
 #include "xline.h"
 #include "bancache.h"
 #include "socketengine.h"
@@ -58,7 +63,6 @@
 #include "testsuite.h"
 
 InspIRCd* ServerInstance = NULL;
-int* mysig = NULL;
 
 /** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
  * if it must.
@@ -114,7 +118,7 @@ void InspIRCd::Cleanup()
        ports.clear();
 
        /* Close all client sockets, or the new process inherits them */
-       std::vector<LocalUser*>::reverse_iterator i = Users->local_users.rbegin();
+       LocalUserList::reverse_iterator i = Users->local_users.rbegin();
        while (i != this->Users->local_users.rend())
        {
                User* u = *i++;
@@ -163,9 +167,9 @@ void InspIRCd::Restart(const std::string &reason)
 
        char** argv = Config->cmdline.argv;
 
-#ifdef WINDOWS
+#ifdef _WIN32
        char module[MAX_PATH];
-       if (GetModuleFileName(NULL, module, MAX_PATH))
+       if (GetModuleFileNameA(NULL, module, MAX_PATH))
                me = module;
 #else
        me = argv[0];
@@ -195,29 +199,26 @@ void InspIRCd::ResetMaxBans()
 void InspIRCd::RehashUsersAndChans()
 {
        user_hash* old_users = Users->clientlist;
-       user_hash* old_uuid  = Users->uuidlist;
-       chan_hash* old_chans = chanlist;
-
-       Users->clientlist = new user_hash();
-       Users->uuidlist = new user_hash();
-       chanlist = new chan_hash();
-
+       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_users;
-       delete old_uuid;
        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 (std::vector<LocalUser*>::const_iterator i = Users->local_users.begin(); i != Users->local_users.end(); i++)
+       for (LocalUserList::const_iterator i = Users->local_users.begin(); i != Users->local_users.end(); i++)
        {
                (**i).already_sent = 0;
                (**i).RemoveExpiredInvites();
@@ -226,7 +227,7 @@ void InspIRCd::RehashUsersAndChans()
 
 void InspIRCd::SetSignals()
 {
-#ifndef WIN32
+#ifndef _WIN32
        signal(SIGALRM, SIG_IGN);
        signal(SIGHUP, InspIRCd::SetSignal);
        signal(SIGPIPE, SIG_IGN);
@@ -238,17 +239,24 @@ void InspIRCd::SetSignals()
 }
 
 void InspIRCd::QuickExit(int status)
+{
+       exit(status);
+}
+
+// Required for returning the proper value of EXIT_SUCCESS for the parent process
+static void VoidSignalHandler(int signalreceived)
 {
        exit(0);
 }
 
 bool InspIRCd::DaemonSeed()
 {
-#ifdef WINDOWS
-       printf_c("InspIRCd Process ID: \033[1;32m%lu\033[0m\n", GetCurrentProcessId());
+#ifdef _WIN32
+       std::cout << "InspIRCd Process ID: " << con_green << GetCurrentProcessId() << con_reset << std::endl;
        return true;
 #else
-       signal(SIGTERM, InspIRCd::QuickExit);
+       // Do not use QuickExit here: It will exit with status SIGTERM which would break e.g. daemon scripts
+       signal(SIGTERM, VoidSignalHandler);
 
        int childpid;
        if ((childpid = fork ()) < 0)
@@ -267,7 +275,7 @@ bool InspIRCd::DaemonSeed()
                exit(0);
        }
        setsid ();
-       printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
+       std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
 
        signal(SIGTERM, InspIRCd::SetSignal);
 
@@ -288,9 +296,10 @@ bool InspIRCd::DaemonSeed()
 
 void InspIRCd::WritePID(const std::string &filename)
 {
+#ifndef _WIN32
        std::string fname(filename);
        if (fname.empty())
-               fname = "data/inspircd.pid";
+               fname = DATA_PATH "/inspircd.pid";
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -299,14 +308,15 @@ void InspIRCd::WritePID(const std::string &filename)
        }
        else
        {
-               printf("Failed to write PID-file '%s', exiting.\n",fname.c_str());
+               std::cout << "Failed to write PID-file '" << fname << "', exiting." << std::endl;
                this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
                Exit(EXIT_STATUS_PID);
        }
+#endif
 }
 
 InspIRCd::InspIRCd(int argc, char** argv) :
-        ConfigFileName("conf/inspircd.conf"),
+        ConfigFileName(CONFIG_PATH "/inspircd.conf"),
 
         /* Functor pointer initialisation.
          *
@@ -324,14 +334,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
         FloodQuitUser(&HandleFloodQuitUser),
         OnCheckExemption(&HandleOnCheckExemption)
 {
-#ifdef WIN32
-       // Strict, frequent checking of memory on debug builds
-       _CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
-
-       // Avoid erroneous frees on early exit
-       WindowsIPC = 0;
-#endif
-
        ServerInstance = this;
 
        Extensions.Register(&NICKForced);
@@ -359,6 +361,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Modes = 0;
        this->Res = 0;
        this->ConfigThread = NULL;
+       this->FakeClient = NULL;
 
        UpdateTime();
        this->startup_time = TIME.tv_sec;
@@ -378,8 +381,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        // Create base manager classes early, so nothing breaks
        this->Users = new UserManager;
 
-       this->Users->unregistered_count = 0;
-
        this->Users->clientlist = new user_hash();
        this->Users->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
@@ -396,7 +397,25 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Config->cmdline.argv = argv;
        this->Config->cmdline.argc = argc;
 
+#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[] =
        {
@@ -412,7 +431,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        };
 
        int index;
-       while ((c = getopt_long(argc, argv, ":f:", longopts, &index)) != -1)
+       while ((c = getopt_long(argc, argv, ":c:f:", longopts, &index)) != -1)
        {
                switch (c)
                {
@@ -431,8 +450,9 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                                /* Unknown parameter */
                        default:
                                /* Fall through to handle other weird values too */
-                               printf("Unknown parameter '%s'\n", argv[optind-1]);
-                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>]\n%*s[--runasroot] [--version] [--config <config>] [--testsuite]\n", argv[0], static_cast<int>(8+strlen(argv[0])), " ");
+                               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;
                }
@@ -443,31 +463,21 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        if (do_version)
        {
-               printf("\n%s r%s\n", VERSION, REVISION);
+               std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
                Exit(EXIT_STATUS_NOERROR);
        }
 
-#ifdef WIN32
-
-       // Handle forking
-       if(!do_nofork)
-       {
-               DWORD ExitCode = WindowsForkStart();
-               if(ExitCode)
-                       exit(ExitCode);
-       }
-
+#ifdef _WIN32
        // Set up winsock
        WSADATA wsadata;
-       WSAStartup(MAKEWORD(2,0), &wsadata);
-       ChangeWindowsSpecificPointers();
+       WSAStartup(MAKEWORD(2,2), &wsadata);
 #endif
 
        /* Set the finished argument values */
-       Config->cmdline.nofork = do_nofork;
-       Config->cmdline.forcedebug = do_debug;
+       Config->cmdline.nofork = (do_nofork != 0);
+       Config->cmdline.forcedebug = (do_debug != 0);
        Config->cmdline.writelog = !do_nolog;
-       Config->cmdline.TestSuite = do_testsuite;
+       Config->cmdline.TestSuite = (do_testsuite != 0);
 
        if (do_debug)
        {
@@ -477,13 +487,13 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        }
        else if (!this->OpenLog(argv, argc))
        {
-               printf("ERROR: Could not open initial logfile %s: %s\n\n", Config->cmdline.startup_log.c_str(), strerror(errno));
+               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
+#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");
@@ -495,35 +505,38 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                else
 #endif
                {
-                       printf("ERROR: Cannot open config file: %s\nExiting...\n", ConfigFileName.c_str());
+                       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);
                }
        }
 
-       printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
-       printf_c("(C) InspIRCd Development Team.\033[0m\n\n");
-       printf_c("Developers:\n");
-       printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, peavey\n");
-       printf_c("\t\033[1;32maquanight, psychon, dz, danieldg, jackmcbarn\033[0m\n\n");
-       printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
+       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
        {
-               printf("* WARNING * WARNING * WARNING * WARNING * WARNING * \n\n");
-               printf("YOU ARE RUNNING INSPIRCD AS ROOT. THIS IS UNSUPPORTED\n");
-               printf("AND IF YOU ARE HACKED, CRACKED, SPINDLED OR MUTILATED\n");
-               printf("OR ANYTHING ELSE UNEXPECTED HAPPENS TO YOU OR YOUR\n");
-               printf("SERVER, THEN IT IS YOUR OWN FAULT. IF YOU DID NOT MEAN\n");
-               printf("TO START INSPIRCD AS ROOT, HIT CTRL+C NOW AND RESTART\n");
-               printf("THE PROGRAM AS A NORMAL USER. YOU HAVE BEEN WARNED!\n");
-               printf("\nInspIRCd starting in 20 seconds, ctrl+c to abort...\n");
+               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);
        }
+#endif
 
        this->SetSignals();
 
@@ -531,7 +544,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        {
                if (!this->DaemonSeed())
                {
-                       printf("ERROR: could not go into daemon mode. Shutting down.\n");
+                       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);
                }
@@ -577,7 +590,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        int bounditems = BindPorts(pl);
 
-       printf("\n");
+       std::cout << std::endl;
 
        this->Modules->LoadAll();
 
@@ -587,26 +600,26 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        if (!pl.empty())
        {
-               printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n",
-                       bounditems, bounditems + (int)pl.size());
-               printf("The following port(s) failed to bind:\n");
-               printf("Hint: Try using a public IP instead of blank or *\n\n");
+               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++)
                {
-                       printf("%d.\tAddress: %s\tReason: %s\n", j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());
+                       std::cout << j << ".\tAddress: " << (i->first.empty() ? "<all>" : i->first) << " \tReason: " << i->second << std::endl;
                }
+
+               std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl;
        }
 
-       printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n",
-               Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds());
+       std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SE->GetMaxFds() << " max open sockets" << std::endl;
 
-#ifndef WINDOWS
+#ifndef _WIN32
        if (!Config->cmdline.nofork)
        {
                if (kill(getppid(), SIGTERM) == -1)
                {
-                       printf("Error killing parent process: %s\n",strerror(errno));
+                       std::cout << "Error killing parent process: " << strerror(errno) << std::endl;
                        Logs->Log("STARTUP", DEFAULT, "Error killing parent process: %s",strerror(errno));
                }
        }
@@ -623,18 +636,17 @@ InspIRCd::InspIRCd(int argc, char** argv) :
         */
        if ((!do_nofork) && (!do_testsuite) && (!Config->cmdline.forcedebug))
        {
-               int fd;
+               int fd = open("/dev/null", O_RDWR);
 
                fclose(stdin);
                fclose(stderr);
                fclose(stdout);
 
-               fd = open("/dev/null", O_RDWR);
-               if (dup2(fd, 0) < 0)
+               if (dup2(fd, STDIN_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdin.");
-               if (dup2(fd, 1) < 0)
+               if (dup2(fd, STDOUT_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stdout.");
-               if (dup2(fd, 2) < 0)
+               if (dup2(fd, STDERR_FILENO) < 0)
                        Logs->Log("STARTUP", DEFAULT, "Failed to dup /dev/null to stderr.");
                close(fd);
        }
@@ -643,19 +655,21 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                Logs->Log("STARTUP", DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
        }
 #else
-       WindowsIPC = new IPC;
-       if(!Config->cmdline.nofork)
+       /* Set win32 service as running, if we are running as a service */
+       SetServiceRunning();
+
+       // Handle forking
+       if(!do_nofork)
        {
-               WindowsForkKillOwner();
                FreeConsole();
        }
-       /* Set win32 service as running, if we are running as a service */
-       SetServiceRunning();
+
+       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
+#ifndef _WIN32
        std::string SetUser = Config->ConfValue("security")->getString("runasuser");
        std::string SetGroup = Config->ConfValue("security")->getString("runasgroup");
        if (!SetGroup.empty())
@@ -679,7 +693,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (!g)
                {
-                       this->Logs->Log("SETGUID", DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("SETGUID", DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
                        this->QuickExit(0);
                }
 
@@ -687,7 +701,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (ret == -1)
                {
-                       this->Logs->Log("SETGUID", DEFAULT, "setgid() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("SETGUID", DEFAULT, "setgid() failed (wrong group?): %s", strerror(errno));
                        this->QuickExit(0);
                }
        }
@@ -702,7 +716,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (!u)
                {
-                       this->Logs->Log("SETGUID", DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("SETGUID", DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
                        this->QuickExit(0);
                }
 
@@ -710,24 +724,32 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (ret == -1)
                {
-                       this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (wrong user?): %s", strerror(errno));
                        this->QuickExit(0);
                }
        }
-#endif
 
        this->WritePID(Config->PID);
+#endif
 }
 
 void InspIRCd::UpdateTime()
 {
-#ifdef HAS_CLOCK_GETTIME
-       clock_gettime(CLOCK_REALTIME, &TIME);
+#ifdef _WIN32
+       SYSTEMTIME st;
+       GetSystemTime(&st);
+
+       TIME.tv_sec = time(NULL);
+       TIME.tv_nsec = st.wMilliseconds;
 #else
-       struct timeval tv;
-       gettimeofday(&tv, NULL);
-       TIME.tv_sec = tv.tv_sec;
-       TIME.tv_nsec = tv.tv_usec * 1000;
+       #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
 #endif
 }
 
@@ -746,12 +768,8 @@ int InspIRCd::Run()
 
        while (true)
        {
-#ifndef WIN32
+#ifndef _WIN32
                static rusage ru;
-#else
-               static time_t uptime;
-               static struct tm * stime;
-               static char window_title[100];
 #endif
 
                /* Check if there is a config thread which has finished executing but has not yet been freed */
@@ -776,24 +794,34 @@ int InspIRCd::Run()
                 */
                if (TIME.tv_sec != OLDTIME)
                {
-                       OLDTIME = TIME.tv_sec;
-#ifndef WIN32
+#ifndef _WIN32
                        getrusage(RUSAGE_SELF, &ru);
                        stats->LastSampled = TIME;
                        stats->LastCPU = ru.ru_utime;
 #else
-                       WindowsIPC->Check();
+                       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
 
                        /* 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);
+                               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);
+                               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)
                        {
@@ -825,10 +853,10 @@ int InspIRCd::Run()
                GlobalCulls.Apply();
                AtomicActions.Run();
 
-               if (this->s_signal)
+               if (s_signal)
                {
                        this->SignalHandler(s_signal);
-                       this->s_signal = 0;
+                       s_signal = 0;
                }
        }
 
@@ -852,9 +880,11 @@ bool InspIRCd::AllModulesReportReady(LocalUser* user)
        return (res == MOD_RES_PASSTHRU);
 }
 
+sig_atomic_t InspIRCd::s_signal = 0;
+
 void InspIRCd::SetSignal(int signal)
 {
-       *mysig = signal;
+       s_signal = signal;
 }
 
 /* On posix systems, the flow of the program starts right here, with
@@ -866,7 +896,6 @@ void InspIRCd::SetSignal(int signal)
 ENTRYPOINT
 {
        new InspIRCd(argc, argv);
-       mysig = &ServerInstance->s_signal;
        ServerInstance->Run();
        delete ServerInstance;
        return 0;