]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Auto loading of commands as shared objects via dlsym (very lightweight interface...
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 6dca11fda7ea7171e7873c7fe35096785e438fb1..7efbaa54f02a3c078a7f4cf543c9ff593a647d23 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/* ---------------------------------------------------------------------
+ * 
+ *           +------------------------------------+
+ *           | Inspire Internet Relay Chat Daemon |
+ *           +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *      InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                          E-mail:
+ *                   <brain@chatspike.net>
+ *                   <Craig@chatspike.net>
  *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *  Written by Craig Edwards, Craig McLure, and others.
+ *  This program is free but copyrighted software; you can redistribute
+ *  it and/or modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation, version 2
+ *  (two) ONLY.
  *
- * ---------------------------------------------------
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * ---------------------------------------------------------------------
  */
 
-/* Now with added unF! ;) */
-
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <time.h>
-#include <string>
+#include "configreader.h"
+#include <signal.h>
 #include <exception>
-#include <stdexcept>
-#include <new>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
+#include <fstream>
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "socketengine.h"
-#include "userprocess.h"
+#include "inspircd_se_config.h"
 #include "socket.h"
 #include "typedefs.h"
 #include "command_parse.h"
 
-InspIRCd* ServerInstance;
+using irc::sockets::NonBlocking;
+using irc::sockets::Blocking;
+using irc::sockets::insp_ntoa;
+using irc::sockets::insp_inaddr;
+using irc::sockets::insp_sockaddr;
 
-int WHOWAS_STALE = 48; // default WHOWAS Entries last 2 days before they go 'stale'
-int WHOWAS_MAX = 100;  // default 100 people maximum in the WHOWAS list
+InspIRCd* SI = NULL;
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-
-std::vector<InspSocket*> module_sockets;
-std::vector<userrec*> local_users;
+void InspIRCd::AddServerName(const std::string &servername)
+{
+       this->Log(DEBUG,"Adding server name: %s",servername.c_str());
+       
+       if(find(servernames.begin(), servernames.end(), servername) == servernames.end())
+               servernames.push_back(servername); /* Wasn't already there. */
+}
 
-extern int MODCOUNT;
-extern char LOG_FILE[MAXBUF];
-int openSockfd[MAX_DESCRIPTORS];
-int yield_depth;
-int iterations = 0;
-sockaddr_in client,server;
-socklen_t length;
+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();
+       }
 
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
+       return iter->c_str();
+}
 
-time_t TIME = time(NULL), OLDTIME = time(NULL);
+bool InspIRCd::FindServerName(const std::string &servername)
+{
+       return (find(servernames.begin(), servernames.end(), servername) != servernames.end());
+}
 
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-userrec* fd_ref_table[MAX_DESCRIPTORS];
+void InspIRCd::Exit(int status)
+{
+       exit (status);
+}
 
