]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Remove an extern, partly because it's unused, partly because it then gets shadowed...
[user/henk/code/inspircd.git] / src / inspircd.cpp
index e532add1206c95060228f464f1ed4d2d4f37cffc..5e437365be0f3a3e8d74c5057bce24517e7f341f 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
 
 /* Now with added unF! ;) */
 
-using namespace std;
-
+#include <algorithm>
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
+#include "configreader.h"
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/utsname.h>
+#include <signal.h>
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
+#include <exception>
+#include <stdexcept>
+#include <new>
 #include <map>
 #include <sstream>
+#include <fstream>
 #include <vector>
 #include <deque>
-#include <sched.h>
 #ifdef THREADED_DNS
 #include <pthread.h>
 #endif
@@ -58,250 +54,182 @@ using namespace std;
 #include "socketengine.h"
 #include "userprocess.h"
 #include "socket.h"
-#include "dns.h"
 #include "typedefs.h"
+#include "command_parse.h"
 
 InspIRCd* ServerInstance;
 
 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
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList factory;
+
 std::vector<InspSocket*> module_sockets;
 std::vector<userrec*> local_users;
 
 extern int MODCOUNT;
-int openSockfd[MAXSOCKS];
-sockaddr_in client,server;
+extern char LOG_FILE[MAXBUF];
+int openSockfd[MAX_DESCRIPTORS];
+int yield_depth;
+int iterations = 0;
+
+insp_sockaddr client, server;
+
 socklen_t length;
-extern Module* IOHookModule;
 
-extern InspSocket* socket_ref[65535];
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
 
 time_t TIME = time(NULL), OLDTIME = time(NULL);
 
-SocketEngine* SE = NULL;
-
 // 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[65536];
+userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-serverstats* stats = new serverstats;
 Server* MyServer = new Server;
 ServerConfig *Config = new ServerConfig;
 
 user_hash clientlist;
 chan_hash chanlist;
-whowas_hash whowas;
-command_table cmdlist;
+
 servernamelist servernames;
 char lowermap[255];
 
-void AddServerName(std::string servername)
+void AddServerName(const std::string &servername)
 {
        log(DEBUG,"Adding server name: %s",servername.c_str());
-       for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
-       {
-               if (*a == servername)
-                       return;
-       }
-       servernames.push_back(servername);
+       
+       if(find(servernames.begin(), servernames.end(), servername) == servernames.end())
+               servernames.push_back(servername); /* Wasn't already there. */
 }
 
-const char* FindServerNamePtr(std::string servername)
+const char* FindServerNamePtr(const std::string &servername)
 {
-       for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
-       {
-               if (*a == servername)
-                       return a->c_str();
+       servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
+       
+       if(iter == servernames.end())
+       {               
+               AddServerName(servername);
+               iter = --servernames.end();
        }
-       AddServerName(servername);
-       return FindServerNamePtr(servername);
+
+       return iter->c_str();
 }
 
-std::string InspIRCd::GetRevision()
+bool FindServerName(const std::string &servername)
 {
-       /* w00t got me to replace a bunch of strtok_r
-        * with something nicer, so i did this. Its the
-        * same thing really, only in C++. It places the
-        * text into a std::stringstream which is a readable
-        * and writeable buffer stream, and then pops two
-        * words off it, space delimited. Because it reads
-        * into the same variable twice, the first word
-        * is discarded, and the second one returned.
-        */
-       std::stringstream Revision("$Revision$");
-       std::string single;
-       Revision >> single >> single;
-       return single;
+       return (find(servernames.begin(), servernames.end(), servername) != servernames.end());
 }
 
+void Exit(int status)
+{
+       if (Config->log_file)
+               fclose(Config->log_file);
+       send_error("Server shutdown.");
+       exit (status);
+}
 
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot,#darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-
-int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+void Start()
 {
-       char plist[MAXBUF];
-       char *param;
-       char *pars[32];
-       char blog[32][MAXBUF];
-       char blog2[32][MAXBUF];
-       int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
-       char keystr[MAXBUF];
-       char moo[MAXBUF];
-
-       for (int i = 0; i <32; i++)
-               strcpy(blog[i],"");
-
-       for (int i = 0; i <32; i++)
-               strcpy(blog2[i],"");
-
-       strcpy(moo,"");
-       for (int i = 0; i <10; i++)
-       {
-               if (!parameters[i])
-               {
-                       parameters[i] = moo;
-               }
-       }
-       if (joins)
-       {
-               if (pcnt > 1) /* we have a key to copy */
-               {
-                       strlcpy(keystr,parameters[1],MAXBUF);
-               }
-       }
+       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\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");
+}
 
-       if (!parameters[start])
-       {
-               return 0;
-       }
-       if (!strchr(parameters[start],','))
-       {
-               return 0;
-       }
-       strcpy(plist,"");
-       for (int i = start; i <= end; i++)
-       {
-               if (parameters[i])
-               {
-                       strlcat(plist,parameters[i],MAXBUF);
-               }
-       }
-       
-       j = 0;
-       param = plist;
+void Killed(int status)
+{
+       if (Config->log_file)
+               fclose(Config->log_file);
+       send_error("Server terminated.");
+       exit(status);
+}
+
+void Rehash(int status)
+{
+       WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE));
+       fclose(Config->log_file);
+       OpenLog(NULL,0);
+       Config->Read(false,NULL);
+       FOREACH_MOD(I_OnRehash,OnRehash(""));
+}
 
