]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Fix two things: (1) log gets replaced by a user fd after restart causing debug log...
[user/henk/code/inspircd.git] / src / inspircd.cpp
index dc139fa0dc036c125d1c86f49d00928593307012..2ec9417080b94a11effc60eb2e1a35fb5251e568 100644 (file)
@@ -1,37 +1,23 @@
-/* ---------------------------------------------------------------------
- * 
- *           +------------------------------------+
- *           | 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>
- *     
- *  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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  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.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for 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.
- *
- * ---------------------------------------------------------------------
+ * ---------------------------------------------------
  */
 
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
+#include <dirent.h>
 #include <exception>
 #include <fstream>
+#include <unistd.h>
 #include "modules.h"
 #include "mode.h"
 #include "xline.h"
 #include "socket.h"
 #include "typedefs.h"
 #include "command_parse.h"
+#include "exitcodes.h"
 #include <dlfcn.h>
+#include <getopt.h>
+
 
 using irc::sockets::NonBlocking;
 using irc::sockets::Blocking;
@@ -52,8 +41,6 @@ InspIRCd* SI = NULL;
 
 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. */
 }
@@ -61,9 +48,9 @@ void InspIRCd::AddServerName(const std::string &servername)
 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();
        }
@@ -78,28 +65,153 @@ bool InspIRCd::FindServerName(const std::string &servername)
 
 void InspIRCd::Exit(int status)
 {
+       if (SI)
+       {
+               SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
+               SI->Cleanup();
+       }
        exit (status);
 }
 
+void InspIRCd::Cleanup()
+{
+       std::vector<std::string> mymodnames;
+       int MyModCount = this->GetModuleCount();
+
+       for (unsigned int i = 0; i < stats->BoundPortCount; i++)
+       {
+               /* This calls the constructor and closes the listening socket */
+               delete Config->openSockfd[i];
+               Config->openSockfd[i] = NULL;
+       }
+       stats->BoundPortCount = 0;
+
+       /* Close all client sockets, or the new process inherits them */
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       {
+               (*i)->SetWriteError("Server shutdown");
+               (*i)->CloseSocket();
+       }
+
+       /* We do this more than once, so that any service providers get a
+        * chance to be unhooked by the modules using them, but then get
+        * a chance to be removed themsleves.
+        */
+       for (int tries = 0; tries < 3; tries++)
+       {
+               MyModCount = this->GetModuleCount();
+               mymodnames.clear();
+
+               /* Unload all modules, so they get a chance to clean up their listeners */
+               for (int j = 0; j <= MyModCount; j++)
+                       mymodnames.push_back(Config->module_names[j]);
+
+               for (int k = 0; k <= MyModCount; k++)
+                       this->UnloadModule(mymodnames[k].c_str());
+       }
+
+       /* Close logging */
+       this->Logger->Close();
+}
+
+void InspIRCd::Restart(const std::string &reason)
+{
+       /* SendError flushes each client's queue,
+        * regardless of writeability state
+        */
+       this->SendError(reason);
+
+       this->Cleanup();
+
+       /* Figure out our filename (if theyve renamed it, we're boned) */
+       std::string me = Config->MyDir + "/inspircd";
+
+       char* argv[10];
+       int endp = 2;
+       argv[0] = Config->argv[0];
+       argv[1] = "--restart";
+       if (Config->forcedebug)
+               argv[endp++] = "--debug";
+       if (Config->nofork)
+               argv[endp++] = "--nofork";
+       if (!Config->writelog)
+               argv[endp++] = "--nolog";
+       if (*this->LogFileName)
+       {
+               argv[endp++] = "--logfile";
+               argv[endp++] = this->LogFileName;
+       }
+
+       argv[endp] = NULL;
+
+       if (execv(me.c_str(), argv) == -1)
+       {
+               /* Will raise a SIGABRT if not trapped */
+               throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
+       }
+}
+
 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("(C) InspIRCd Development Team.\033[0m\n\n");
+       printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey\033[0m\n");
        printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
-       printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n");
 }
 
 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->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
+       SI->CloseLog();
+       SI->OpenLog(SI->Config->argv, SI->Config->argc);
+       SI->RehashUsersAndChans();
+       FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
        SI->Config->Read(false,NULL);