-Server* MyServer = new Server;
-ServerConfig *Config = new ServerConfig;
+void InspIRCd::Start()
+{
+       printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
+       printf("(C) ChatSpike Development team.\033[0m\n\n");
+       printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\033[0m\n");
+       printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
+       printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n");
+}
 
-user_hash clientlist;
-chan_hash chanlist;
+void InspIRCd::Rehash(int status)
+{
+       SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
+       fclose(SI->Config->log_file);
+       SI->OpenLog(NULL,0);
+       SI->Config->Read(false,NULL);
+       FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
+}
 
-servernamelist servernames;
-char lowermap[255];
+void InspIRCd::SetSignals(bool SEGVHandler)
+{
+       signal(SIGALRM, SIG_IGN);
+       signal(SIGHUP, InspIRCd::Rehash);
+       signal(SIGPIPE, SIG_IGN);
+       signal(SIGTERM, InspIRCd::Exit);
+       signal(SIGCHLD, SIG_IGN);
+}
 
-void AddServerName(std::string servername)
+bool InspIRCd::DaemonSeed()
 {
-       log(DEBUG,"Adding server name: %s",servername.c_str());
-       for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
+       int childpid;
+       if ((childpid = fork ()) < 0)
+               return false;
+       else if (childpid > 0)
        {
-               if (*a == servername)
-                       return;
+               /* 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(ERROR);
        }
-       servernames.push_back(servername);
-}
+       setsid ();
+       umask (007);
+       printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
 
-const char* FindServerNamePtr(std::string servername)
-{
-       for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
+       rlimit rl;
+       if (getrlimit(RLIMIT_CORE, &rl) == -1)
        {
-               if (*a == servername)
-                       return a->c_str();
+               this->Log(DEFAULT,"Failed to getrlimit()!");
+               return false;
        }
-       AddServerName(servername);
-       return FindServerNamePtr(servername);
+       else
+       {
+               rl.rlim_cur = rl.rlim_max;
+               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+                       this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
+       }
+
+       return true;
 }
 
-bool FindServerName(std::string servername)
+void InspIRCd::WritePID(const std::string &filename)
 {
-       for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
+       std::ofstream outfile(filename.c_str());
+       if (outfile.is_open())
        {
-               if (*a == servername)
-                       return true;
+               outfile << getpid();
+               outfile.close();
+       }
+       else
+       {
+               printf("Failed to write PID-file '%s', exiting.\n",filename.c_str());
+               this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str());
+               Exit(0);
        }
-       return false;
 }
 
 std::string InspIRCd::GetRevision()
@@ -135,111 +166,160 @@ std::string InspIRCd::GetRevision()
        return REVISION;
 }
 
-void InspIRCd::MakeLowerMap()
-{
-       // initialize the lowercase mapping table
-       for (unsigned int cn = 0; cn < 256; cn++)
-               lowermap[cn] = cn;
-       // lowercase the uppercase chars
-       for (unsigned int cn = 65; cn < 91; cn++)
-               lowermap[cn] = tolower(cn);
-       // now replace the specific chars for scandanavian comparison
-       lowermap[(unsigned)'['] = '{';
-       lowermap[(unsigned)']'] = '}';
-       lowermap[(unsigned)'\\'] = '|';
-}
-
 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)
 {
-       Start();
-       module_sockets.clear();
-       this->startup_time = time(NULL);
-       srand(time(NULL));
-       log(DEBUG,"*** InspIRCd starting up!");
-       if (!FileExists(CONFIG_FILE))
+       bool SEGVHandler = false;
+
+       modules.resize(255);
+       factory.resize(255);
+       
+       this->Config = new ServerConfig(this);
+       this->SNO = new SnomaskManager(this);
+       this->Start();
+       this->TIME = this->OLDTIME = this->startup_time = time(NULL);
+       srand(this->TIME);
+       this->Log(DEBUG,"*** InspIRCd starting up!");
+       if (!ServerConfig::FileExists(CONFIG_FILE))
        {
                printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
-               log(DEFAULT,"main: no config");
+               this->Log(DEFAULT,"main: no config");
                printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
                Exit(ERROR);
        }
-       *LOG_FILE = 0;
+       *this->LogFileName = 0;
        if (argc > 1) {
                for (int i = 1; i < argc; i++)
                {
-                       if (!strcmp(argv[i],"-nofork")) {
+                       if (!strcmp(argv[i],"-nofork"))
+                       {
                                Config->nofork = true;
                        }
-                       if (!strcmp(argv[i],"-wait")) {
+                       else if(!strcmp(argv[i],"-debug"))
+                       {
+                               Config->forcedebug = true;
+                       }
+                       else if(!strcmp(argv[i],"-nolog"))
+                       {
+                               Config->writelog = false;
+                       }
+                       else if (!strcmp(argv[i],"-wait"))
+                       {
                                sleep(6);
                        }
-                       if (!strcmp(argv[i],"-nolimit")) {
-                               Config->unlimitcore = true;
+                       else if (!strcmp(argv[i],"-nolimit"))
+                       {
+                               printf("WARNING: The `-nolimit' option is deprecated, and now on by default. This behaviour may change in the future.\n");
                        }
-                       if (!strcmp(argv[i],"-logfile")) {
+                       else if (!strcmp(argv[i],"-notraceback"))
+                       {
+                               SEGVHandler = false;
+                       }
+                       else if (!strcmp(argv[i],"-logfile"))
+                       {
                                if (argc > i+1)
                                {
-                                       strlcpy(LOG_FILE,argv[i+1],MAXBUF);
-                                       printf("LOG: Setting logfile to %s\n",LOG_FILE);
+                                       strlcpy(LogFileName,argv[i+1],MAXBUF);
+                                       printf("LOG: Setting logfile to %s\n",LogFileName);
                                }
                                else
                                {
                                        printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n");
                                        Exit(ERROR);
                                }
+                               i++;
+                       }
+                       else
+                       {
+                               printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-nolimit] [-notraceback] [-logfile <filename>]\n",argv[0]);
+                               Exit(ERROR);
                        }
                }
        }
 
        strlcpy(Config->MyExecutable,argv[0],MAXBUF);
 
-       this->MakeLowerMap();
-
-        OpenLog(argv, argc);
+       this->OpenLog(argv, argc);
        this->stats = new serverstats();
-        Config->ClearStack();
-        Config->Read(true,NULL);
-        CheckRoot();
-       this->ModeGrok = new ModeParser();
-       this->Parser = new CommandParser();
-        AddServerName(Config->ServerName);
-        CheckDie();
-        stats->BoundPortCount = BindPorts(true);
+       this->Parser = new CommandParser(this);
+       this->Timers = new TimerManager();
+       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);
 
        for(int t = 0; t < 255; t++)
                Config->global_implementation[t] = 0;
 
        memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
 
-        printf("\n");
-       SetSignals();
-        if (!Config->nofork)
-        {
-               if (!DaemonSeed())
-                {
-                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
-                        Exit(ERROR);
-                }
-        }
+       printf("\n");
+       this->SetSignals(SEGVHandler);
+       if (!Config->nofork)
+       {
+               if (!this->DaemonSeed())
+               {
+                       printf("ERROR: could not go into daemon mode. Shutting down.\n");
+                       Exit(ERROR);
+               }
+       }
+
+       /* 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;
+
+       this->Res = new DNS(this);
+
+       this->LoadAllModules();
+       /* Just in case no modules were loaded - fix for bug #101 */
+       this->BuildISupport();
 
-        /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
-         * initialize the socket engine.
-         */
-        SE = new SocketEngine();
+       if (!stats->BoundPortCount)
+       {
+               printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
+               Exit(ERROR);
+       }
 
-        /* We must load the modules AFTER initializing the socket engine, now */
+       /* Add the listening sockets used for client inbound connections
+        * to the socket engine
+        */
+       this->Log(DEBUG,"%d listeners",stats->BoundPortCount);
+       for (unsigned long count = 0; count < stats->BoundPortCount; count++)
+       {
+               this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]->GetFd());
+               if (!SE->AddFd(Config->openSockfd[count]))
+               {
+                       printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
+                       Exit(ERROR);
+               }
+       }
 
-       return;
+       if (!Config->nofork)
+       {
+               if (kill(getppid(), SIGTERM) == -1)
+                       printf("Error killing parent process: %s\n",strerror(errno));
+               fclose(stdin);
+               fclose(stderr);
+               fclose(stdout);
+       }
+
+       printf("\nInspIRCd is now running!\n");
+
+       this->WritePID(Config->PID);
 }
 
 std::string InspIRCd::GetVersionString()
 {
        char versiondata[MAXBUF];
-#ifdef THREADED_DNS
-       char dnsengine[] = "multithread";
-#else
-       char dnsengine[] = "singlethread";
-#endif
+       char dnsengine[] = "singlethread-object";
        if (*Config->CustomVersion)
        {
                snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
@@ -256,45 +336,45 @@ char* InspIRCd::ModuleError()
        return MODERR;
 }
 
-void InspIRCd::erase_factory(int j)
+void InspIRCd::EraseFactory(int j)
 {
        int v = 0;
        for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
        {
                if (v == j)
                {
-                       factory.erase(t);
-                       factory.push_back(NULL);
-                       return;
-               }
+                       factory.erase(t);
+                       factory.push_back(NULL);
+                       return;
+               }
                v++;
-       }
+       }
 }
 