-       t = strlen(plist);
-       for (int i = 0; i < t; i++)
+void SetSignals()
+{
+       signal (SIGALRM, SIG_IGN);
+       signal (SIGHUP, Rehash);
+       signal (SIGPIPE, SIG_IGN);
+       signal (SIGTERM, Exit);
+       signal (SIGSEGV, Error);
+}
+
+bool DaemonSeed()
+{
+       int childpid;
+       if ((childpid = fork ()) < 0)
+               return (ERROR);
+       else if (childpid > 0)
        {
-               if (plist[i] == ',')
-               {
-                       plist[i] = '\0';
-                       strlcpy(blog[j++],param,MAXBUF);
-                       param = plist+i+1;
-                       if (j>20)
-                       {
-                               WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
-                               return 1;
-                       }
-               }
+               /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */
+               sleep(6);
+               exit (0);
        }
-       strlcpy(blog[j++],param,MAXBUF);
-       total = j;
+       setsid ();
+       umask (007);
+       printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
 
-       if ((joins) && (keystr) && (total>0)) // more than one channel and is joining
+       rlimit rl;
+       if (getrlimit(RLIMIT_CORE, &rl) == -1)
        {
-               strcat(keystr,",");
+               log(DEFAULT,"Failed to getrlimit()!");
+               return false;
        }
-       
-       if ((joins) && (keystr))
+       else
        {
-               if (strchr(keystr,','))
-               {
-                       j = 0;
-                       param = keystr;
-                       t2 = strlen(keystr);
-                       for (int i = 0; i < t2; i++)
-                       {
-                               if (keystr[i] == ',')
-                               {
-                                       keystr[i] = '\0';
-                                       strlcpy(blog2[j++],param,MAXBUF);
-                                       param = keystr+i+1;
-                               }
-                       }
-                       strlcpy(blog2[j++],param,MAXBUF);
-                       total2 = j;
-               }
+               rl.rlim_cur = rl.rlim_max;
+               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+                       log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
        }
+  
+       return true;
+}
 
-       for (j = 0; j < total; j++)
+void WritePID(const std::string &filename)
+{
+       std::ofstream outfile(filename.c_str());
+       if (outfile.is_open())
        {
-               if (blog[j])
-               {
-                       pars[0] = blog[j];
-               }
-               for (q = end; q < pcnt-1; q++)
-               {
-                       if (parameters[q+1])
-                       {
-                               pars[q-end+1] = parameters[q+1];
-                       }
-               }
-               if ((joins) && (parameters[1]))
-               {
-                       if (pcnt > 1)
-                       {
-                               pars[1] = blog2[j];
-                       }
-                       else
-                       {
-                               pars[1] = NULL;
-                       }
-               }
-               /* repeatedly call the function with the hacked parameter list */
-               if ((joins) && (pcnt > 1))
-               {
-                       if (pars[1])
-                       {
-                               // pars[1] already set up and containing key from blog2[j]
-                               fn(pars,2,u);
-                       }
-                       else
-                       {
-                               pars[1] = parameters[1];
-                               fn(pars,2,u);
-                       }
-               }
-               else
-               {
-                       fn(pars,pcnt-(end-start),u);
-               }
+               outfile << getpid();
+               outfile.close();
+       }
+       else
+       {
+               printf("Failed to write PID-file '%s', exiting.\n",filename.c_str());
+               log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str());
+               Exit(0);
        }
-
-       return 1;
 }
 
+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)
 {
@@ -317,112 +245,86 @@ InspIRCd::InspIRCd(int argc, char** argv)
                printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
                Exit(ERROR);
        }
+       *LOG_FILE = 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");
+                       }
+                       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);
+                               }
+                               else
+                               {
+                                       printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n");
+                                       Exit(ERROR);
+                               }
                        }
                }
        }
 
        strlcpy(Config->MyExecutable,argv[0],MAXBUF);
-       
-       // 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)'\\'] = '|';
-
 
