]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Add factories for other types
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 1df8c280b5e646d845e2ecf652aa894ede4c6901..2f00b9f2e7cb3e5278a1a3c955ed57d9a9ab26d7 100644 (file)
@@ -6,13 +6,14 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+/* $Install: src/inspircd $(BINPATH) */
+
 #include "inspircd.h"
-#include "configreader.h"
 #include <signal.h>
 
 #ifndef WIN32
        #endif
 #endif
 
-#include <exception>
 #include <fstream>
-#include "modules.h"
-#include "mode.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "inspircd_se_config.h"
 #include "socket.h"
-#include "typedefs.h"
 #include "command_parse.h"
 #include "exitcodes.h"
+#include "caller.h"
 
-#ifdef WIN32
-
-/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */
-static DWORD owner_processid = 0;
-
-DWORD WindowsForkStart(InspIRCd * Instance)
-{
-       /* Windows implementation of fork() :P */
-
-       char module[MAX_PATH];
-       if(!GetModuleFileName(NULL, module, MAX_PATH))
-       {
-               printf("GetModuleFileName() failed.\n");
-               return false;
-       }
-
-       STARTUPINFO startupinfo;
-       PROCESS_INFORMATION procinfo;
-       ZeroMemory(&startupinfo, sizeof(STARTUPINFO));
-       ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION));
-
-       // Fill in the startup info struct
-       GetStartupInfo(&startupinfo);
-
-       /* Default creation flags create the processes suspended */
-       DWORD startupflags = CREATE_SUSPENDED;
-
-       /* On windows 2003/XP and above, we can use the value
-        * CREATE_PRESERVE_CODE_AUTHZ_LEVEL which gives more access
-        * to the process which we may require on these operating systems.
-        */
-       OSVERSIONINFO vi;
-       vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-       GetVersionEx(&vi);
-       if ((vi.dwMajorVersion >= 5) && (vi.dwMinorVersion > 0))
-               startupflags |= CREATE_PRESERVE_CODE_AUTHZ_LEVEL;
-
-       // Launch our "forked" process.
-       BOOL bSuccess = CreateProcess ( module, // Module (exe) filename
-               strdup(GetCommandLine()),       // Command line (exe plus parameters from the OS)
-                                               // NOTE: We cannot return the direct value of the
-                                               // GetCommandLine function here, as the pointer is
-                                               // passed straight to the child process, and will be
-                                               // invalid once we exit as it goes out of context.
-                                               // strdup() seems ok, though.
-               0,                              // PROCESS_SECURITY_ATTRIBUTES
-               0,                              // THREAD_SECURITY_ATTRIBUTES
-               TRUE,                           // We went to inherit handles.
-               startupflags,                   // Allow us full access to the process and suspend it.
-               0,                              // ENVIRONMENT
-               0,                              // CURRENT_DIRECTORY
-               &startupinfo,                   // startup info
-               &procinfo);                     // process info
-
-       if(!bSuccess)
-       {
-               printf("CreateProcess() error: %s\n", dlerror());
-               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))
-       {
-               printf("WriteProcessMemory() failed: %s\n", dlerror());
-               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, default to 14 if this fails.
-       DWORD ExitCode = 14;
-       GetExitCodeProcess(procinfo.hProcess, &ExitCode);
-       CloseHandle(procinfo.hThread);
-       CloseHandle(procinfo.hProcess);
-       return ExitCode;
-}
-
-void WindowsForkKillOwner(InspIRCd * Instance)
-{
-       HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid);
-       if(!hProcess || !owner_processid)
-       {
-               printf("Could not open process id %u: %s.\n", owner_processid, dlerror());
-               Instance->Exit(14);
-       }
-
-       // die die die
-       if(!TerminateProcess(hProcess, 0))
-       {
-               printf("Could not TerminateProcess(): %s\n", dlerror());
-               Instance->Exit(14);
-       }
-
-       CloseHandle(hProcess);
-}
-
-#endif
-
-using irc::sockets::NonBlocking;
-using irc::sockets::Blocking;
 using irc::sockets::insp_ntoa;
 using irc::sockets::insp_inaddr;
 using irc::sockets::insp_sockaddr;
 
 InspIRCd* SI = NULL;
+int* mysig = NULL;
+
 
 /* Burlex: Moved from exitcodes.h -- due to duplicate symbols */
 const char* ExitCodes[] =