-void InspIRCd::erase_module(int j)
+void InspIRCd::EraseModule(int j)
 {
        int v1 = 0;
-       for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
-        {
-                if (v1 == j)
-                {
-                       delete *m;
-                        modules.erase(m);
-                        modules.push_back(NULL);
+       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;
-                }
+       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++;
-        }
+       }
 
 }
 
@@ -305,7 +385,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
        {
                if (Config->module_names[v] == modulename)
                {
-                       // found an instance, swap it with the item at MODCOUNT
+                       // found an instance, swap it with the item at the end
                        v2 = v;
                        break;
                }
@@ -334,7 +414,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
        }
        else
        {
-               log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
+               this->Log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
        }
 }
 
@@ -376,18 +456,18 @@ void InspIRCd::MoveToFirst(std::string modulename)
 
 void InspIRCd::MoveToLast(std::string modulename)
 {
-       MoveTo(modulename,MODCOUNT);
+       MoveTo(modulename,this->GetModuleCount());
 }
 
 void InspIRCd::BuildISupport()
 {
-        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
+       // 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=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
        v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-       v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32";
+       v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
        Config->data005 = v.str();
-       FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
+       FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 }
 
 bool InspIRCd::UnloadModule(const char* filename)
@@ -399,23 +479,23 @@ bool InspIRCd::UnloadModule(const char* filename)
                {
                        if (modules[j]->GetVersion().Flags & VF_STATIC)
                        {
-                               log(DEFAULT,"Failed to unload STATIC module %s",filename);
+                               this->Log(DEFAULT,"Failed to unload STATIC module %s",filename);
                                snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
                                return false;
                        }
                        /* Give the module a chance to tidy out all its metadata */
-                       for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
+                       for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++)
                        {
                                modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
                        }