-        OpenLog(argv, argc);
-        Config->ClearStack();
-        Config->Read(true,NULL);
-        CheckRoot();
-        SetupCommandTable();
-        AddServerName(Config->ServerName);
-        CheckDie();
-        stats->BoundPortCount = BindPorts();
+       this->MakeLowerMap();
 
-        printf("\n");
-        if (!Config->nofork)
-        {
-                if (DaemonSeed() == ERROR)
-                {
-                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
-                        Exit(ERROR);
-                }
-        }
+       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);
 
-        /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
-         * initialize the socket engine.
-         */
-        SE = new SocketEngine();
+       for(int t = 0; t < 255; t++)
+               Config->global_implementation[t] = 0;
 
-        /* We must load the modules AFTER initializing the socket engine, now */
-        LoadAllModules();
+       memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
 
-        printf("\nInspIRCd is now running!\n");
-
-       return;
-}
-
-#ifdef THREADED_DNS
-void* dns_task(void* arg)
-{
-       userrec* u = (userrec*)arg;
-       log(DEBUG,"DNS thread for user %s",u->nick);
-       DNS dns1;
-       DNS dns2;
-       std::string host;
-       std::string ip;
-       if (dns1.ReverseLookup(u->ip))
+       printf("\n");
+       SetSignals();
+       if (!Config->nofork)
        {
-               log(DEBUG,"DNS Step 1");
-               while (!dns1.HasResult())
+               if (!DaemonSeed())
                {
-                       usleep(100);
-               }
-               host = dns1.GetResult();
-               if (host != "")
-               {
-                       log(DEBUG,"DNS Step 2: '%s'",host.c_str());
-                       if (dns2.ForwardLookup(host))
-                       {
-                               while (!dns2.HasResult())
-                               {
-                                       usleep(100);
-                               }
-                               ip = dns2.GetResultIP();
-                               log(DEBUG,"DNS Step 3 '%s'(%d) '%s'(%d)",ip.c_str(),ip.length(),u->ip,strlen(u->ip));
-                               if (ip == std::string(u->ip))
-                               {
-                                       log(DEBUG,"DNS Step 4");
-                                       if (host.length() < 160)
-                                       {
-                                               log(DEBUG,"DNS Step 5");
-                                               strcpy(u->host,host.c_str());
-                                               strcpy(u->dhost,host.c_str());
-                                       }
-                               }
-                       }
+                       printf("ERROR: could not go into daemon mode. Shutting down.\n");
+                       Exit(ERROR);
                }
        }
-       u->dns_done = true;
-       return NULL;
+
+       /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
+        * initialize the socket engine.
+        */
+       SE = new SocketEngine();
+
+       /* We must load the modules AFTER initializing the socket engine, now */
+
+       return;
 }
-#endif
 
 std::string InspIRCd::GetVersionString()
 {
@@ -432,506 +334,154 @@ std::string InspIRCd::GetVersionString()
 #else
        char dnsengine[] = "singlethread";
 #endif
-       snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,GetRevision().c_str(),Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+       if (*Config->CustomVersion)
+       {
+               snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
+       }
+       else
+       {
+               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+       }
        return versiondata;
 }
 
-
-bool is_valid_cmd(std::string &commandname, int pcnt, userrec * user)
+char* InspIRCd::ModuleError()
 {
-       for (unsigned int i = 0; i < cmdlist.size(); i++)
-       {
-               if (!strcasecmp(cmdlist[i].command,commandname.c_str()))
-               {
-                       if (cmdlist[i].handler_function)
-                       {
-                               if ((pcnt>=cmdlist[i].min_params) && (strcasecmp(cmdlist[i].source,"<core>")))
-                               {
-                                       if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed))
-                                       {
-                                               if (cmdlist[i].flags_needed)
-                                               {
-                                                       if ((user->HasPermission(commandname)) || (is_uline(user->server)))
-                                                       {
-                                                               return true;
-                                                       }
-                                                       else
-                                                       {
-                                                               return false;
-                                                       }
-                                               }
-                                               return true;
-                                       }
-                               }
-                       }
-               }
-       }
-       return false;
+       return MODERR;
 }
 
-// calls a handler function for a command
-
-void call_handler(std::string &commandname,char **parameters, int pcnt, userrec *user)
+void InspIRCd::erase_factory(int j)
 {
-       for (unsigned int i = 0; i < cmdlist.size(); i++)
+       int v = 0;
+       for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
        {
-               if (!strcasecmp(cmdlist[i].command,commandname.c_str()))
+               if (v == j)
                {
-                       if (cmdlist[i].handler_function)
-                       {
-                               if (pcnt>=cmdlist[i].min_params)
-                               {
-                                       if ((strchr(user->modes,cmdlist[i].flags_needed)) || (!cmdlist[i].flags_needed))
-                                       {
-                                               if (cmdlist[i].flags_needed)
-                                               {
-                                                       if ((user->HasPermission(commandname)) || (is_uline(user->server)))
-                                                       {
-                                                               cmdlist[i].handler_function(parameters,pcnt,user);
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       cmdlist[i].handler_function(parameters,pcnt,user);
-                                               }
-                                       }
-                               }
-                       }
-               }
+                       factory.erase(t);
+                       factory.push_back(NULL);
+                       return;
+               }
+               v++;
        }
 }
 