@@ -173,66 +67,24 @@ const char* ExitCodes[] =
                "Received SIGTERM", /* 15 */
 };
 
-void InspIRCd::AddServerName(const std::string &servername)
-{
-       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 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)
-{
-       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]) + ")");
-               SI->Cleanup();
-       }
-       exit (status);
-}
-
 void InspIRCd::Cleanup()
 {
        std::vector<std::string> mymodnames;
-       int MyModCount = this->GetModuleCount();
+       int MyModCount = this->Modules->GetCount();
 
-       for (unsigned int i = 0; i < Config->ports.size(); i++)
+       if (Config)
        {
-               /* This calls the constructor and closes the listening socket */
-               delete Config->ports[i];
-       }
+               for (unsigned int i = 0; i < Config->ports.size(); i++)
+               {
+                       /* This calls the constructor and closes the listening socket */
+                       delete Config->ports[i];
+               }
 
-       Config->ports.clear();
+               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++)
+       for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                (*i)->SetWriteError("Server shutdown");
                (*i)->CloseSocket();
@@ -244,28 +96,31 @@ void InspIRCd::Cleanup()
         */
        for (int tries = 0; tries < 3; tries++)
        {
-               MyModCount = this->GetModuleCount();
+               MyModCount = this->Modules->GetCount();
                mymodnames.clear();
 
-               /* Unload all modules, so they get a chance to clean up their listeners */
-               for (int j = 0; j <= MyModCount; j++)
-                       mymodnames.push_back(Config->module_names[j]);
+               if (MyModCount)
+               {
+                       /* Unload all modules, so they get a chance to clean up their listeners */
+                       for (int j = 0; j <= MyModCount; j++)
+                               mymodnames.push_back(Config->module_names[j]);
+
+                       for (int k = 0; k <= MyModCount; k++)
+                               this->Modules->Unload(mymodnames[k].c_str());
+               }
 
-               for (int k = 0; k <= MyModCount; k++)
-                       this->UnloadModule(mymodnames[k].c_str());
        }
 
        /* Close logging */
-       this->Logger->Close();
+       if (this->Logger)
+               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)
@@ -295,35 +150,12 @@ void InspIRCd::Restart(const std::string &reason)
        }
 }
 
-void InspIRCd::Start()
-{
-       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)
-{
-       SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(SI->ConfigFileName));
-       SI->CloseLog();
-       SI->OpenLog(SI->Config->argv, SI->Config->argc);
-       SI->RehashUsersAndChans();
-       FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
-       SI->Config->Read(false,NULL);
-       SI->ResetMaxBans();
-       SI->Res->Rehash();
-       FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
-       SI->BuildISupport();
-}
-
 void InspIRCd::ResetMaxBans()
 {
        for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++)
                i->second->ResetMaxBans();
 }
 
-
 /** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
  * we must occasionally rehash the hash (yes really).
  * We do this by copying the entries from the old hash to a new hash, causing all
@@ -334,9 +166,11 @@ void InspIRCd::ResetMaxBans()
 void InspIRCd::RehashUsersAndChans()
 {
        user_hash* old_users = this->clientlist;
+       user_hash* old_uuid  = this->uuidlist;
        chan_hash* old_chans = this->chanlist;
 
        this->clientlist = new user_hash();
+       this->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
 
        for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
@@ -344,6 +178,11 @@ void InspIRCd::RehashUsersAndChans()
 
        delete old_users;
 
+       for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++)
+               this->uuidlist->insert(*n);
+
+       delete old_uuid;
+
        for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
                this->chanlist->insert(*n);
 
@@ -352,18 +191,19 @@ void InspIRCd::RehashUsersAndChans()
 
 void InspIRCd::CloseLog()
 {
-       this->Logger->Close();
+       if (this->Logger)
+               this->Logger->Close();
 }
 
 void InspIRCd::SetSignals()
 {
 #ifndef WIN32
        signal(SIGALRM, SIG_IGN);
-       signal(SIGHUP, InspIRCd::Rehash);
+       signal(SIGHUP, InspIRCd::SetSignal);
        signal(SIGPIPE, SIG_IGN);
        signal(SIGCHLD, SIG_IGN);
 #endif
-       signal(SIGTERM, InspIRCd::Exit);
+       signal(SIGTERM, InspIRCd::SetSignal);
 }
 
 void InspIRCd::QuickExit(int status)
@@ -399,7 +239,7 @@ bool InspIRCd::DaemonSeed()
        umask (007);
        printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
 
-       signal(SIGTERM, InspIRCd::Exit);
+       signal(SIGTERM, InspIRCd::SetSignal);
 
        rlimit rl;
        if (getrlimit(RLIMIT_CORE, &rl) == -1)
@@ -445,42 +285,68 @@ void InspIRCd::WritePID(const std::string &filename)
        }
 }
 
-std::string InspIRCd::GetRevision()
-{
-       return REVISION;
-}
-
 InspIRCd::InspIRCd(int argc, char** argv)
-       : ModCount(-1), GlobalCulls(this)
+       : GlobalCulls(this),
+
+        /* Functor initialisation. Note that the ordering here is very important. */
+        HandleProcessUser(this),
+        HandleIsNick(this),
+        HandleIsIdent(this),
+        HandleFindDescriptor(this),
+        HandleFloodQuitUser(this),
+
+        /* Functor pointer initialisation. Must match the order of the list above */
+        ProcessUser(&HandleProcessUser),
+        IsNick(&HandleIsNick),
+        IsIdent(&HandleIsIdent),
+        FindDescriptor(&HandleFindDescriptor),
+        FloodQuitUser(&HandleFloodQuitUser)
+
 {
+
        int found_ports = 0;
        FailedPortList pl;
        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));
 