-       FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
+       SI->ResetMaxBans();
+       SI->Res->Rehash();
+       SI->BuildISupport();
+       FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
 }
 
-void InspIRCd::SetSignals(bool SEGVHandler)
+void InspIRCd::ResetMaxBans()
+{
+       for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++)
+               i->second->ResetMaxBans();
+}
+
+
+/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
+ * we must occasionally rehash the hash (yes really).
+ * We do this by copying the entries from the old hash to a new hash, causing all
+ * empty buckets to be weeded out of the hash. We dont do this on a timer, as its
+ * very expensive, so instead we do it when the user types /REHASH and expects a
+ * short delay anyway.
+ */
+void InspIRCd::RehashUsersAndChans()
+{
+       user_hash* old_users = this->clientlist;
+       chan_hash* old_chans = this->chanlist;
+
+       this->clientlist = new user_hash();
+       this->chanlist = new chan_hash();
+
+       for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
+               this->clientlist->insert(*n);
+
+       delete old_users;
+
+       for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
+               this->chanlist->insert(*n);
+
+       delete old_chans;
+}
+
+void InspIRCd::CloseLog()
+{
+       this->Logger->Close();
+}
+
+void InspIRCd::SetSignals()
 {
        signal(SIGALRM, SIG_IGN);
        signal(SIGHUP, InspIRCd::Rehash);
@@ -124,7 +236,7 @@ bool InspIRCd::DaemonSeed()
                 */
                while (kill(childpid, 0) != -1)
                        sleep(1);
-               exit(ERROR);
+               exit(0);
        }
        setsid ();
        umask (007);
@@ -148,7 +260,18 @@ bool InspIRCd::DaemonSeed()
 
 void InspIRCd::WritePID(const std::string &filename)
 {
-       std::ofstream outfile(filename.c_str());
+       std::string fname = (filename.empty() ? "inspircd.pid" : filename);
+       if (*(fname.begin()) != '/')
+       {
+               std::string::size_type pos;
+               std::string confpath = CONFIG_FILE;
+               if ((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+               {
+                       /* Leaves us with just the path */
+                       fname = confpath.substr(0, pos) + std::string("/") + fname;
+               }
+       }
+       std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
                outfile << getpid();
@@ -156,9 +279,9 @@ void InspIRCd::WritePID(const std::string &filename)
        }
        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);
+               printf("Failed to write PID-file '%s', exiting.\n",fname.c_str());
+               this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
+               Exit(EXIT_STATUS_PID);
        }
 }
 
@@ -168,91 +291,95 @@ std::string InspIRCd::GetRevision()
 }
 
 InspIRCd::InspIRCd(int argc, char** argv)
-       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365)
+       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365), GlobalCulls(this)
 {
-       bool SEGVHandler = false;
+       int found_ports = 0;
+       FailedPortList pl;
+       int do_nofork = 0, do_debug = 0, do_nolog = 0, do_restart = 0;    /* flag variables */
+       char c = 0;
 
        modules.resize(255);
        factory.resize(255);
-       
+
+       this->unregistered_count = 0;
+
+       this->clientlist = new user_hash();
+       this->chanlist = new chan_hash();
+
        this->Config = new ServerConfig(this);
+
+       this->Config->argv = argv;
+       this->Config->argc = argc;
+
+       this->Config->opertypes.clear();
+       this->Config->operclass.clear();
        this->SNO = new SnomaskManager(this);
        this->Start();
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
+       this->time_delta = 0;
+       this->next_call = this->TIME + 3;
        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);
                this->Log(DEFAULT,"main: no config");
                printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
-               Exit(ERROR);
+               Exit(EXIT_STATUS_CONFIG);
        }
+
        *this->LogFileName = 0;