-                       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+                       for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++)
                        {
                                modules[j]->OnCleanup(TYPE_USER,u->second);
                        }
 
-                       FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
+                       FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
 
-                        for(int t = 0; t < 255; t++)
+                       for(int t = 0; t < 255; t++)
                        {
                                Config->global_implementation[t] -= Config->implement_lists[j][t];
                        }
@@ -431,19 +511,19 @@ bool InspIRCd::UnloadModule(const char* filename)
                        }
 
                        // found the module
-                       log(DEBUG,"Deleting module...");
-                       erase_module(j);
-                       log(DEBUG,"Erasing module entry...");
-                       erase_factory(j);
-                        log(DEBUG,"Removing dependent commands...");
-                        Parser->RemoveCommands(filename);
-                       log(DEFAULT,"Module %s unloaded",filename);
-                       MODCOUNT--;
+                       this->Log(DEBUG,"Removing dependent commands...");
+                       Parser->RemoveCommands(filename);
+                       this->Log(DEBUG,"Deleting module...");
+                       this->EraseModule(j);
+                       this->Log(DEBUG,"Erasing module entry...");
+                       this->EraseFactory(j);
+                       this->Log(DEFAULT,"Module %s unloaded",filename);
+                       this->ModCount--;
                        BuildISupport();
                        return true;
                }
        }
-       log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
+       this->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
        snprintf(MODERR,MAXBUF,"Module not loaded");
        return false;
 }