+       SocketEngineFactory* SEF = new SocketEngineFactory();
+       SE = SEF->Create(this);
+       delete SEF;
+
+       this->s_signal = 0;
+
        this->unregistered_count = 0;
 
        this->clientlist = new user_hash();
+       this->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
 
+
        this->Config = new ServerConfig(this);
+       this->SNO = new SnomaskManager(this);
+       this->Modules = new ModuleManager(this);
+       this->stats = new serverstats();
+       this->Timers = new TimerManager(this);
+       this->Parser = new CommandParser(this);
+       this->XLines = new XLineManager(this);
 
        this->Config->argv = argv;
        this->Config->argc = argc;
 
-       chdir(Config->GetFullProgDir().c_str());
+       if (chdir(Config->GetFullProgDir().c_str()))
+       {
+               printf("Unable to change to my directory: %s\nAborted.", strerror(errno));
+               exit(0);
+       }
 
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
-       this->SNO = new SnomaskManager(this);
+
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
-       this->next_call = this->TIME + 3;
        srand(this->TIME);
 
        *this->LogFileName = 0;
@@ -530,18 +396,27 @@ InspIRCd::InspIRCd(int argc, char** argv)
 #ifdef WIN32
 
        // Handle forking
-       if(!do_nofork && !owner_processid)
+       if(!do_nofork)
        {
                DWORD ExitCode = WindowsForkStart(this);
                if(ExitCode)
-                       Exit(ExitCode);
+                       exit(ExitCode);
        }
 
        // Set up winsock
        WSADATA wsadata;
        WSAStartup(MAKEWORD(2,0), &wsadata);
 
+       ChangeWindowsSpecificPointers(this);
 #endif
+       strlcpy(Config->MyExecutable,argv[0],MAXBUF);
+
+       if (!this->OpenLog(argv, argc))
+       {
+               printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
+               Exit(EXIT_STATUS_LOG);
+       }
+
        if (!ServerConfig::FileExists(this->ConfigFileName))
        {
                printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
@@ -549,23 +424,52 @@ InspIRCd::InspIRCd(int argc, char** argv)
                Exit(EXIT_STATUS_CONFIG);
        }
 
-       this->Start();
+       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");
 
        /* Set the finished argument values */
        Config->nofork = do_nofork;
        Config->forcedebug = do_debug;
-       Config->writelog = !do_nolog;
+       Config->writelog = !do_nolog;   
+       Config->ClearStack();
+       Config->Read(true, NULL);
 