-       if (argc > 1) {
-               for (int i = 1; i < argc; i++)
+
+       struct option longopts[] =
+       {
+               { "nofork",     no_argument,            &do_nofork,     1       },
+               { "logfile",    required_argument,      NULL,           'f'     },
+               { "debug",      no_argument,            &do_debug,      1       },
+               { "nolog",      no_argument,            &do_nolog,      1       },
+               { "restart",    no_argument,            &do_restart,    1       },
+               { 0, 0, 0, 0 }
+       };
+
+       while ((c = getopt_long_only(argc, argv, ":f:", longopts, NULL)) != -1)
+       {
+               switch (c)
                {
-                       if (!strcmp(argv[i],"-nofork"))
-                       {
-                               Config->nofork = true;
-                       }
-                       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);
-                       }
-                       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],"-notraceback"))
-                       {
-                               SEGVHandler = false;
-                       }
-                       else if (!strcmp(argv[i],"-logfile"))
-                       {
-                               if (argc > i+1)
-                               {
-                                       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);
-                       }
+                       case 'f':
+                               /* Log filename was set */
+                               strlcpy(LogFileName, optarg, MAXBUF);
+                               printf("LOG: Setting logfile to %s\n", LogFileName);
+                       break;
+                       case 0:
+                               /* getopt_long_only() set an int variable, just keep going */
+                       break;
+                       default:
+                               /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */
+                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>] [--restart]\n", argv[0]);
+                               Exit(EXIT_STATUS_ARGV);
+                       break;
                }
        }
 
+       /* Set the finished argument values */
+       Config->nofork = do_nofork;
+       Config->forcedebug = do_debug;
+       Config->writelog = !do_nolog;
+
        strlcpy(Config->MyExecutable,argv[0],MAXBUF);
 
        this->OpenLog(argv, argc);
        this->stats = new serverstats();
+       this->Timers = new TimerManager(this);
        this->Parser = new CommandParser(this);
-       this->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);        
+       this->AddServerName(Config->ServerName);
        CheckDie();
        InitializeDisabledCommands(Config->DisabledCommands, this);
-       stats->BoundPortCount = BindPorts(true);
+       stats->BoundPortCount = BindPorts(true, found_ports, pl);
 
        for(int t = 0; t < 255; t++)
                Config->global_implementation[t] = 0;
@@ -260,13 +387,15 @@ InspIRCd::InspIRCd(int argc, char** argv)
        memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
 
        printf("\n");
-       this->SetSignals(SEGVHandler);
+       this->SetSignals();
+
        if (!Config->nofork)
        {
                if (!this->DaemonSeed())
                {
                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
-                       Exit(ERROR);
+                       Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down.");
+                       Exit(EXIT_STATUS_FORK);
                }
        }
 
@@ -283,36 +412,72 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
 
-       if (!stats->BoundPortCount)
+       if ((stats->BoundPortCount == 0) && (found_ports > 0))
        {
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
-               Exit(ERROR);
+               Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");
+               Exit(EXIT_STATUS_BIND);
+       }
+
+       if (stats->BoundPortCount != (unsigned int)found_ports)
+       {
+               printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
+               printf("The following port%s failed to bind:\n", found_ports - stats->BoundPortCount != 1 ? "s" : "");
+               int j = 1;
+               for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+               {
+                       printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
+               }
        }
 
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
         */
-       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);
+                       Log(DEFAULT,"EH? Could not add listener to socketengine. You screwed up, aborting.");
+                       Exit(EXIT_STATUS_INTERNAL);
                }
        }
 
-       if (!Config->nofork)
+       if (!Config->nofork && !do_restart)
        {
+               int closed = 0;
+
                if (kill(getppid(), SIGTERM) == -1)
+               {
                        printf("Error killing parent process: %s\n",strerror(errno));
-               fclose(stdin);
-               fclose(stderr);
-               fclose(stdout);
+                       Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
+               }
+
+               /*Log(DEBUG,"Fileno(stdin, stdout, stderr): %d %d %d", fileno(stdin), fileno(stdout), fileno(stderr));*/
+
+               if (stdin)
+               {
+                       fclose(stdin);
+                       closed++;
+               }
+
+               if (stdout)
+               {
+                       fclose(stdout);
+                       closed++;
+               }
+
+               if (stderr)
+               {
+                       fclose(stderr);
+                       closed++;
+               }
+
+               Log(DEBUG,"%d system descriptors closed.", closed);
        }
 
        printf("\nInspIRCd is now running!\n");
