]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
+ Added an *almost* unix-like fork system for windows. Insp will create a secondary...
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 7390661dd119e17cc51a040089b0750a50acb544..779061e833e005907eaa118658ae4dcbbc342aa7 100644 (file)
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
+#ifndef WIN32
+
 #include <dirent.h>
+#include <unistd.h>
+#include <sys/resource.h>
+
+/* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */  
+#ifndef RUSAGE_SELF
+#define RUSAGE_SELF 0
+#endif
+
+#endif
 #include <exception>
 #include <fstream>
-#include <unistd.h>
 #include "modules.h"
 #include "mode.h"
 #include "xline.h"
 #include "typedefs.h"
 #include "command_parse.h"
 #include "exitcodes.h"
+
+#ifndef WIN32
 #include <dlfcn.h>
 #include <getopt.h>
+#else
+static DWORD owner_processid = 0;
+
+bool WindowsForkStart(InspIRCd * Instance)
+{
+       /* Windows implementation of fork() :P */
+       // Build the command line arguments.
+       string command_line;
+       for(int i = 0; i < Instance->Config->argc; ++i)
+               command_line += Instance->Config->argv[i];
+
+       char module[MAX_PATH];
+       if(!GetModuleFileName(NULL, module, MAX_PATH))
+               return false;
+
+       STARTUPINFO startupinfo;
+       PROCESS_INFORMATION procinfo;
+       ZeroMemory(&startupinfo, sizeof(STARTUPINFO));
+       ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION));
+
+       // Fill in the startup info struct
+       GetStartupInfo(&startupinfo);
+
+       // Create the "startup" event
+       HANDLE fork_event = CreateEvent(0, TRUE, FALSE, "InspStartup");
+       if(!fork_event)
+       {
+               printf("CreateEvent: %s\n", dlerror());
+               return false;
+       }
+
+       // Launch our "forked" process.
+       BOOL bSuccess = CreateProcess ( module, module, 
+               0,                                                                      // PROCESS_SECURITY_ATTRIBUTES
+               0,                                                                      // THREAD_SECURITY_ATTRIBUTES
+               TRUE,                                                           // We went to inherit handles.
+               CREATE_SUSPENDED |                                      // Suspend the primary thread of the new process
+               CREATE_PRESERVE_CODE_AUTHZ_LEVEL,       // Allow us full access to the process
+               0,                                                                      // ENVIRONMENT
+               0,                                                                      // CURRENT_DIRECTORY
+               &startupinfo,                                           // startup info
+               &procinfo);                                                     // process info
+
+       if(!bSuccess)
+               return false;
+
+       // Set the owner process id in the target process.
+       SIZE_T written = 0;
+       DWORD pid = GetCurrentProcessId();
+       if(!WriteProcessMemory(procinfo.hProcess, &owner_processid, &pid, sizeof(DWORD), &written) || written != sizeof(DWORD))
+               return false;
+
+       // Resume the other thread (let it start)
+       ResumeThread(procinfo.hThread);
+
+       // Wait for the new process to kill us. If there is some error, the new process will end and we will end up at the next line.
+       WaitForSingleObject(procinfo.hProcess, INFINITE);
+
+       // If we hit this it means startup failed. :(
+       return true;
+}
 
+void WindowsForkKillOwner(InspIRCd * Instance)
+{
+       HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid);
+       if(!hProcess || !owner_processid)
+               exit(1);
+
+       // die die die
+       if(!TerminateProcess(hProcess, 0))
+               exit(1);
+
+       CloseHandle(hProcess);
+}
+
+#endif
 
 using irc::sockets::NonBlocking;
 using irc::sockets::Blocking;
@@ -39,32 +126,64 @@ using irc::sockets::insp_sockaddr;
 
 InspIRCd* SI = NULL;
 