-       strlcpy(Config->MyExecutable,argv[0],MAXBUF);
+       // Get XLine to do it's thing.
+       this->XLines->CheckELines(this->XLines->lookup_lines['E']);
+       this->XLines->ApplyLines();
+       
+       this->Modules->modules.resize(255);
+       this->Modules->handles.resize(255);
+
+       /*
+        * Initialise SID/UID.
+        * For an explanation as to exactly how this works, and why it works this way, see GetUID().
+        *   -- w00t
+        */
+       /* Generate SID */
+       size_t sid = 0;
+       if (Config->sid)
+       {
+               sid = Config->sid;
+       }
+       else
+       {
+               for (const char* x = Config->ServerName; *x; ++x)
+                       sid = 5 * sid + *x;
+               for (const char* y = Config->ServerDesc; *y; ++y)
+                       sid = 5 * sid + *y;
+               sid = sid % 999;
+
+               Config->sid = sid;
+       }
 
-       this->OpenLog(argv, argc);
+       this->InitialiseUID();
 
-       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);
+       /* set up fake client */
+       this->FakeClient = new User(this);
+       this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
        if (!do_root)
                this->CheckRoot();
@@ -594,13 +498,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
        }
 
-
-       /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
-        * initialize the socket engine.
-        */
-       SocketEngineFactory* SEF = new SocketEngineFactory();
-       SE = SEF->Create(this);
-       delete SEF;
+       SE->RecoverFromFork();
 
        this->Modes = new ModeParser(this);
        this->AddServerName(Config->ServerName);
@@ -616,7 +514,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        this->Res = new DNS(this);
 
-       this->LoadAllModules();
+       this->Modules->LoadAll();
+       
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
        InitializeDisabledCommands(Config->DisabledCommands, this);
@@ -666,251 +565,129 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
        }
 #else
-       InitIPC();
+       WindowsIPC = new IPC(this);
        if(!Config->nofork)
        {
                WindowsForkKillOwner(this);
                FreeConsole();
        }
 #endif
+
        printf("\nInspIRCd is now running!\n");
        Log(DEFAULT,"Startup complete.");
 
        this->WritePID(Config->PID);
 }
 
-std::string InspIRCd::GetVersionString()
+/* moved to a function, as UID generation can call this also */
+void InspIRCd::InitialiseUID()
 {
-       char versiondata[MAXBUF];
-       char dnsengine[] = "singlethread-object";
+       int i;
+       size_t sid = Config->sid;
 
-       if (*Config->CustomVersion)
-       {
-               snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
-       }
-       else
-       {
-               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
-       }
-       return versiondata;
-}
-
-char* InspIRCd::ModuleError()
-{
-       return MODERR;
-}
+       current_uid[0] = sid / 100 + 48;
+       current_uid[1] = ((sid / 10) % 10) + 48;
+       current_uid[2] = sid % 10 + 48;
 
-void InspIRCd::EraseFactory(int j)
-{
-       int v = 0;
-       for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
-       {
-               if (v == j)
-               {
-                       delete *t;
-                       factory.erase(t);
-                       factory.push_back(NULL);
-                       return;
-               }
-               v++;
-       }
+       /* Initialise UID */
+       for(i = 3; i < UUID_LENGTH - 1; i++)
+               current_uid[i] = 'A';
 }
 
-void InspIRCd::EraseModule(int j)
-{
-       int v1 = 0;
-       for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++)
-       {
-               if (v1 == j)
-               {
-                       DELETE(*m);
-                       modules.erase(m);
-                       modules.push_back(NULL);
-                       break;
-               }
-               v1++;
-       }
-       int v2 = 0;
-       for (std::vector<std::string>::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++)
-       {
-               if (v2 == j)
-               {
-                       Config->module_names.erase(v);
-                       break;
-               }
-               v2++;
-       }
-
-}
-
-void InspIRCd::MoveTo(std::string modulename,int slot)
+int InspIRCd::Run()
 {
-       unsigned int v2 = 256;
-       for (unsigned int v = 0; v < Config->module_names.size(); v++)
-       {
-               if (Config->module_names[v] == modulename)
-               {
-                       // found an instance, swap it with the item at the end
-                       v2 = v;
-                       break;
-               }
-       }
-       if ((v2 != (unsigned int)slot) && (v2 < 256))
+       while (true)
        {
-               // Swap the module names over
-               Config->module_names[v2] = Config->module_names[slot];
-               Config->module_names[slot] = modulename;
-               // now swap the module factories
-               ircd_module* temp = factory[v2];
-               factory[v2] = factory[slot];
-               factory[slot] = temp;
-               // now swap the module objects
-               Module* temp_module = modules[v2];
-               modules[v2] = modules[slot];
-               modules[slot] = temp_module;
-               // now swap the implement lists (we dont
-               // need to swap the global or recount it)
-               for (int n = 0; n < 255; n++)
-               {
-                       char x = Config->implement_lists[v2][n];
-                       Config->implement_lists[v2][n] = Config->implement_lists[slot][n];
-                       Config->implement_lists[slot][n] = x;
-               }
-       }
-}
+#ifndef WIN32
+               static rusage ru;
+#else
+               static time_t uptime;
+               static struct tm * stime;
+               static char window_title[100];
+#endif
 