@@ -459,79 +539,79 @@ bool InspIRCd::LoadModule(const char* filename)
        std::string filename_str = filename;
 #ifndef STATIC_LINK
 #ifndef IS_CYGWIN
-       if (!DirValid(modfile))
+       if (!ServerConfig::DirValid(modfile))
        {
-               log(DEFAULT,"Module %s is not within the modules directory.",modfile);
+               this->Log(DEFAULT,"Module %s is not within the modules directory.",modfile);
                snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
                return false;
        }
 #endif
 #endif
-       log(DEBUG,"Loading module: %s",modfile);
+       this->Log(DEBUG,"Loading module: %s",modfile);
 #ifndef STATIC_LINK
-        if (FileExists(modfile))
-        {
+       if (ServerConfig::FileExists(modfile))
+       {
 #endif
                for (unsigned int j = 0; j < Config->module_names.size(); j++)
                {
                        if (Config->module_names[j] == filename_str)
                        {
-                               log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
+                               this->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
                                snprintf(MODERR,MAXBUF,"Module already loaded");
                                return false;
                        }
                }
-               ircd_module* a = new ircd_module(modfile);
-                factory[MODCOUNT+1] = a;
-                if (factory[MODCOUNT+1]->LastError())
-                {
-                        log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError());
-                       snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError());
-                       return false;
-                }
                try
                {
-                       if (factory[MODCOUNT+1]->factory)
-                       {
-                               Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
-                               modules[MODCOUNT+1] = m;
-                               /* save the module and the module's classfactory, if
-                                * this isnt done, random crashes can occur :/ */
-                               Config->module_names.push_back(filename);
-
-                               char* x = &Config->implement_lists[MODCOUNT+1][0];
+                       ircd_module* a = new ircd_module(this, modfile);
+                       factory[this->ModCount+1] = a;
+                       if (factory[this->ModCount+1]->LastError())
+                       {
+                               this->Log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError());
+                               snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError());
+                               return false;
+                       }
+                       if ((long)factory[this->ModCount+1]->factory != -1)
+                       {
+                               Module* m = factory[this->ModCount+1]->factory->CreateModule(this);
+                               modules[this->ModCount+1] = m;
+                               /* save the module and the module's classfactory, if
+                                * this isnt done, random crashes can occur :/ */
+                               Config->module_names.push_back(filename);
+
+                               char* x = &Config->implement_lists[this->ModCount+1][0];
                                for(int t = 0; t < 255; t++)
                                        x[t] = 0;
 
-                               modules[MODCOUNT+1]->Implements(x);
+                               modules[this->ModCount+1]->Implements(x);
 
                                for(int t = 0; t < 255; t++)
-                                       Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
-                       }
+                                       Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t];
+                       }
                        else
                        {
-                                       log(DEFAULT,"Unable to load %s",modfile);
-                               snprintf(MODERR,MAXBUF,"Factory function failed!");
+                                       this->Log(DEFAULT,"Unable to load %s",modfile);
+                               snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
                                return false;
-                       }
+                       }
                }
                catch (ModuleException& modexcept)
                {
-                       log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
+                       this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
                        snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason());
                        return false;
                }
 #ifndef STATIC_LINK
-        }
-        else
-        {
-                log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
+       }
+       else
+       {
+               this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
                snprintf(MODERR,MAXBUF,"Module file could not be found");
                return false;
-        }
+       }
 #endif