+       Log(DEFAULT,"Startup complete, Initial TS=%d.", time(NULL));
 
        this->WritePID(Config->PID);
 }
@@ -327,7 +492,7 @@ std::string InspIRCd::GetVersionString()
        }
        else
        {
-               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
        }
        return versiondata;
 }
@@ -414,10 +579,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
                        Config->implement_lists[slot][n] = x;
                }
        }
-       else
-       {
-               this->Log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
-       }
 }
 
 void InspIRCd::MoveAfter(std::string modulename, std::string after)
@@ -465,11 +626,12 @@ void InspIRCd::BuildISupport()
 {
        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
-       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
        v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
        v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
        Config->data005 = v.str();
        FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
+       Config->Update005();
 }
 
 bool InspIRCd::UnloadModule(const char* filename)
@@ -485,16 +647,30 @@ bool InspIRCd::UnloadModule(const char* filename)
                                snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
                                return false;
                        }
+                       std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modules[j]);
+                       if (intercount.first > 0)
+                       {
+                               this->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str());
+                               snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!",
+                                               intercount.first,
+                                               intercount.first > 1 ? "s" : "",
+                                               intercount.first > 1 ? "are" : "is",
+                                               intercount.second.c_str());
+                               return false;
+                       }
                        /* Give the module a chance to tidy out all its metadata */
-                       for (chan_hash::iterator c = this->chanlist.begin(); c != this->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 = this->clientlist.begin(); u != this->clientlist.end(); u++)
+                       for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
                        {
                                modules[j]->OnCleanup(TYPE_USER,u->second);
                        }
 
+                       /* Tidy up any dangling resolvers */
+                       this->Res->CleanResolvers(modules[j]);
+
                        FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
 
                        for(int t = 0; t < 255; t++)
@@ -513,11 +689,8 @@ bool InspIRCd::UnloadModule(const char* filename)
                        }
 
                        // found the module
-                       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--;
@@ -532,28 +705,48 @@ bool InspIRCd::UnloadModule(const char* filename)
 
 bool InspIRCd::LoadModule(const char* filename)
 {
+       /* Do we have a glob pattern in the filename?
+        * The user wants to load multiple modules which
+        * match the pattern.
+        */
+       if (strchr(filename,'*') || (strchr(filename,'?')))
+       {
+               int n_match = 0;
+               DIR* library = opendir(Config->ModPath);
+               if (library)
+               {
+                       /* Try and locate and load all modules matching the pattern */
+                       dirent* entry = NULL;
+                       while ((entry = readdir(library)))
+                       {
+                               if (this->MatchText(entry->d_name, filename))
+                               {
+                                       if (!this->LoadModule(entry->d_name))
+                                               n_match++;
+                               }
+                       }
+                       closedir(library);
+               }
+               /* Loadmodule will now return false if any one of the modules failed
+                * to load (but wont abort when it encounters a bad one) and when 1 or
+                * more modules were actually loaded.
+                */
+               return (n_match > 0);
+       }
+
        char modfile[MAXBUF];
-#ifdef STATIC_LINK
-       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 (!ServerConfig::DirValid(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
-       this->Log(DEBUG,"Loading module: %s",modfile);
-#ifndef STATIC_LINK
        if (ServerConfig::FileExists(modfile))
        {
-#endif
+
                for (unsigned int j = 0; j < Config->module_names.size(); j++)
                {
                        if (Config->module_names[j] == filename_str)
@@ -576,6 +769,22 @@ bool InspIRCd::LoadModule(const char* filename)
                        if ((long)factory[this->ModCount+1]->factory != -1)
                        {
                                Module* m = factory[this->ModCount+1]->factory->CreateModule(this);
+
+                               Version v = m->GetVersion();
+
+                               if (v.API != API_VERSION)
+                               {
+                                       delete m;
+                                       delete a;
+                                       this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
+                                       snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
+                                       return false;
+                               }
+                               else
+                               {
+                                       this->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                               }
+
                                modules[this->ModCount+1] = m;
                                /* save the module and the module's classfactory, if
                                 * this isnt done, random crashes can occur :/ */
@@ -597,13 +806,12 @@ bool InspIRCd::LoadModule(const char* filename)
                                return false;
                        }
                }
-               catch (ModuleException& modexcept)
+               catch (CoreException& modexcept)
                {
                        this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
-                       snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason());
+                       snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                        return false;
                }
-#ifndef STATIC_LINK
        }
        else
        {
@@ -611,7 +819,6 @@ bool InspIRCd::LoadModule(const char* filename)
                snprintf(MODERR,MAXBUF,"Module file could not be found");
                return false;
        }
-#endif
        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,
@@ -645,6 +852,8 @@ bool InspIRCd::LoadModule(const char* filename)
 
 void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
+       static rusage ru;
+
        /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
         * Once per loop iteration is pleanty.
         */
@@ -662,7 +871,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                        WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
                if ((TIME % 3600) == 0)
                {
-                       irc::whowas::MaintainWhoWas(TIME);
+                       this->RehashUsersAndChans();
+                       FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                }
                Timers->TickTimers(TIME);
                this->DoBackgroundUserStuff(TIME);
@@ -673,16 +883,26 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                        FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
                        Timers->TickMissedTimers(TIME);
                }
+
+               if (!getrusage(0, &ru))
+               {
+                       gettimeofday(&this->stats->LastSampled, NULL);
+                       this->stats->LastCPU = ru.ru_utime;
+               }
        }
 
        /* 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 
+        * This will cause any read or write events to be
         * dispatched to their handlers.
         */
        SE->DispatchEvents();