-int process_parameters(char **command_p,char *parameters)
+void InspIRCd::erase_module(int j)
 {
-       int j = 0;
-       int q = strlen(parameters);
-       if (!q)
-       {
-               /* no parameters, command_p invalid! */
-               return 0;
-       }
-       if (parameters[0] == ':')
-       {
-               command_p[0] = parameters+1;
-               return 1;
-       }
-       if (q)
+       int v1 = 0;
+       for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
        {
-               if ((strchr(parameters,' ')==NULL) || (parameters[0] == ':'))
+               if (v1 == j)
                {
-                       /* only one parameter */
-                       command_p[0] = parameters;
-                       if (parameters[0] == ':')
-                       {
-                               if (strchr(parameters,' ') != NULL)
-                               {
-                                       command_p[0]++;
-                               }
-                       }
-                       return 1;
+                       delete *m;
+                       modules.erase(m);
+                       modules.push_back(NULL);
+                       break;
                }
+               v1++;
        }
-       command_p[j++] = parameters;
-       for (int i = 0; i <= q; i++)
+       int v2 = 0;
+       for (std::vector<std::string>::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++)
        {
-               if (parameters[i] == ' ')
+               if (v2 == j)
                {
-                       command_p[j++] = parameters+i+1;
-                       parameters[i] = '\0';
-                       if (command_p[j-1][0] == ':')
-                       {
-                               *command_p[j-1]++; /* remove dodgy ":" */
-                               break;
-                               /* parameter like this marks end of the sequence */
-                       }
+                      Config->module_names.erase(v);
+                      break;
                }
+               v2++;
        }
-       return j; /* returns total number of items in the list */
+
 }
 
-void process_command(userrec *user, char* cmd)
+void InspIRCd::MoveTo(std::string modulename,int slot)
 {
-       char *parameters;
-       char *command;
-       char *command_p[127];
-       char p[MAXBUF], temp[MAXBUF];
-       int j, items, cmd_found;
-
-       for (int i = 0; i < 127; i++)
-               command_p[i] = NULL;
-
-       if (!user)
-       {
-               return;
-       }
-       if (!cmd)
+       unsigned int v2 = 256;
+       for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
-               return;
-       }
-       if (!cmd[0])
-       {
-               return;
-       }
-       
-       int total_params = 0;
-       if (strlen(cmd)>2)
-       {
-               for (unsigned int q = 0; q < strlen(cmd)-1; q++)
+               if (Config->module_names[v] == modulename)
                {
-                       if ((cmd[q] == ' ') && (cmd[q+1] == ':'))
-                       {
-                               total_params++;
-                               // found a 'trailing', we dont count them after this.
-                               break;
-                       }
-                       if (cmd[q] == ' ')
-                               total_params++;
-               }
-       }
-
-       // another phidjit bug...
-       if (total_params > 126)
-       {
-               *(strchr(cmd,' ')) = '\0';
-               WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd);
-               return;
-       }
-
-       strlcpy(temp,cmd,MAXBUF);
-       
-       std::string tmp = cmd;
-       for (int i = 0; i <= MODCOUNT; i++)
-       {
-               std::string oldtmp = tmp;
-               modules[i]->OnServerRaw(tmp,true,user);
-               if (oldtmp != tmp)
-               {
-                       log(DEBUG,"A Module changed the input string!");
-                       log(DEBUG,"New string: %s",tmp.c_str());
-                       log(DEBUG,"Old string: %s",oldtmp.c_str());
+                       // found an instance, swap it with the item at MODCOUNT
+                       v2 = v;
                        break;
                }
        }