+/* Burlex: Moved from exitcodes.h -- due to duplicate symbols */
+const char* ExitCodes[] =
+{
+               "No error", /* 0 */
+               "DIE command", /* 1 */
+               "execv() failed", /* 2 */
+               "Internal error", /* 3 */
+               "Config file error", /* 4 */
+               "Logfile error", /* 5 */
+               "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 */
+               "", /* 14 */
+               "Received SIGTERM", /* 15 */
+};
+
 void InspIRCd::AddServerName(const std::string &servername)
 {
-       if(find(servernames.begin(), servernames.end(), servername) == servernames.end())
-               servernames.push_back(servername); /* Wasn't already there. */
+       servernamelist::iterator itr = servernames.begin();
+       for(; itr != servernames.end(); ++itr)
+               if(**itr == servername)
+                       return;
+
+       string * ns = new string(servername);
+       servernames.push_back(ns);
 }
 
 const char* InspIRCd::FindServerNamePtr(const std::string &servername)
 {
-       servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
-
-       if(iter == servernames.end())
-       {
-               AddServerName(servername);
-               iter = --servernames.end();
-       }
-
-       return iter->c_str();
+       servernamelist::iterator itr = servernames.begin();
+       for(; itr != servernames.end(); ++itr)
+               if(**itr == servername)
+                       return (*itr)->c_str();
+
+       servernames.push_back(new string(servername));
+       itr = --servernames.end();
+       return (*itr)->c_str();
 }
 
 bool InspIRCd::FindServerName(const std::string &servername)
 {
-       return (find(servernames.begin(), servernames.end(), servername) != servernames.end());
+       servernamelist::iterator itr = servernames.begin();
+       for(; itr != servernames.end(); ++itr)
+               if(**itr == servername)
+                       return true;
+       return false;
 }
 
 void InspIRCd::Exit(int status)
 {
+#ifdef WINDOWS
+       CloseIPC();
+#endif
        if (SI)
        {
                SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
@@ -78,13 +197,13 @@ void InspIRCd::Cleanup()
        std::vector<std::string> mymodnames;
        int MyModCount = this->GetModuleCount();
 
-       for (unsigned int i = 0; i < stats->BoundPortCount; i++)
+       for (unsigned int i = 0; i < Config->ports.size(); i++)
        {
                /* This calls the constructor and closes the listening socket */
-               delete Config->openSockfd[i];
-               Config->openSockfd[i] = NULL;
+               delete Config->ports[i];
        }
-       stats->BoundPortCount = 0;
+
+       Config->ports.clear();
 
        /* Close all client sockets, or the new process inherits them */
        for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
@@ -112,6 +231,15 @@ void InspIRCd::Cleanup()
 
        /* Close logging */
        this->Logger->Close();
+
+       /* Cleanup Server Names */
+       for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
+               delete (*itr);
+
+#ifdef WINDOWS
+       /* WSACleanup */
+       WSACleanup();
+#endif
 }
 
 void InspIRCd::Restart(const std::string &reason)
@@ -124,27 +252,17 @@ void InspIRCd::Restart(const std::string &reason)
        this->Cleanup();
 
        /* Figure out our filename (if theyve renamed it, we're boned) */
-       std::string me = Config->MyDir + "/inspircd";
-
-       char* argv[10];
-       int endp = 2;
-       argv[0] = Config->argv[0];
-       argv[1] = "--restart";
-       if (Config->forcedebug)
-               argv[endp++] = "--debug";
-       if (Config->nofork)
-               argv[endp++] = "--nofork";
-       if (!Config->writelog)
-               argv[endp++] = "--nolog";
-       if (*this->LogFileName)
-       {
-               argv[endp++] = "--logfile";
-               argv[endp++] = this->LogFileName;
-       }
+       std::string me;
 
-       argv[endp] = NULL;
+#ifdef WINDOWS
+       char module[MAX_PATH];
+       if (GetModuleFileName(NULL, module, MAX_PATH))
+               me = module;
+#else
+       me = Config->MyDir + "/inspircd";
+#endif
 
-       if (execv(me.c_str(), argv) == -1)
+       if (execv(me.c_str(), Config->argv) == -1)
        {
                /* Will raise a SIGABRT if not trapped */
                throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
@@ -153,10 +271,10 @@ void InspIRCd::Restart(const std::string &reason)
 
 void InspIRCd::Start()
 {
-       printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
-       printf("(C) InspIRCd Development Team.\033[0m\n\n");
-       printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey\033[0m\n");
-       printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
+       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:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey, Burlex\033[0m\n");
+       printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
 }
 
 void InspIRCd::Rehash(int status)
@@ -169,8 +287,8 @@ void InspIRCd::Rehash(int status)
        SI->Config->Read(false,NULL);
        SI->ResetMaxBans();
        SI->Res->Rehash();
-       SI->BuildISupport();
        FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
+       SI->BuildISupport();
 }
 
 void InspIRCd::ResetMaxBans()
@@ -213,11 +331,13 @@ void InspIRCd::CloseLog()
 
 void InspIRCd::SetSignals()
 {
+#ifndef WIN32
        signal(SIGALRM, SIG_IGN);
        signal(SIGHUP, InspIRCd::Rehash);
        signal(SIGPIPE, SIG_IGN);
-       signal(SIGTERM, InspIRCd::Exit);
        signal(SIGCHLD, SIG_IGN);
+#endif
+       signal(SIGTERM, InspIRCd::Exit);
 }
 
 void InspIRCd::QuickExit(int status)
@@ -227,6 +347,11 @@ void InspIRCd::QuickExit(int status)
 
 bool InspIRCd::DaemonSeed()
 {
+#ifdef WINDOWS
+       return true;
+#else
+       signal(SIGTERM, InspIRCd::QuickExit);
+
        int childpid;
        if ((childpid = fork ()) < 0)
                return false;
@@ -239,7 +364,6 @@ bool InspIRCd::DaemonSeed()
                 * if the child pid is still around. If theyre not,
                 * they threw an error and we should give up.
                 */
-               signal(SIGTERM, InspIRCd::QuickExit);
                while (kill(childpid, 0) != -1)
                        sleep(1);
                exit(0);
@@ -248,6 +372,8 @@ bool InspIRCd::DaemonSeed()
        umask (007);
        printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
 
+       signal(SIGTERM, InspIRCd::Exit);
+
        rlimit rl;
        if (getrlimit(RLIMIT_CORE, &rl) == -1)
        {
@@ -262,6 +388,7 @@ bool InspIRCd::DaemonSeed()
        }
 
        return true;
+#endif
 }
 
 void InspIRCd::WritePID(const std::string &filename)
@@ -297,15 +424,17 @@ std::string InspIRCd::GetRevision()
 }
 
 InspIRCd::InspIRCd(int argc, char** argv)
-       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365), GlobalCulls(this)
+       : ModCount(-1), GlobalCulls(this)
 {
        int found_ports = 0;
        FailedPortList pl;
-       int do_nofork = 0, do_debug = 0, do_nolog = 0, do_restart = 0;    /* flag variables */
+       int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0;    /* flag variables */
        char c = 0;
 
        modules.resize(255);
        factory.resize(255);
+       memset(&server, 0, sizeof(server));
+       memset(&client, 0, sizeof(client));
 
        this->unregistered_count = 0;
 
@@ -317,10 +446,11 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Config->argv = argv;
        this->Config->argc = argc;
 
+       chdir(Config->GetFullProgDir().c_str());
+
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
        this->SNO = new SnomaskManager(this);
-       this->Start();
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
        this->next_call = this->TIME + 3;
@@ -331,12 +461,13 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        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       },
-               { "restart",    no_argument,            &do_restart,    1       },
+               { "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       },
                { 0, 0, 0, 0 }
        };
 
@@ -359,12 +490,32 @@ InspIRCd::InspIRCd(int argc, char** argv)
                        break;
                        default:
                                /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */
-                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>] [--restart]\n", argv[0]);
+                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>] [--runasroot] [--version] [--config <config>]\n", argv[0]);
                                Exit(EXIT_STATUS_ARGV);
                        break;
                }
        }
 