+
+       /* if any users was quit, take them out */
+       GlobalCulls.Apply();
+
 }
 
 bool InspIRCd::IsIdent(const char* n)
@@ -706,30 +926,6 @@ bool InspIRCd::IsIdent(const char* n)
 }
 
 
-bool InspIRCd::IsNick(const char* n)
-{
-       if (!n || !*n)
-               return false;
-
-       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)
@@ -780,20 +976,54 @@ int InspIRCd::GetModuleCount()
        return this->ModCount;
 }
 
-time_t InspIRCd::Time()
+time_t InspIRCd::Time(bool delta)
 {
+       if (delta)
+               return TIME + time_delta;
        return TIME;
 }
 
+int InspIRCd::SetTimeDelta(int delta)
+{
+       int old = time_delta;
+       time_delta = delta;
+       this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old);
+       return old;
+}
+
+void InspIRCd::AddLocalClone(userrec* user)
+{
+       clonemap::iterator x = local_clones.find(user->GetIPString());
+       if (x != local_clones.end())
+               x->second++;
+       else
+               local_clones[user->GetIPString()] = 1;
+}
+
+void InspIRCd::AddGlobalClone(userrec* user)
+{
+       clonemap::iterator y = global_clones.find(user->GetIPString());
+       if (y != global_clones.end())
+               y->second++;
+       else
+               global_clones[user->GetIPString()] = 1;
+}
+
+int InspIRCd::GetTimeDelta()
+{
+       return time_delta;
+}
+
 bool FileLogger::Readable()
 {
        return false;
 }
 
-void FileLogger::HandleEvent(EventType et)
+void FileLogger::HandleEvent(EventType et, int errornum)
 {
        this->WriteLogLine("");
-       ServerInstance->SE->DelFd(this);
+       if (log)
+               ServerInstance->SE->DelFd(this);
 }
 
 void FileLogger::WriteLogLine(const std::string &line)
@@ -819,10 +1049,11 @@ void FileLogger::WriteLogLine(const std::string &line)
                        /* Wrote the whole buffer, and no need for write callback */
                        buffer = "";
                }
-       }
-       if (writeops++ % 20)
-       {
-               fflush(log);
+
+               if (writeops++ % 20)
+               {
+                       fflush(log);
+               }
        }
 }
 
@@ -834,18 +1065,24 @@ void FileLogger::Close()
                fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
                if (buffer.size())
                        fprintf(log,"%s",buffer.c_str());
+
+               ServerInstance->SE->DelFd(this);
+
                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 = "";
+       if (log)
+       {
+               irc::sockets::NonBlocking(fileno(log));
+               this->SetFd(fileno(log));
+               buffer = "";
+       }
 }
 
 FileLogger::~FileLogger()