-       MODCOUNT++;
-       FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[MODCOUNT],filename_str));
+       this->ModCount++;
+       FOREACH_MOD_I(this,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
        // now work out which modules, if any, want to move to the back of the queue,
        // and if they do, move them there.
        std::vector<std::string> put_to_back;
@@ -541,298 +621,115 @@ bool InspIRCd::LoadModule(const char* filename)
        for (unsigned int j = 0; j < Config->module_names.size(); j++)
        {
                if (modules[j]->Prioritize() == PRIORITY_LAST)
-               {
                        put_to_back.push_back(Config->module_names[j]);
-               }
                else if (modules[j]->Prioritize() == PRIORITY_FIRST)
-               {
                        put_to_front.push_back(Config->module_names[j]);
-               }
                else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
-               {
                        put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
-               }
                else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
-               {
                        put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
-               }
        }
        for (unsigned int j = 0; j < put_to_back.size(); j++)
-       {
                MoveToLast(put_to_back[j]);
-       }
        for (unsigned int j = 0; j < put_to_front.size(); j++)
-       {
                MoveToFirst(put_to_front[j]);
-       }
        for (std::map<std::string,std::string>::iterator j = put_before.begin(); j != put_before.end(); j++)
-       {
                MoveBefore(j->first,j->second);
-       }
        for (std::map<std::string,std::string>::iterator j = put_after.begin(); j != put_after.end(); j++)
-       {
                MoveAfter(j->first,j->second);
-       }
        BuildISupport();
        return true;
 }
 
 void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
-        int activefds[MAX_DESCRIPTORS];
-        int incomingSockfd;
-        int in_port;
-        userrec* cu = NULL;
-        InspSocket* s = NULL;
-        InspSocket* s_del = NULL;
-        unsigned int numberactive;
-        sockaddr_in sock_us;     // our port number
-        socklen_t uslen;         // length of our port number
-
-       if (yield_depth > 100)
-               return;
-
-       yield_depth++;
-
-        /* 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);
-        
-        /* 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 % 5) == 0) && (!expire_run))
-        {
-                expire_lines();
-               if (process_module_sockets)
+       /* 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);
+
+       /* 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)
                {
-                       /* Fix by brain - the addition of DoOneIteration means that this
-                        * can end up getting called recursively in the following pattern:
-                        *
-                        * m_spanningtree DoPingChecks
-                        * (server pings out and is squit)
-                        * (squit causes call to DoOneIteration)
-                        * DoOneIteration enters here
-                        * calls DoBackground timer
-                        * enters m_spanningtree DoPingChecks... see step 1.
-                        *
-                        * This should do the job and fix the bug.
-                        */
-                       FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+                       irc::whowas::MaintainWhoWas(TIME);
                }
-                TickMissedTimers(TIME);
-                expire_run = true;
-               yield_depth--;
-                return;
-        }   
-        else if ((TIME % 5) == 1)
-        {
-                expire_run = false;
-        }
-
-       if (iterations++ == 15)
-       {
-               iterations = 0;
-               DoBackgroundUserStuff(TIME);
-       }
-        /* Once a second, do the background processing */
-        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)
+               Timers->TickTimers(TIME);
+               this->DoBackgroundUserStuff(TIME);
+
+               if ((TIME % 5) == 0)
                {
-                       MaintainWhoWas(TIME);
+                       XLines->expire_lines();
+                       FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+                       Timers->TickMissedTimers(TIME);
                }