+       if (do_version)
+       {
+               printf("\n%s r%s\n", VERSION, REVISION);
+               Exit(EXIT_STATUS_NOERROR);
+       }
+
+#ifdef WIN32
+
+       // Handle forking
+       if(!do_nofork && !owner_processid)
+       {
+               if(WindowsForkStart(this))
+                       Exit(0);
+       }
+
+       // Set up winsock
+       WSADATA wsadata;
+       WSAStartup(MAKEWORD(2,0), &wsadata);
+
+#endif
        if (!ServerConfig::FileExists(this->ConfigFileName))
        {
                printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
@@ -372,6 +523,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
                Exit(EXIT_STATUS_CONFIG);
        }
 
+       this->Start();
+
        /* Set the finished argument values */
        Config->nofork = do_nofork;
        Config->forcedebug = do_debug;
@@ -380,25 +533,29 @@ InspIRCd::InspIRCd(int argc, char** argv)
        strlcpy(Config->MyExecutable,argv[0],MAXBUF);
 
        this->OpenLog(argv, argc);
+
        this->stats = new serverstats();
        this->Timers = new TimerManager(this);
        this->Parser = new CommandParser(this);
        this->XLines = new XLineManager(this);
        Config->ClearStack();
        Config->Read(true, NULL);
-       this->CheckRoot();
-       this->Modes = new ModeParser(this);
-       this->AddServerName(Config->ServerName);
-       CheckDie();
-       InitializeDisabledCommands(Config->DisabledCommands, this);
-       stats->BoundPortCount = BindPorts(true, found_ports, pl);
-
-       for(int t = 0; t < 255; t++)
-               Config->global_implementation[t] = 0;
 