-void InspIRCd::MoveAfter(std::string modulename, std::string after)
-{
-       for (unsigned int v = 0; v < Config->module_names.size(); v++)
-       {
-               if (Config->module_names[v] == after)
-               {
-                       MoveTo(modulename, v);
-                       return;
-               }
-       }
-}
+               /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
+                * Once per loop iteration is pleanty.
+                */
+               OLDTIME = TIME;
+               TIME = time(NULL);
 
-void InspIRCd::MoveBefore(std::string modulename, std::string before)
-{
-       for (unsigned int v = 0; v < Config->module_names.size(); v++)
-       {
-               if (Config->module_names[v] == before)
+               /* Run background module timers every few seconds
+                * (the docs say modules shouldnt rely on accurate
+                * timing using this event, so we dont have to
+                * time this exactly).
+                */
+               if (TIME != OLDTIME)
                {
-                       if (v > 0)
+                       if (TIME < OLDTIME)
                        {
-                               MoveTo(modulename, v-1);
+                               WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
                        }
-                       else
+
+                       if ((TIME % 3600) == 0)
                        {
-                               MoveTo(modulename, v);
+                               this->RehashUsersAndChans();
+                               FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                        }
-                       return;
-               }
-       }
-}
-
-void InspIRCd::MoveToFirst(std::string modulename)
-{
-       MoveTo(modulename,0);
-}
 
-void InspIRCd::MoveToLast(std::string modulename)
-{
-       MoveTo(modulename,this->GetModuleCount());
-}
+                       Timers->TickTimers(TIME);
+                       this->DoBackgroundUserStuff();
 
-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-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 ELIST=MU";
-       Config->data005 = v.str();
-       FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
-       Config->Update005();
-}
-
-void InspIRCd::DoOneIteration(bool process_module_sockets)
-{
+                       if ((TIME % 5) == 0)
+                       {
+                               XLines->expire_lines();
+                               FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+                               Timers->TickMissedTimers(TIME);
+                       }
 #ifndef WIN32
-       static rusage ru;
+                       /* 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
-       static time_t uptime;
-       static struct tm * stime;
-       static char window_title[100];
+                       WindowsIPC->Check();
+       
+                       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
+               }
 
-       /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
-        * Once per loop iteration is pleanty.
-        */
-       OLDTIME = TIME;
-       TIME = time(NULL);
+               /* Call the socket engine to wait on the active
+                * file descriptors. The socket engine has everything's
+                * descriptors in its list... dns, modules, users,
+                * servers... so its nice and easy, just one call.
+                * This will cause any read or write events to be
+                * dispatched to their handlers.
+                */
+               this->SE->DispatchEvents();
 
-       /* Run background module timers every few seconds
-        * (the docs say modules shouldnt rely on accurate
-        * timing using this event, so we dont have to
-        * time this exactly).
-        */
-       if (TIME != OLDTIME)
-       {
-               if (TIME < OLDTIME)
-                       WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
-               if ((TIME % 3600) == 0)
-               {
-                       this->RehashUsersAndChans();
-                       FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-               }
-               Timers->TickTimers(TIME);
-               this->DoBackgroundUserStuff(TIME);
+               /* if any users was quit, take them out */
+               this->GlobalCulls.Apply();
 
-               if ((TIME % 5) == 0)
-               {
-                       XLines->expire_lines();
-                       FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
-                       Timers->TickMissedTimers(TIME);
-               }
-#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 any inspsockets closed, remove them */
+               this->BufferedSocketCull();
 
-               if(Config->nofork)
+               if (this->s_signal)
                {
-                       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);
+                       this->SignalHandler(s_signal);
+                       this->s_signal = 0;
                }
-#endif
        }
 