-       strlcpy(cmd,tmp.c_str(),MAXBUF);
-       strlcpy(temp,cmd,MAXBUF);
-
-       if (!strchr(cmd,' '))
-       {
-               /* no parameters, lets skip the formalities and not chop up
-                * the string */
-               log(DEBUG,"About to preprocess command with no params");
-               items = 0;
-               command_p[0] = NULL;
-               parameters = NULL;
-               for (unsigned int i = 0; i <= strlen(cmd); i++)
+       if ((v2 != (unsigned int)slot) && (v2 < 256))
+       {
+               // 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++)
                {
-                       cmd[i] = toupper(cmd[i]);
+                       char x = Config->implement_lists[v2][n];
+                       Config->implement_lists[v2][n] = Config->implement_lists[slot][n];
+                       Config->implement_lists[slot][n] = x;
                }
-               command = cmd;
        }
        else
        {
-               strcpy(cmd,"");
-               j = 0;
-               /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */
-               for (unsigned int i = 0; i < strlen(temp); i++)
-               {
-                       if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7))
-                       {
-                               cmd[j++] = temp[i];
-                               cmd[j] = 0;
-                       }
-               }
-               /* split the full string into a command plus parameters */
-               parameters = p;
-               strcpy(p," ");
-               command = cmd;
-               if (strchr(cmd,' '))
-               {
-                       for (unsigned int i = 0; i <= strlen(cmd); i++)
-                       {
-                               /* capitalise the command ONLY, leave params intact */
-                               cmd[i] = toupper(cmd[i]);
-                               /* are we nearly there yet?! :P */
-                               if (cmd[i] == ' ')
-                               {
-                                       command = cmd;
-                                       parameters = cmd+i+1;
-                                       cmd[i] = '\0';
-                                       break;
-                               }
-                       }
-               }
-               else
-               {
-                       for (unsigned int i = 0; i <= strlen(cmd); i++)
-                       {
-                               cmd[i] = toupper(cmd[i]);
-                       }
-               }
-
-       }
-       cmd_found = 0;
-       
-       if (strlen(command)>MAXCOMMAND)
-       {
-               WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command);
-               return;
-       }
-       
-       for (unsigned int x = 0; x < strlen(command); x++)
-       {
-               if (((command[x] < 'A') || (command[x] > 'Z')) && (command[x] != '.'))
-               {
-                       if (((command[x] < '0') || (command[x]> '9')) && (command[x] != '-'))
-                       {
-                               if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x]))
-                               {
-                                       stats->statsUnknown++;
-                                       WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
-                                       return;
-                               }
-                       }
-               }
+               log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
        }
+}
 
-       std::string xcommand = command;
-       for (unsigned int i = 0; i != cmdlist.size(); i++)
+void InspIRCd::MoveAfter(std::string modulename, std::string after)
+{
+       for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
-               if (cmdlist[i].command[0])
+               if (Config->module_names[v] == after)
                {
-                       if (strlen(command)>=(strlen(cmdlist[i].command))) if (!strncmp(command, cmdlist[i].command,MAXCOMMAND))
-                       {
-                               if (parameters)
-                               {
-                                       if (parameters[0])
-                                       {
-                                               items = process_parameters(command_p,parameters);
-                                       }
-                                       else
-                                       {
-                                               items = 0;
-                                               command_p[0] = NULL;
-                                       }
-                               }
-                               else
-                               {
-                                       items = 0;
-                                       command_p[0] = NULL;
-                               }
-                               
-                               if (user)
-                               {
-                                       /* activity resets the ping pending timer */
-                                       user->nping = TIME + user->pingmax;
-                                       if ((items) < cmdlist[i].min_params)
-                                       {
-                                               log(DEBUG,"process_command: not enough parameters: %s %s",user->nick,command);
-                                               WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
-                                               return;
-                                       }
-                                       if ((!strchr(user->modes,cmdlist[i].flags_needed)) && (cmdlist[i].flags_needed))
-                                       {
-                                               log(DEBUG,"process_command: permission denied: %s %s",user->nick,command);
-                                               WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
-                                               cmd_found = 1;
-                                               return;
-                                       }
-                                       if ((cmdlist[i].flags_needed) && (!user->HasPermission(xcommand)))
-                                       {
-                                               log(DEBUG,"process_command: permission denied: %s %s",user->nick,command);
-                                               WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command);
-                                               cmd_found = 1;
-                                               return;
-                                       }
-                                       /* if the command isnt USER, PASS, or NICK, and nick is empty,
-                                        * deny command! */
-                                       if ((strncmp(command,"USER",4)) && (strncmp(command,"NICK",4)) && (strncmp(command,"PASS",4)))
-                                       {
-                                               if ((!isnick(user->nick)) || (user->registered != 7))
-                                               {
-                                                       log(DEBUG,"process_command: not registered: %s %s",user->nick,command);
-                                                       WriteServ(user->fd,"451 %s :You have not registered",command);
-                                                       return;
-                                               }
-                                       }
-                                       if ((user->registered == 7) && (!strchr(user->modes,'o')))
-                                       {
-                                               std::stringstream dcmds(Config->DisabledCommands);
-                                               while (!dcmds.eof())
-                                               {
-                                                       std::string thiscmd;
-                                                       dcmds >> thiscmd;
-                                                       if (!strcasecmp(thiscmd.c_str(),command))
-                                                       {
-                                                               // command is disabled!
-                                                               WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command);
-                                                               return;
-                                                       }
-                                               }
-                                       }
-                                       if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4)))
-                                       {
-                                               if (cmdlist[i].handler_function)
-                                               {
-                                                       
-                                                       /* ikky /stats counters */
-                                                       if (temp)
-                                                       {
-                                                               cmdlist[i].use_count++;
-                                                               cmdlist[i].total_bytes+=strlen(temp);
-                                                       }
-
-                                                       int MOD_RESULT = 0;
-                                                       FOREACH_RESULT(OnPreCommand(command,command_p,items,user));
-                                                       if (MOD_RESULT == 1) {
-                                                               return;
-                                                       }
-
-                                                       /* WARNING: nothing may come after the
-                                                        * command handler call, as the handler
-                                                        * may free the user structure! */
-
-                                                       cmdlist[i].handler_function(command_p,items,user);
-                                               }
-                                               return;
-                                       }
-                                       else
-                                       {
-                                               WriteServ(user->fd,"451 %s :You have not registered",command);
-                                               return;
-                                       }
-                               }
-                               cmd_found = 1;
-                       }
+                       MoveTo(modulename, v);
+                       return;
                }
        }