-        }
-
-        /* Process timeouts on module sockets each time around
-         * the loop. There shouldnt be many module sockets, at
-         * most, 20 or so, so this won't be much of a performance
-         * hit at all.   
-         */ 
-       if (process_module_sockets)
-               DoSocketTimeouts(TIME);  
-         
-        TickTimers(TIME);
-         
-        /* 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.
-         */
-        if (!(numberactive = SE->Wait(activefds)))
-       {
-               yield_depth--;
-                return;
-       }
-
-        /**
-         * Now process each of the fd's. For users, we have a fast
-         * lookup table which can find a user by file descriptor, so
-         * processing them by fd isnt expensive. If we have a lot of
-         * listening ports or module sockets though, things could get
-         * ugly.
-         */
-       log(DEBUG,"There are %d fd's to process.",numberactive);
-
-        for (unsigned int activefd = 0; activefd < numberactive; activefd++)
-        {
-                int socket_type = SE->GetType(activefds[activefd]);
-                switch (socket_type)
-                {
-                        case X_ESTAB_CLIENT:
-
-                               log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]);
-                                cu = fd_ref_table[activefds[activefd]];
-                                if (cu)
-                                        ProcessUser(cu);  
-        
-                        break;
-        
-                        case X_ESTAB_MODULE:
-
-                               log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]);
-
-                               if (!process_module_sockets)
-                                       break;
-
-                                /* Process module-owned sockets.
-                                 * Modules are encouraged to inherit their sockets from
-                                 * InspSocket so we can process them neatly like this.
-                                 */
-                                s = socket_ref[activefds[activefd]]; 
-              
-                                if ((s) && (!s->Poll()))
-                                {
-                                        log(DEBUG,"inspircd.cpp: Socket poll returned false, close and bail");
-                                        SE->DelFd(s->GetFd());
-                                       socket_ref[activefds[activefd]] = NULL;
-                                        for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
-                                        {
-                                                s_del = (InspSocket*)*a;
-                                                if ((s_del) && (s_del->GetFd() == activefds[activefd]))
-                                                {
-                                                        module_sockets.erase(a);
-                                                        break;
-                                                }
-                                        }
-                                        s->Close();
-                                        delete s;
-                                }
-                               else if (!s)
-                               {
-                                       log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!");
-                                       SE->DelFd(s->GetFd());
-                               }
-                        break;
-
-                        case X_ESTAB_DNS:
-                                /* When we are using single-threaded dns,
-                                 * the sockets for dns end up in our mainloop.
-                                 * When we are using multi-threaded dns,
-                                 * each thread has its own basic poll() loop
-                                 * within it, making them 'fire and forget'
-                                 * and independent of the mainloop.
-                                 */
-#ifndef THREADED_DNS
-                               log(DEBUG,"Type: X_ESTAB_DNS: fd=%d",activefds[activefd]);
-                                dns_poll(activefds[activefd]);
-#endif
-                        break;
-
-                       case X_LISTEN:
-
-                               log(DEBUG,"Type: X_LISTEN_MODULE: fd=%d",activefds[activefd]);
-
-                                /* It's a listener */
-                                uslen = sizeof(sock_us);
-                                length = sizeof(client);
-                                incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length);
-        
-                                if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen)))
-                                {
-                                        in_port = ntohs(sock_us.sin_port);
-                                        log(DEBUG,"Accepted socket %d",incomingSockfd);
-                                        /* Years and years ago, we used to resolve here
-                                         * using gethostbyaddr(). That is sucky and we
-                                         * don't do that any more...
-                                         */
-                                        NonBlocking(incomingSockfd);
-                                        if (Config->GetIOHook(in_port))
-                                        {
-                                                try
-                                                {
-                                                        Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
-                                                }
-                                                catch (ModuleException& modexcept)
-                                                {
-                                                        log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
-                                                }
-                                        }
-                                        stats->statsAccept++;
-                                        AddClient(incomingSockfd, in_port, false, client.sin_addr);
-                                        log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
-                                }
-                                else
-                                {
-                                        log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
-                                        shutdown(incomingSockfd,2);
-                                        close(incomingSockfd);
-                                        stats->statsRefused++;
-                                }
-                        break;
-
-                        default:
-                                /* Something went wrong if we're in here.
-                                 * In fact, so wrong, im not quite sure
-                                 * what we would do, so for now, its going
-                                 * to safely do bugger all.
-                                 */
-                               log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]);
-                               SE->DelFd(activefds[activefd]);
-                        break;
-                }
-        }
-       yield_depth--;
+       }
+
+       /* 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();
 }
 
-int InspIRCd::Run()
+bool InspIRCd::IsIdent(const char* n)
 {
-       /* Until THIS point, ServerInstance == NULL */
-       
-        LoadAllModules(this);
-
-       /* Just in case no modules were loaded - fix for bug #101 */
-       this->BuildISupport();
+       if (!n || !*n)
+               return false;
 