-       /* Call the socket engine to wait on the active
-        * file descriptors. The socket engine has everything's
-        * descriptors in its list... dns, modules, users,
-        * servers... so its nice and easy, just one call.
-        * This will cause any read or write events to be
-        * dispatched to their handlers.
-        */
-       SE->DispatchEvents();
-
-       /* if any users was quit, take them out */
-       GlobalCulls.Apply();
-
-       /* If any inspsockets closed, remove them */
-       this->InspSocketCull();
+       return 0;
 }
 
-void InspIRCd::InspSocketCull()
+void InspIRCd::BufferedSocketCull()
 {
-       for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
+       for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
        {
                SE->DelFd(x->second);
                x->second->Close();
@@ -919,25 +696,16 @@ void InspIRCd::InspSocketCull()
        SocketCull.clear();
 }
 
-int InspIRCd::Run()
-{
-       while (true)
-       {
-               DoOneIteration(true);
-       }
-       /* This is never reached -- we hope! */
-       return 0;
-}
-
 /**********************************************************************************/
 
 /**
- * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
+ * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
  */
 
-int main(int argc, char** argv)
+int main(int argc, char ** argv)
 {
        SI = new InspIRCd(argc, argv);
+       mysig = &SI->s_signal;
        SI->Run();
        delete SI;
        return 0;
@@ -947,16 +715,16 @@ int main(int argc, char** argv)
  * (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(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
 {
        if (!Config->global_implementation[I_OnCheckReady])
                return true;
 
-       for (int i = 0; i <= this->GetModuleCount(); i++)
+       for (int i = 0; i <= this->Modules->GetCount(); i++)
        {
                if (Config->implement_lists[i][I_OnCheckReady])
                {
-                       int res = modules[i]->OnCheckReady(user);
+                       int res = this->Modules->modules[i]->OnCheckReady(user);
                        if (!res)
                                return false;
                }
@@ -964,11 +732,6 @@ bool InspIRCd::AllModulesReportReady(userrec* user)
        return true;
 }
 
-int InspIRCd::GetModuleCount()
-{
-       return this->ModCount;
-}
-
 time_t InspIRCd::Time(bool delta)
 {
        if (delta)
@@ -984,7 +747,7 @@ int InspIRCd::SetTimeDelta(int delta)
        return old;
 }
 
-void InspIRCd::AddLocalClone(userrec* user)
+void InspIRCd::AddLocalClone(User* user)
 {
        clonemap::iterator x = local_clones.find(user->GetIPString());
        if (x != local_clones.end())
@@ -993,7 +756,7 @@ void InspIRCd::AddLocalClone(userrec* user)
                local_clones[user->GetIPString()] = 1;
 }
 
-void InspIRCd::AddGlobalClone(userrec* user)
+void InspIRCd::AddGlobalClone(User* user)
 {
        clonemap::iterator y = global_clones.find(user->GetIPString());
        if (y != global_clones.end())
@@ -1007,88 +770,7 @@ int InspIRCd::GetTimeDelta()
        return time_delta;
 }
 
-bool FileLogger::Readable()
-{
-       return false;
-}
-
-void FileLogger::HandleEvent(EventType et, int errornum)
-{
-       this->WriteLogLine("");
-       if (log)
-               ServerInstance->SE->DelFd(this);
-}
-
-void FileLogger::WriteLogLine(const std::string &line)
-{
-       if (line.length())
-               buffer.append(line);
-
-       if (log)
-       {
-               int written = fprintf(log,"%s",buffer.c_str());
-#ifdef WINDOWS
-               buffer.clear();
-#else
-               if ((written >= 0) && (written < (int)buffer.length()))
-               {
-                       buffer.erase(0, buffer.length());
-                       ServerInstance->SE->AddFd(this);
-               }
-               else if (written == -1)
-               {
-                       if (errno == EAGAIN)
-                               ServerInstance->SE->AddFd(this);
-               }
-               else
-               {
-                       /* Wrote the whole buffer, and no need for write callback */
-                       buffer.clear();
-               }
-#endif
-               if (writeops++ % 20)
-               {
-                       fflush(log);
-               }
-       }
-}
-
-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);
-       }
-
-       buffer.clear();
-}
-
-FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0)
-{
-       if (log)
-       {
-               irc::sockets::NonBlocking(fileno(log));
-               this->SetFd(fileno(log));
-               buffer.clear();
-       }
-}
-
-FileLogger::~FileLogger()
+void InspIRCd::SetSignal(int signal)
 {
-       this->Close();
+       *mysig = signal;
 }
-