-       if ((!cmd_found) && (user))
-       {
-               stats->statsUnknown++;
-               WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
-       }
 }
 
-bool removecommands(const char* source)
+void InspIRCd::MoveBefore(std::string modulename, std::string before)
 {
-       bool go_again = true;
-       while (go_again)
+       for (unsigned int v = 0; v < Config->module_names.size(); v++)
        {
-               go_again = false;
-               for (std::deque<command_t>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+               if (Config->module_names[v] == before)
                {
-                       if (!strcmp(i->source,source))
+                       if (v > 0)
                        {
-                               log(DEBUG,"removecommands(%s) Removing dependent command: %s",i->source,i->command);
-                               cmdlist.erase(i);
-                               go_again = true;
-                               break;
+                               MoveTo(modulename, v-1);
                        }
+                       else
+                       {
+                               MoveTo(modulename, v);
+                       }
+                       return;
                }
        }
-       return true;
-}
-
-
-void process_buffer(const char* cmdbuf,userrec *user)
-{
-       if (!user)
-       {
-               log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
-               return;
-       }
-       char cmd[MAXBUF];
-       if (!cmdbuf)
-       {
-               log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
-               return;
-       }
-       if (!cmdbuf[0])
-       {
-               return;
-       }
-       while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces
-
-       strlcpy(cmd,cmdbuf,MAXBUF);
-       if (!cmd[0])
-       {
-               return;
-       }
-       int sl = strlen(cmd)-1;
-       if ((cmd[sl] == 13) || (cmd[sl] == 10))
-       {
-               cmd[sl] = '\0';
-       }
-       sl = strlen(cmd)-1;
-       if ((cmd[sl] == 13) || (cmd[sl] == 10))
-       {
-               cmd[sl] = '\0';
-       }
-       sl = strlen(cmd)-1;
-       while (cmd[sl] == ' ') // strip trailing spaces
-       {
-               cmd[sl] = '\0';
-               sl = strlen(cmd)-1;
-       }
-
-       if (!cmd[0])
-       {
-               return;
-       }
-        log(DEBUG,"CMDIN: %s %s",user->nick,cmd);
-       tidystring(cmd);
-       if ((user) && (cmd))
-       {
-               process_command(user,cmd);
-       }
 }
 
-char* InspIRCd::ModuleError()
+void InspIRCd::MoveToFirst(std::string modulename)
 {
-       return MODERR;
+       MoveTo(modulename,0);
 }
 
-void InspIRCd::erase_factory(int j)
+void InspIRCd::MoveToLast(std::string modulename)
 {
-       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;
-               }
-               v++;
-       }
+       MoveTo(modulename,MODCOUNT);
 }
 
-void InspIRCd::erase_module(int j)
+void InspIRCd::BuildISupport()
 {
-       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);
-                       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++;
-        }
-
+       // 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 << " 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";
+       Config->data005 = v.str();
+       FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
 }
 
 bool InspIRCd::UnloadModule(const char* filename)
@@ -956,16 +506,34 @@ bool InspIRCd::UnloadModule(const char* filename)
                        {
                                modules[j]->OnCleanup(TYPE_USER,u->second);
                        }
-                       FOREACH_MOD OnUnloadModule(modules[j],Config->module_names[j]);
+
+                       FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
+
+                       for(int t = 0; t < 255; t++)
+                       {
+                               Config->global_implementation[t] -= Config->implement_lists[j][t];
+                       }
+
+                       /* We have to renumber implement_lists after unload because the module numbers change!
+                        */
+                       for(int j2 = j; j2 < 254; j2++)
+                       {
+                               for(int t = 0; t < 255; t++)
+                               {
+                                       Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t];
+                               }
+                       }
+
                        // found the module
                        log(DEBUG,"Deleting module...");
                        erase_module(j);
                        log(DEBUG,"Erasing module entry...");
                        erase_factory(j);