-       memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+       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");
+               sleep(20);
+       }
 
-       printf("\n");
        this->SetSignals();
 
        if (!Config->nofork)
@@ -411,6 +568,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
        }
 
+
        /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
         * initialize the socket engine.
         */
@@ -418,56 +576,77 @@ InspIRCd::InspIRCd(int argc, char** argv)
        SE = SEF->Create(this);
        delete SEF;
 
+       this->Modes = new ModeParser(this);
+       this->AddServerName(Config->ServerName);
+       CheckDie();
+       int bounditems = BindPorts(true, found_ports, pl);
+
+       for(int t = 0; t < 255; t++)
+               Config->global_implementation[t] = 0;
+
+       memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+
+       printf("\n");
+
        this->Res = new DNS(this);
 
        this->LoadAllModules();
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
+       InitializeDisabledCommands(Config->DisabledCommands, this);
 
-       if ((stats->BoundPortCount == 0) && (found_ports > 0))
+       if ((Config->ports.size() == 0) && (found_ports > 0))
        {
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
                Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");
                Exit(EXIT_STATUS_BIND);
        }
 
-       if (stats->BoundPortCount != (unsigned int)found_ports)
+       if (Config->ports.size() != (unsigned int)found_ports)
        {
-               printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
-               printf("The following port%s failed to bind:\n", found_ports - stats->BoundPortCount != 1 ? "s" : "");
+               printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports);
+               printf("The following port(s) failed to bind:\n");
                int j = 1;
                for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
                {
                        printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
                }
        }
-
-       /* Add the listening sockets used for client inbound connections
-        * to the socket engine
-        */
-       for (unsigned long count = 0; count < stats->BoundPortCount; count++)
+#ifndef WINDOWS
+       if (!Config->nofork)
        {
-               if (!SE->AddFd(Config->openSockfd[count]))
+               if (kill(getppid(), SIGTERM) == -1)
                {
-                       printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
-                       Log(DEFAULT,"EH? Could not add listener to socketengine. You screwed up, aborting.");
-                       Exit(EXIT_STATUS_INTERNAL);
+                       printf("Error killing parent process: %s\n",strerror(errno));
+                       Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
                }
        }
 
-       if (!Config->nofork && !do_restart)
+       if (isatty(0) && isatty(1) && isatty(2))
        {
-               if (kill(getppid(), SIGTERM) == -1)
+               /* We didn't start from a TTY, we must have started from a background process -
+                * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont
+                * close stdin/stdout
+                */
+               if (!do_nofork)
                {
-                       printf("Error killing parent process: %s\n",strerror(errno));
-                       Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
+                       fclose(stdin);
+                       fclose(stderr);
+                       fclose(stdout);
+               }
+               else
+               {
+                       Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
                }
-
-               fclose(stdin);
-               fclose(stderr);
-               fclose(stdout);
        }
-
+#else
+       InitIPC();
+       if(!Config->nofork)
+       {
+               WindowsForkKillOwner(this);
+               FreeConsole();
+       }
+#endif
        printf("\nInspIRCd is now running!\n");
        Log(DEFAULT,"Startup complete.");
 