-        printf("\nInspIRCd is now running!\n");
-       
-       if (!Config->nofork)
+       for (char* i = (char*)n; *i; i++)
        {
-               fclose(stdout);
-               fclose(stderr);
-               fclose(stdin);
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       continue;
+               }
+               if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+               {
+                       continue;
+               }
+               return false;
        }
+       return true;
+}
 
-       /* Add the listening sockets used for client inbound connections
-        * to the socket engine
-        */
-       for (int count = 0; count < stats->BoundPortCount; count++)
-               SE->AddFd(openSockfd[count],true,X_LISTEN);
 
-       WritePID(Config->PID);
+bool InspIRCd::IsNick(const char* n)
+{
+       if (!n || !*n)
+               return false;
 
-       /* main loop, this never returns */
-       expire_run = false;
-       yield_depth = 0;
-       iterations = 0;
+       int p = 0; 
+       for (char* i = (char*)n; *i; i++, p++)
+       {
+               /* "A"-"}" can occur anywhere in a nickname */
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       continue;
+               }
+               /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
+               if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
+               {
+                       continue;
+               }
+               /* invalid character! abort */
+               return false;
+       }
+       return (p < NICKMAX - 1);
+}
 
+int InspIRCd::Run()
+{
        while (true)
        {
                DoOneIteration(true);
@@ -849,18 +746,108 @@ int InspIRCd::Run()
 
 int main(int argc, char** argv)
 {
-       try
+       SI = new InspIRCd(argc, argv);
+       SI->Run();
+       delete SI;
+       return 0;
+}
+
+/* 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(userrec* user)
+{
+       if (!Config->global_implementation[I_OnCheckReady])
+               return true;
+
+       for (int i = 0; i <= this->GetModuleCount(); i++)
        {
-               ServerInstance = new InspIRCd(argc, argv);
-               ServerInstance->Run();
-               delete ServerInstance;
+               if (Config->implement_lists[i][I_OnCheckReady])
+               {
+                       int res = modules[i]->OnCheckReady(user);
+                       if (!res)
+                               return false;
+               }
        }
-       catch (std::bad_alloc)
+       return true;
+}
+
+int InspIRCd::GetModuleCount()
+{
+       return this->ModCount;
+}
+
+time_t InspIRCd::Time()
+{
+       return TIME;
+}
+
+bool FileLogger::Readable()
+{
+       return false;
+}
+
+void FileLogger::HandleEvent(EventType et)
+{
+       this->WriteLogLine("");
+       ServerInstance->SE->DelFd(this);
+}
+
+void FileLogger::WriteLogLine(const std::string &line)
+{
+       if (line.length())
+               buffer.append(line);
+
+       if (log)
        {
-               log(DEFAULT,"You are out of memory! (got exception std::bad_alloc!)");
-               send_error("**** OUT OF MEMORY **** We're gonna need a bigger boat!");
-               printf("Out of memory! (got exception std::bad_alloc!");
+               int written = fprintf(log,"%s",buffer.c_str());
+               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 = "";
+               }
        }
-       return 0;
+       if (writeops++ % 20)
+       {
+               fflush(log);
+       }
+}
+
+void FileLogger::Close()
+{
+       if (log)
+       {
+               int flags = fcntl(fileno(log), F_GETFL, 0);
+               fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
+               if (buffer.size())
+                       fprintf(log,"%s",buffer.c_str());
+               fflush(log);
+               fclose(log);
+       }
+       buffer = "";
+       ServerInstance->SE->DelFd(this);
+}
+
+FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0)
+{
+       irc::sockets::NonBlocking(fileno(log));
+       this->SetFd(fileno(log));
+       buffer = "";
+}
+
+FileLogger::~FileLogger()
+{
+       this->Close();
 }