-                        log(DEBUG,"Removing dependent commands...");
-                        removecommands(filename);
+                       log(DEBUG,"Removing dependent commands...");
+                       Parser->RemoveCommands(filename);
                        log(DEFAULT,"Module %s unloaded",filename);
                        MODCOUNT--;
+                       BuildISupport();
                        return true;
                }
        }
@@ -978,23 +546,25 @@ bool InspIRCd::LoadModule(const char* filename)
 {
        char modfile[MAXBUF];
 #ifdef STATIC_LINK
-       snprintf(modfile,MAXBUF,"%s",filename);
+       strlcpy(modfile,filename,MAXBUF);
 #else
        snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
 #endif
        std::string filename_str = filename;
 #ifndef STATIC_LINK
+#ifndef IS_CYGWIN
        if (!DirValid(modfile))
        {
                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);
 #ifndef STATIC_LINK
-        if (FileExists(modfile))
-        {
+       if (FileExists(modfile))
+       {
 #endif
                for (unsigned int j = 0; j < Config->module_names.size(); j++)
                {
@@ -1006,217 +576,360 @@ bool InspIRCd::LoadModule(const char* filename)
                        }
                }
                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());
+               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());
-                       MODCOUNT--;
                        return false;
-                }
-                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);
-                }
-               else
-                {
-                        log(DEFAULT,"Unable to load %s",modfile);
-                       snprintf(MODERR,MAXBUF,"Factory function failed!");
+               }
+               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];
+                               for(int t = 0; t < 255; t++)
+                                       x[t] = 0;
+
+                               modules[MODCOUNT+1]->Implements(x);
+
+                               for(int t = 0; t < 255; t++)
+                                       Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
+                       }
+                       else
+                       {
+                                       log(DEFAULT,"Unable to load %s",modfile);
+                               snprintf(MODERR,MAXBUF,"Factory function failed!");
+                               return false;
+                       }
+               }
+               catch (ModuleException& modexcept)
+               {
+                       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
+       {
+               log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
                snprintf(MODERR,MAXBUF,"Module file could not be found");
                return false;
-        }
+       }
 #endif
        MODCOUNT++;
-       FOREACH_MOD OnLoadModule(modules[MODCOUNT],filename_str);
+       FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[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;
+       std::vector<std::string> put_to_front;
+       std::map<std::string,std::string> put_before;
+       std::map<std::string,std::string> put_after;
+       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;
 }
 
-int InspIRCd::Run()
+void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
-       bool expire_run = false;
-       std::vector<int> activefds;
+       int activefds[MAX_DESCRIPTORS];
        int incomingSockfd;
        int in_port;
        userrec* cu = NULL;
        InspSocket* s = NULL;
        InspSocket* s_del = NULL;
-       char* target;
        unsigned int numberactive;
-        sockaddr_in sock_us;     // our port number
-        socklen_t uslen;         // length of our port number
+       insp_sockaddr sock_us;     // our port number
+       socklen_t uslen;         // length of our port number
 