@@ -478,6 +657,7 @@ std::string InspIRCd::GetVersionString()
 {
        char versiondata[MAXBUF];
        char dnsengine[] = "singlethread-object";
+
        if (*Config->CustomVersion)
        {
                snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
@@ -529,8 +709,8 @@ void InspIRCd::EraseModule(int j)
        {
                if (v2 == j)
                {
-                      Config->module_names.erase(v);
-                      break;
+                       Config->module_names.erase(v);
+                       break;
                }
                v2++;
        }
@@ -618,9 +798,9 @@ void InspIRCd::BuildISupport()
 {
        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
-       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES-1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
        v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-       v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
+       v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
        Config->data005 = v.str();
        FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
        Config->Update005();
@@ -705,8 +885,8 @@ bool InspIRCd::LoadModule(const char* filename)
        {
                int n_match = 0;
                DIR* library = opendir(Config->ModPath);
-               if (library)
-               {
+               if (library)
+               {
                        /* Try and locate and load all modules matching the pattern */
                        dirent* entry = NULL;
                        while ((entry = readdir(library)))
@@ -793,14 +973,14 @@ bool InspIRCd::LoadModule(const char* filename)
                        }
                        else
                        {
-                                       this->Log(DEFAULT,"Unable to load %s",modfile);
+                               this->Log(DEFAULT,"Unable to load %s",modfile);
                                snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
                                return false;
                        }
                }
                catch (CoreException& modexcept)
                {
-                       this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
+                       this->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason());
                        snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                        return false;
                }
@@ -844,7 +1024,13 @@ bool InspIRCd::LoadModule(const char* filename)
 
 void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
+#ifndef WIN32
        static rusage ru;
+#else
+       static time_t uptime;
+       static struct tm * stime;
+       static char window_title[100];
+#endif
 
        /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
         * Once per loop iteration is pleanty.
@@ -875,12 +1061,25 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                        FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
                        Timers->TickMissedTimers(TIME);
                }
-
-               if (!getrusage(0, &ru))
+#ifndef WIN32
+               /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */
+               if (!getrusage(RUSAGE_SELF, &ru))
                {
                        gettimeofday(&this->stats->LastSampled, NULL);
                        this->stats->LastCPU = ru.ru_utime;
                }
+#else
+               CheckIPC(this);
+
+               if(Config->nofork)
+               {
+                       uptime = Time() - startup_time;
+                       stime = gmtime(&uptime);
+                       snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u",
+                               LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec);
+                       SetConsoleTitle(window_title);
+               }
+#endif
        }
 
        /* Call the socket engine to wait on the active
@@ -895,29 +1094,16 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
        /* if any users was quit, take them out */
        GlobalCulls.Apply();
 
-}
-
-bool InspIRCd::IsIdent(const char* n)
-{
-       if (!n || !*n)
-               return false;
-
-       for (char* i = (char*)n; *i; i++)
+       /* If any inspsockets closed, remove them */
+       for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
        {
-               if ((*i >= 'A') && (*i <= '}'))
-               {
-                       continue;
-               }
-               if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
-               {
-                       continue;
-               }
-               return false;
+               SE->DelFd(x->second);
+               x->second->Close();
+               delete x->second;
        }
-       return true;
+       SocketCull.clear();
 }
 
-
 int InspIRCd::Run()
 {
        while (true)
@@ -1026,6 +1212,9 @@ void FileLogger::WriteLogLine(const std::string &line)
        if (log)
        {
                int written = fprintf(log,"%s",buffer.c_str());
+#ifdef WINDOWS
+               buffer = "";
+#else
                if ((written >= 0) && (written < (int)buffer.length()))
                {
                        buffer.erase(0, buffer.length());
@@ -1041,7 +1230,7 @@ void FileLogger::WriteLogLine(const std::string &line)
                        /* Wrote the whole buffer, and no need for write callback */
                        buffer = "";
                }
-
+#endif
                if (writeops++ % 20)
                {
                        fflush(log);
@@ -1053,12 +1242,18 @@ void FileLogger::Close()
 {
        if (log)
        {
+               /* Burlex: Windows assumes nonblocking on FILE* pointers anyway, and also "file" fd's aren't the same
+                * as socket fd's. */
+#ifndef WIN32
                int flags = fcntl(fileno(log), F_GETFL, 0);
                fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
+#endif
                if (buffer.size())
                        fprintf(log,"%s",buffer.c_str());
 
+#ifndef WINDOWS
                ServerInstance->SE->DelFd(this);
+#endif
 
                fflush(log);
                fclose(log);