-       if (!Config->nofork)
+       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)
+               {
+                       /* 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));
+               }
+               TickMissedTimers(TIME);
+               expire_run = true;
+               yield_depth--;
+               return;
+       }   
+       else if ((TIME % 5) == 1)
        {
-               freopen("/dev/null","w",stdout);
-               freopen("/dev/null","w",stderr);
+               expire_run = false;
        }
 
-       /* Add the listening sockets used for client inbound connections
-        * to the socket engine
+       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)
+               {
+                       MaintainWhoWas(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.
         */
-       for (int count = 0; count < stats->BoundPortCount; count++)
-               SE->AddFd(openSockfd[count],true,X_LISTEN);
+       if (!(numberactive = SE->Wait(activefds)))
+       {
+               yield_depth--;
+               return;
+       }
 
-       WritePID(Config->PID);
+       /**
+        * 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);
 
-       /* main loop, this never returns */
-       for (;;)
+       for (unsigned int activefd = 0; activefd < numberactive; activefd++)
        {
-               /* 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 % 8) == 0) && (!expire_run))
-               {
-                       expire_lines();
-                       FOREACH_MOD OnBackgroundTimer(TIME);
-                       expire_run = true;
-                       continue;
-               }
-               if ((TIME % 8) == 1)
-                       expire_run = false;
-               
-               /* Once a second, do the background processing */
-               if (TIME != OLDTIME)
-                       while (DoBackgroundUserStuff(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.
-                */
-               SE->Wait(activefds);
-
-               /**
-                * 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.
-                */
-               numberactive = activefds.size();
-               for (unsigned int activefd = 0; activefd < numberactive; activefd++)
+               int socket_type = SE->GetType(activefds[activefd]);
+               switch (socket_type)
                {
-                       int socket_type = SE->GetType(activefds[activefd]);
-                       switch (socket_type)
-                       {
-                               case X_ESTAB_CLIENT:
+                       case X_ESTAB_CLIENT:
 
-                                       cu = fd_ref_table[activefds[activefd]];
-                                       if (cu)
-                                               ProcessUser(cu);
-
-                               break;
+                               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:
 
-                               case X_ESTAB_MODULE:
+                               log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]);
 
-                                       /* 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 (!process_module_sockets)
+                                       break;
 
-                                       if ((s) && (!s->Poll()))
+                               /* 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++)
                                        {
-                                               log(DEBUG,"Socket poll returned false, close and bail");
-                                               SE->DelFd(s->GetFd());
-                                               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]))
                                                {
-                                                       s_del = (InspSocket*)*a;
-                                                       if ((s_del) && (s_del->GetFd() == activefds[activefd]))
-                                                       {
-                                                               module_sockets.erase(a);
-                                                               break;
-                                                       }
+                                                       module_sockets.erase(a);
+                                                       break;
                                                }
-                                               s->Close();
-                                               delete s;
                                        }
+                                       s->Close();
+                                       delete s;
+                               }
+                               else if (!s)
+                               {
+                                       log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!");
+                                       SE->DelFd(s->GetFd());
+                               }
+                       break;
 
-                               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_ESTAB_DNS:
+                       case X_LISTEN:
 
-                                       /* 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.
+                               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...
                                         */
-#ifndef THREADED_DNS
-                                       dns_poll(activefds[activefd]);
-#endif
-                               break;
-                               
-                               case X_LISTEN:
-
-                                       /* It's a listener */
-                                       uslen = sizeof(sock_us);
-                                       length = sizeof(client);
-                                       incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length);
-                                       if (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))
+                                       NonBlocking(incomingSockfd);
+                                       if (Config->GetIOHook(in_port))
                                        {
-                                               in_port = ntohs(sock_us.sin_port);
-                                               log(DEBUG,"Accepted socket %d",incomingSockfd);
-                                               target = (char*)inet_ntoa(client.sin_addr);
-                                               /* Years and years ago, we used to resolve here
-                                                * using gethostbyaddr(). That is sucky and we
-                                                * don't do that any more...
-                                                */
-                                               if (incomingSockfd >= 0)
+                                               try
                                                {
-                                                       if (IOHookModule)
-                                                       {
-                                                               IOHookModule->OnRawSocketAccept(incomingSockfd, target, in_port);
-                                                       }
-                                                       stats->statsAccept++;
-                                                       AddClient(incomingSockfd, target, in_port, false, target);
-                                                       log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
+                                                       Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
                                                }
-                                               else
+                                               catch (ModuleException& modexcept)
                                                {
-                                                       WriteOpers("*** WARNING: accept() failed on port %lu (%s)",(unsigned long)in_port,target);
-                                                       log(DEBUG,"accept failed: %lu",(unsigned long)in_port);
-                                                       stats->statsRefused++;
+                                                       log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
                                                }
                                        }
-                                       else
-                                       {
-                                               log(DEBUG,"Couldnt look up the port number for fd %lu (OS BROKEN?!)",incomingSockfd);
-                                               shutdown(incomingSockfd,2);
-                                               close(incomingSockfd);
-                                       }
-                               break;
+                                       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.
-                                        */
-                               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--;
+}
+
+int InspIRCd::Run()
+{
+       /* Until THIS point, ServerInstance == NULL */
+       
+       LoadAllModules(this);
 
+       /* Just in case no modules were loaded - fix for bug #101 */
+       this->BuildISupport();
+
+       printf("\nInspIRCd is now running!\n");
+       
+       if (!Config->nofork)
+       {
+               fclose(stdout);
+               fclose(stderr);
+               fclose(stdin);
+       }
+
+       /* 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);
+
+       /* main loop, this never returns */
+       expire_run = false;
+       yield_depth = 0;
+       iterations = 0;
+
+       while (true)
+       {
+               DoOneIteration(true);
        }
        /* This is never reached -- we hope! */
        return 0;
@@ -1230,9 +943,17 @@ int InspIRCd::Run()
 
 int main(int argc, char** argv)
 {
-        ServerInstance = new InspIRCd(argc, argv);
-        ServerInstance->Run();
-        delete ServerInstance;
-        return 0;
+       try
+       {
+               ServerInstance = new InspIRCd(argc, argv);
+               ServerInstance->Run();
+               delete ServerInstance;
+       }
+       catch (std::bad_alloc)
+       {
+               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!");
+       }
+       return 0;
 }
-