]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd_io.cpp
Decide that it wasn't quite appropriate :(
[user/henk/code/inspircd.git] / src / inspircd_io.cpp
index 636710b8eb5333672a5e0d44ee2ebae353e0be3f..aee8abe88d2ecc57c1814a71091a4f1aa50dadbd 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,6 +14,9 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
+#include "inspircd_config.h"
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <fstream>
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include "inspstring.h"
+#include "helperfuncs.h"
+#include "userprocess.h"
+#include "xline.h"
 
-using namespace std;
-
-extern FILE *log_file;
-extern int boundPortCount;
+extern ServerConfig *Config;
+extern InspIRCd* ServerInstance;
 extern int openSockfd[MAXSOCKS];
+extern time_t TIME;
 
-void WriteOpers(char* text, ...);
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
 
-void Exit (int status)
+ServerConfig::ServerConfig()
 {
-       if (log_file)
-               fclose(log_file);
-       send_error("Server shutdown.");
+       this->ClearStack();
+       *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+       *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
+       *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+       log_file = NULL;
+       nofork = false;
+       unlimitcore = false;
+       AllowHalfop = true;
+       HideSplits = false;
+       dns_timeout = 5;
+       MaxTargets = 20;
+       NetBufferSize = 10240;
+       SoftLimit = MAXCLIENTS;
+       MaxConn = SOMAXCONN;
+       MaxWhoResults = 100;
+       debugging = 0;
+       LogLevel = DEFAULT;
+       DieDelay = 5;
+}
+
+void ServerConfig::ClearStack()
+{
+       include_stack.clear();
+}
+
+Module* ServerConfig::GetIOHook(int port)
+{
+       std::map<int,Module*>::iterator x = IOHookModule.find(port);
+       return (x != IOHookModule.end() ? x->second : NULL);
+}
+
+bool ServerConfig::AddIOHook(int port, Module* iomod)
+{
+       if (!GetIOHook(port))
+       {
+               IOHookModule[port] = iomod;
+               return true;
+       }
+       else
+       {
+               ModuleException err("Port already hooked by another module");
+               throw(err);
+               return false;
+       }
+}
+
+bool ServerConfig::DelIOHook(int port)
+{
+       std::map<int,Module*>::iterator x = IOHookModule.find(port);
+       if (x != IOHookModule.end())
+       {
+               IOHookModule.erase(x);
+               return true;
+       }
+       return false;
+}
+
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+{
+       int count = ConfValueEnum(tag,&Config->config_f);
+       if (count > 1)
+       {
+               if (bail)
+               {
+                       printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
+                       Exit(0);
+               }
+               else
+               {
+                       if (user)
+                       {
+                               WriteServ(user->fd,"There were errors in your configuration:");
+                               WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag);
+                       }
+                       else
+                       {
+                               WriteOpers("There were errors in the configuration file:");
+                               WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+                       }
+               }
+               return false;
+       }
+       if (count < 1)
+       {
+               if (bail)
+               {
+                       printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
+                       Exit(0);
+               }
+               else
+               {
+                       if (user)
+                       {
+                               WriteServ(user->fd,"There were errors in your configuration:");
+                               WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag);
+                       }
+                       else
+                       {
+                               WriteOpers("There were errors in the configuration file:");
+                               WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+                       }
+               }
+               return false;
+       }
+       return true;
+}
+
+void ServerConfig::Read(bool bail, userrec* user)
+{
+       /** Yes yes, i know, this function is craq worthy of
+        * sirv. Its a mess, and some day i will tidy it.
+        * ...But that day will not be today. or probaby not
+        * tomorrow even, because it works fine.
+        */
+        char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF],MT[MAXBUF];
+        char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF],SLIMT[MAXBUF];
+       char localmax[MAXBUF],globalmax[MAXBUF],HS[MAXBUF];
+        ConnectClass c;
+        std::stringstream errstr;
+        include_stack.clear();
+
+        if (!LoadConf(CONFIG_FILE,&Config->config_f,&errstr))
+        {
+                errstr.seekg(0);
+                log(DEFAULT,"There were errors in your configuration:\n%s",errstr.str().c_str());
+                if (bail)
+                {
+                        printf("There were errors in your configuration:\n%s",errstr.str().c_str());
+                        Exit(0);
+                }
+                else
+                {
+                        char dataline[1024];
+                        if (user)
+                        {
+                                WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
+                                while (!errstr.eof())
+                                {
+                                        errstr.getline(dataline,1024);
+                                        WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
+                                }
+                        }
+                        else
+                        {
+                                WriteOpers("There were errors in the configuration file:");
+                                while (!errstr.eof())
+                                {
+                                        errstr.getline(dataline,1024);
+                                        WriteOpers(dataline);
+                                }
+                        }
+                        return;
+                }
+        }
 
-       // close down all listening sockets
-       for (int count = 0; count < boundPortCount; count++)
+       /* Check we dont have more than one of singular tags
+        */
+       if (!CheckOnce("server",bail,user) || !CheckOnce("admin",bail,user) || !CheckOnce("files",bail,user)
+               || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user) || !CheckOnce("pid",bail,user))
        {
-               shutdown(openSockfd[count], 2);
+               return;
        }
 
+        ConfValue("server","name",0,Config->ServerName,&Config->config_f);
+        ConfValue("server","description",0,Config->ServerDesc,&Config->config_f);
+        ConfValue("server","network",0,Config->Network,&Config->config_f);
+        ConfValue("admin","name",0,Config->AdminName,&Config->config_f);
+        ConfValue("admin","email",0,Config->AdminEmail,&Config->config_f);
+        ConfValue("admin","nick",0,Config->AdminNick,&Config->config_f);
+        ConfValue("files","motd",0,Config->motd,&Config->config_f);
+        ConfValue("files","rules",0,Config->rules,&Config->config_f);
+        ConfValue("power","diepass",0,Config->diepass,&Config->config_f);
+        ConfValue("power","pause",0,pauseval,&Config->config_f);
+        ConfValue("power","restartpass",0,Config->restartpass,&Config->config_f);
+        ConfValue("options","prefixquit",0,Config->PrefixQuit,&Config->config_f);
+        ConfValue("die","value",0,Config->DieValue,&Config->config_f);
+        ConfValue("options","loglevel",0,dbg,&Config->config_f);
+        ConfValue("options","netbuffersize",0,NB,&Config->config_f);
+        ConfValue("options","maxwho",0,MW,&Config->config_f);
+        ConfValue("options","allowhalfop",0,AH,&Config->config_f);
+        ConfValue("options","allowprotect",0,AP,&Config->config_f);
+        ConfValue("options","allowfounder",0,AF,&Config->config_f);
+        ConfValue("dns","server",0,Config->DNSServer,&Config->config_f);
+        ConfValue("dns","timeout",0,DNT,&Config->config_f);
+        ConfValue("options","moduledir",0,Config->ModPath,&Config->config_f);
+        ConfValue("disabled","commands",0,Config->DisabledCommands,&Config->config_f);
+        ConfValue("options","somaxconn",0,MCON,&Config->config_f);
+        ConfValue("options","softlimit",0,SLIMT,&Config->config_f);
+       ConfValue("options","operonlystats",0,Config->OperOnlyStats,&Config->config_f);
+       ConfValue("options","customversion",0,Config->CustomVersion,&Config->config_f);
+       ConfValue("options","maxtargets",0,MT,&Config->config_f);
+       ConfValue("options","hidesplits",0,HS,&Config->config_f);
+       ConfValue("options","hidewhois",0,Config->HideWhoisServer,&Config->config_f);
+       ConfValue("options","tempdir",0,Config->TempDir,&Config->config_f);
+
+       if (!*Config->TempDir)
+               strlcpy(Config->TempDir,"/tmp",1024);
+       Config->HideSplits = ((*HS == 'y') || (*HS == 'Y') || (*HS == '1') || (*HS == 't') || (*HS == 'T'));
+        Config->SoftLimit = atoi(SLIMT);
+       if (*MT)
+               Config->MaxTargets = atoi(MT);
+       if ((Config->MaxTargets < 0) || (Config->MaxTargets > 31))
+       {
+               log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+               Config->MaxTargets = 20;
+       }
+        if ((Config->SoftLimit < 1) || (Config->SoftLimit > MAXCLIENTS))
+        {
+                log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
+                Config->SoftLimit = MAXCLIENTS;
+        }
+        Config->MaxConn = atoi(MCON);
+        if (Config->MaxConn > SOMAXCONN)
+                log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
+        Config->NetBufferSize = atoi(NB);
+        Config->MaxWhoResults = atoi(MW);
+        Config->dns_timeout = atoi(DNT);
+       if (!strchr(Config->ServerName,'.'))
+       {
+               log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",Config->ServerName,Config->ServerName,'.');
+               strlcat(Config->ServerName,".",MAXBUF);
+       }
+        if (!Config->dns_timeout)
+                Config->dns_timeout = 5;
+        if (!Config->MaxConn)
+                Config->MaxConn = SOMAXCONN;
+        if (!*Config->DNSServer)
+       {
+               // attempt to look up their nameserver from /etc/resolv.conf
+               log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+               ifstream resolv("/etc/resolv.conf");
+               std::string nameserver;
+               bool found_server = false;
+               if (resolv.is_open())
+               {
+                       while (resolv >> nameserver)
+                       {
+                               if ((nameserver == "nameserver") && (!found_server))
+                               {
+                                       resolv >> nameserver;
+                                       strlcpy(Config->DNSServer,nameserver.c_str(),MAXBUF);
+                                       found_server = true;
+                                       log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+                               }
+                       }
+                       if (!found_server)
+                       {
+                               log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+                               strlcpy(Config->DNSServer,"127.0.0.1",MAXBUF);
+                       }
+               }
+               else
+               {
+                       log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+                       strlcpy(Config->DNSServer,"127.0.0.1",MAXBUF);
+               }
+       }
+        if (!*Config->ModPath)
+                strlcpy(Config->ModPath,MOD_PATH,MAXBUF);
+        Config->AllowHalfop = ((!strcasecmp(AH,"true")) || (!strcasecmp(AH,"1")) || (!strcasecmp(AH,"yes")));
+        if ((!Config->NetBufferSize) || (Config->NetBufferSize > 65535) || (Config->NetBufferSize < 1024))
+        {
+                log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+                Config->NetBufferSize = 10240;
+        }
+        if ((!Config->MaxWhoResults) || (Config->MaxWhoResults > 65535) || (Config->MaxWhoResults < 1))
+        {
+                log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
+                Config->MaxWhoResults = 128;
+        }
+        Config->LogLevel = DEFAULT;
+        if (!strcmp(dbg,"debug"))
+        {
+                Config->LogLevel = DEBUG;
+                Config->debugging = 1;
+        }
+        if (!strcmp(dbg,"verbose"))
+                Config->LogLevel = VERBOSE;
+        if (!strcmp(dbg,"default"))
+                Config->LogLevel = DEFAULT;
+        if (!strcmp(dbg,"sparse"))
+                Config->LogLevel = SPARSE;
+        if (!strcmp(dbg,"none"))
+                Config->LogLevel = NONE;
+
+        readfile(Config->MOTD,Config->motd);
+        log(DEFAULT,"Reading message of the day...");
+        readfile(Config->RULES,Config->rules);
+        log(DEFAULT,"Reading connect classes...");
+        Classes.clear();
+        for (int i = 0; i < ConfValueEnum("connect",&Config->config_f); i++)
+        {
+                *Value = 0;
+                ConfValue("connect","allow",i,Value,&Config->config_f);
+                ConfValue("connect","timeout",i,timeout,&Config->config_f);
+                ConfValue("connect","flood",i,flood,&Config->config_f);
+                ConfValue("connect","pingfreq",i,pfreq,&Config->config_f);
+                ConfValue("connect","threshold",i,thold,&Config->config_f);
+                ConfValue("connect","sendq",i,sqmax,&Config->config_f);
+                ConfValue("connect","recvq",i,rqmax,&Config->config_f);
+               ConfValue("connect","localmax",i,localmax,&Config->config_f);
+               ConfValue("connect","globalmax",i,globalmax,&Config->config_f);
+                if (*Value)
+                {
+                        c.host = Value;
+                        c.type = CC_ALLOW;
+                        strlcpy(Value,"",MAXBUF);
+                        ConfValue("connect","password",i,Value,&Config->config_f);
+                        c.pass = Value;
+                        c.registration_timeout = 90; // default is 2 minutes
+                        c.pingtime = 120;
+                        c.flood = atoi(flood);
+                        c.threshold = 5;
+                        c.sendqmax = 262144; // 256k
+                        c.recvqmax = 4096;   // 4k
+                       c.maxlocal = 3;
+                       c.maxglobal = 3;
+                       if (atoi(localmax)>0)
+                       {
+                               c.maxlocal = atoi(localmax);
+                       }
+                       if (atoi(globalmax)>0)
+                       {
+                               c.maxglobal = atoi(globalmax);
+                       }
+                        if (atoi(thold)>0)
+                        {
+                                c.threshold = atoi(thold);
+                        }
+                       else
+                       {
+                               c.threshold = 1;
+                               c.flood = 999;
+                               log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str());
+                       }
+                        if (atoi(sqmax)>0)
+                        {
+                                c.sendqmax = atoi(sqmax);
+                        }
+                        if (atoi(rqmax)>0)
+                        {
+                                c.recvqmax = atoi(rqmax);
+                        }
+                        if (atoi(timeout)>0)
+                        {
+                                c.registration_timeout = atoi(timeout);
+                        }
+                        if (atoi(pfreq)>0)
+                        {
+                                c.pingtime = atoi(pfreq);
+                        }
+                        Classes.push_back(c);
+               }
+                else
+                {
+                        ConfValue("connect","deny",i,Value,&Config->config_f);
+                        c.host = Value;
+                        c.type = CC_DENY;
+                        Classes.push_back(c);
+                        log(DEBUG,"Read connect class type DENY, host=%s",c.host.c_str());
+                }
+
+        }
+        log(DEFAULT,"Reading K lines,Q lines and Z lines from config...");
+        read_xline_defaults();
+        log(DEFAULT,"Applying K lines, Q lines and Z lines...");
+        apply_lines(APPLY_ALL);
+
+        ConfValue("pid","file",0,Config->PID,&Config->config_f);
+        // write once here, to try it out and make sure its ok
+        WritePID(Config->PID);
+
+        log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
+        if (!bail)
+        {
+                log(DEFAULT,"Adding and removing modules due to rehash...");
+
+                std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
+
+                // store the old module names
+                for (std::vector<std::string>::iterator t = module_names.begin(); t != module_names.end(); t++)
+                {
+                        old_module_names.push_back(*t);
+                }
+
+                // get the new module names
+                for (int count2 = 0; count2 < ConfValueEnum("module",&Config->config_f); count2++)
+                {
+                        ConfValue("module","name",count2,Value,&Config->config_f);
+                        new_module_names.push_back(Value);
+                }
+
+                // now create a list of new modules that are due to be loaded
+                // and a seperate list of modules which are due to be unloaded
+                for (std::vector<std::string>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
+                {
+                        bool added = true;
+                        for (std::vector<std::string>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
+                        {
+                                if (*old == *_new)
+                                        added = false;
+                        }
+                        if (added)
+                                added_modules.push_back(*_new);
+                }
+                for (std::vector<std::string>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
+                {
+                        bool removed = true;
+                        for (std::vector<std::string>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
+                        {
+                                if (*newm == *oldm)
+                                        removed = false;
+                        }
+                        if (removed)
+                                removed_modules.push_back(*oldm);
+                }
+                // now we have added_modules, a vector of modules to be loaded, and removed_modules, a vector of modules
+                // to be removed.
+                int rem = 0, add = 0;
+                if (!removed_modules.empty())
+                for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+                {
+                        if (ServerInstance->UnloadModule(removing->c_str()))
+                        {
+                                WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+                                if (user)
+                                       WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+                                rem++;
+                        }
+                        else
+                        {
+                               if (user)
+                                       WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                        }
+                }
+                if (!added_modules.empty())
+                for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+                {
+                        if (ServerInstance->LoadModule(adding->c_str()))
+                        {
+                                WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+                               if (user)
+                                       WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+                                add++;
+                        }
+                        else
+                        {
+                               if (user)
+                                       WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                        }
+                }
+                log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
+                                                                                                       (unsigned long)add,(unsigned long)added_modules.size());
+       }
+}
+
+
+void Exit (int status)
+{
+       if (Config->log_file)
+               fclose(Config->log_file);
+       send_error("Server shutdown.");
        exit (status);
 }
 
 void Killed(int status)
 {
-       if (log_file)
-               fclose(log_file);
+       if (Config->log_file)
+               fclose(Config->log_file);
        send_error("Server terminated.");
-        // close down all listening sockets
-       for (int count = 0; count < boundPortCount; count++)
-       {
-               shutdown(openSockfd[count], 2);
-       }
        exit(status);
 }
 
+char* CleanFilename(char* name)
+{
+       char* p = name + strlen(name);
+       while ((p != name) && (*p != '/')) p--;
+       return (p != name ? ++p : p);
+}
+
+
 void Rehash(int status)
 {
-       WriteOpers("Rehashing config file %s due to SIGHUP",CONFIG_FILE);
-       ReadConfig(false,NULL);
+       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(""));
 }
 
 
 
 void Start (void)
 {
-       printf("\033[1;37mInspire Internet Relay Chat Server, compiled " __DATE__ " at " __TIME__ "\n");
-       printf("(C) ChatSpike Development team.\033[0;37m\n\n");
-       printf("\033[1;37mDevelopers:\033[0;37m     Brain, FrostyCoolSlug\n");
-       printf("\033[1;37mDocumentation:\033[0;37m  FrostyCoolSlug, w00t\n");
-       printf("\033[1;37mTesters:\033[0;37m        typobox43, piggles, Lord_Zathras, CC\n");
-       printf("\033[1;37mName concept:\033[0;37m   Lord_Zathras\n\n");
+       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:\033[1;32m     Brain, FrostyCoolSlug\033[0m\n");
+       printf("Documentation:\033[1;32m  FrostyCoolSlug, w00t\033[0m\n");
+       printf("Testers:\033[1;32m        typobox43, piggles, Lord_Zathras, CC\033[0m\n");
+       printf("Name concept:\033[1;32m   Lord_Zathras\033[0m\n\n");
 }
 
 void WritePID(std::string filename)
@@ -92,38 +557,49 @@ void WritePID(std::string filename)
        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);
        }
 }
 
-void DeadPipe(int status)
+void SetSignals()
 {
-  signal (SIGPIPE, DeadPipe);
+       signal (SIGALRM, SIG_IGN);
+       signal (SIGHUP, Rehash);
+       signal (SIGPIPE, SIG_IGN);
+       signal (SIGTERM, Exit);
+       signal (SIGSEGV, Error);
 }
 
+
 int DaemonSeed (void)
 {
        int childpid;
-       signal (SIGALRM, SIG_IGN);
-       signal (SIGHUP, Rehash);
-       signal (SIGPIPE, DeadPipe);
-       signal (SIGTERM, Exit);
-       signal (SIGABRT, Exit);
-       signal (SIGSEGV, Error);
-       signal (SIGURG, Exit);
-       signal (SIGKILL, Exit);
        if ((childpid = fork ()) < 0)
                return (ERROR);
        else if (childpid > 0)
                exit (0);
        setsid ();
        umask (007);
-       /* close stdout, stdin, stderr */
-       close(0);
-       close(1);
-       close(2);
+       printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
+
+       setpriority(PRIO_PROCESS,(int)getpid(),15);
 
-       setpriority(PRIO_PROCESS,(int)getpid(),15); /* ircd sets to low process priority so it doesnt hog the box */
+       if (Config->unlimitcore)
+       {
+               rlimit rl;
+               if (getrlimit(RLIMIT_CORE, &rl) == -1)
+               {
+                       log(DEFAULT,"Failed to getrlimit()!");
+                       return(FALSE);
+               }
+               else
+               {
+                       rl.rlim_cur = rl.rlim_max;
+                       if (setrlimit(RLIMIT_CORE, &rl) == -1)
+                               log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
+               }
+       }
   
        return (TRUE);
 }
@@ -164,7 +640,7 @@ bool FileExists (const char* file)
  * Turns multiple spaces that are outside of quotes into single spaces
  */
 
-std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errorstream, bool &error, std::string filename)
+std::string ServerConfig::ConfProcess(char* buffer, long linenumber, std::stringstream* errorstream, bool &error, std::string filename)
 {
        long number_of_quotes = 0;
        long number_of_equals = 0;
@@ -176,17 +652,17 @@ std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errors
                return "";
        }
        // firstly clean up the line by stripping spaces from the start and end and converting tabs to spaces
-       for (int d = 0; d < strlen(buffer); d++)
-               if ((buffer[d]) == 9)
-                       buffer[d] = ' ';
-       while ((buffer[0] == ' ') && (strlen(buffer)>0)) buffer++;
-       while ((buffer[strlen(buffer)-1] == ' ') && (strlen(buffer)>0)) buffer[strlen(buffer)-1] = '\0';
-       // empty lines are syntactically valid
-       if (!strcmp(buffer,""))
-               return "";
-       else if (buffer[0] == '#')
+       for (char* d = buffer; *d; d++)
+               if (*d == 9)
+                       *d = ' ';
+       while (*buffer == ' ') buffer++;
+       while ((buffer[strlen(buffer)-1] == ' ') && (*buffer)) buffer[strlen(buffer)-1] = '\0';
+
+       // empty lines are syntactically valid, as are comments
+       if (!(*buffer) || buffer[0] == '#')
                return "";
-       for (int c = 0; c < strlen(buffer); c++)
+
+       for (unsigned int c = 0; c < strlen(buffer); c++)
        {
                // convert all spaces that are OUTSIDE quotes into hardspace (0xA0) as this will make them easier to
                // search and replace later :)
@@ -273,7 +749,7 @@ std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errors
        }
 
        // turn our hardspace back into softspace
-       for (int d = 0; d < parsedata.length(); d++)
+       for (unsigned int d = 0; d < parsedata.length(); d++)
        {
                if (parsedata[d] == '\xA0')
                        parsedata[d] = ' ';
@@ -283,7 +759,21 @@ std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errors
        return parsedata;
 }
 
-bool LoadConf(const char* filename, std::stringstream *target, std::stringstream* errorstream)
+int ServerConfig::fgets_safe(char* buffer, size_t maxsize, FILE* &file)
+{
+       char c_read = '\0';
+       unsigned int bufptr = 0;
+       while ((!feof(file)) && (c_read != '\n') && (c_read != '\r') && (bufptr < maxsize))
+       {
+               c_read = fgetc(file);
+               if ((c_read != '\n') && (c_read != '\r'))
+                       buffer[bufptr++] = c_read;
+       }
+       buffer[bufptr] = '\0';
+       return bufptr;
+}
+
+bool ServerConfig::LoadConf(const char* filename, std::stringstream *target, std::stringstream* errorstream)
 {
        target->str("");
        errorstream->str("");
@@ -296,6 +786,15 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
        }
        // Fix the chmod of the file to restrict it to the current user and group
        chmod(filename,0600);
+       for (unsigned int t = 0; t < include_stack.size(); t++)
+       {
+               if (std::string(filename) == include_stack[t])
+               {
+                       *errorstream << "File " << filename << " is included recursively (looped inclusion)." << endl;
+                       return false;
+               }
+       }
+       include_stack.push_back(filename);
        // now open it
        FILE* conf = fopen(filename,"r");
        char buffer[MAXBUF];
@@ -303,19 +802,66 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
        {
                while (!feof(conf))
                {
-                       if (fgets(buffer, MAXBUF, conf))
+                       if (fgets_safe(buffer, MAXBUF, conf))
                        {
                                if ((!feof(conf)) && (buffer) && (strlen(buffer)))
                                {
                                        if ((buffer[0] != '#') && (buffer[0] != '\r')  && (buffer[0] != '\n'))
                                        {
-                                               bool error = false;
-                                               std::string data = ConfProcess(buffer,linenumber++,errorstream,error,filename);
-                                               if (error)
+                                               if (!strncmp(buffer,"<include file=\"",15))
+                                               {
+                                                       char* buf = buffer;
+                                                       char confpath[10240],newconf[10240];
+                                                       // include file directive
+                                                       buf += 15;      // advance to filename
+                                                       for (unsigned int j = 0; j < strlen(buf); j++)
+                                                       {
+                                                               if (buf[j] == '\\')
+                                                                       buf[j] = '/';
+                                                               if (buf[j] == '"')
+                                                               {
+                                                                       buf[j] = '\0';
+                                                                       break;
+                                                               }
+                                                       }
+                                                       log(DEBUG,"Opening included file '%s'",buf);
+                                                       if (*buf != '/')
+                                                       {
+                                                               strlcpy(confpath,CONFIG_FILE,10240);
+                                                               if (strstr(confpath,"/inspircd.conf"))
+                                                               {
+                                                                       // leaves us with just the path
+                                                                       *(strstr(confpath,"/inspircd.conf")) = '\0';
+                                                               }
+                                                               snprintf(newconf,10240,"%s/%s",confpath,buf);
+                                                       }
+                                                       else strlcpy(newconf,buf,10240);
+                                                       std::stringstream merge(stringstream::in | stringstream::out);
+                                                       // recursively call LoadConf and get the new data, use the same errorstream
+                                                       if (LoadConf(newconf, &merge, errorstream))
+                                                       {
+                                                               // append to the end of the file
+                                                               std::string newstuff = merge.str();
+                                                               *target << newstuff;
+                                                       }
+                                                       else
+                                                       {
+                                                               // the error propogates up to its parent recursively
+                                                               // causing the config reader to bail at the top level.
+                                                               fclose(conf);
+                                                               return false;
+                                                       }
+                                               }
+                                               else
                                                {
-                                                       return false;
+                                                       bool error = false;
+                                                       std::string data = this->ConfProcess(buffer,linenumber++,errorstream,error,filename);
+                                                       if (error)
+                                                       {
+                                                               return false;
+                                                       }
+                                                       *target << data;
                                                }
-                                               *target << data;
                                        }
                                        else linenumber++;
                                }
@@ -329,12 +875,11 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
 
 /* Counts the number of tags of a certain type within the config file, e.g. to enumerate opers */
 
-int EnumConf(std::stringstream *config, const char* tag)
+int ServerConfig::EnumConf(std::stringstream *config, const char* tag)
 {
        int ptr = 0;
        char buffer[MAXBUF], c_tag[MAXBUF], c, lastc;
-       int in_token, in_quotes, tptr, j, idx = 0;
-       char* key;
+       int in_token, in_quotes, tptr, idx = 0;
 
        const char* buf = config->str().c_str();
        long bptr = 0;
@@ -400,12 +945,11 @@ int EnumConf(std::stringstream *config, const char* tag)
 
 /* Counts the number of values within a certain tag */
 
-int EnumValues(std::stringstream *config, const char* tag, int index)
+int ServerConfig::EnumValues(std::stringstream *config, const char* tag, int index)
 {
        int ptr = 0;
        char buffer[MAXBUF], c_tag[MAXBUF], c, lastc;
-       int in_token, in_quotes, tptr, j, idx = 0;
-       char* key;
+       int in_token, in_quotes, tptr, idx = 0;
        
        bool correct_tag = false;
        int num_items = 0;
@@ -486,7 +1030,7 @@ int EnumValues(std::stringstream *config, const char* tag, int index)
 
 
 
-int ConfValueEnum(char* tag, std::stringstream* config)
+int ServerConfig::ConfValueEnum(char* tag, std::stringstream* config)
 {
        return EnumConf(config,tag);
 }
@@ -499,16 +1043,16 @@ int ConfValueEnum(char* tag, std::stringstream* config)
  * ConfValue("oper","name",2,result);
  */
 
-int ReadConf(std::stringstream *config, const char* tag, const char* var, int index, char *result)
+int ServerConfig::ReadConf(std::stringstream *config, const char* tag, const char* var, int index, char *result)
 {
        int ptr = 0;
        char buffer[65535], c_tag[MAXBUF], c, lastc;
-       int in_token, in_quotes, tptr, j, idx = 0;
+       int in_token, in_quotes, tptr, idx = 0;
        char* key;
 
        const char* buf = config->str().c_str();
        long bptr = 0;
-       long len = strlen(buf);
+       long len = config->str().length();
        
        ptr = 0;
        in_token = 0;
@@ -554,24 +1098,24 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
                                                if (!key)
                                                {
                                                        /* value not found in tag */
-                                                       strcpy(result,"");
+                                                       *result = 0;
                                                        return 0;
                                                }
                                                else
                                                {
                                                        key+=strlen(var);
-                                                       while (key[0] !='"')
+                                                       while (*key !='"')
                                                        {
-                                                               if (!strlen(key))
+                                                               if (!*key)
                                                                {
                                                                        /* missing quote */
-                                                                       strcpy(result,"");
+                                                                       *result = 0;
                                                                        return 0;
                                                                }
                                                                key++;
                                                        }
                                                        key++;
-                                                       for (j = 0; j < strlen(key); j++)
+                                                       for (unsigned j = 0; j < strlen(key); j++)
                                                        {
                                                                if (key[j] == '"')
                                                                {
@@ -603,13 +1147,13 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
                        }
                }
        }
-       strcpy(result,""); // value or its tag not found at all
+       *result = 0; // value or its tag not found at all
        return 0;
 }
 
 
 
-int ConfValue(char* tag, char* var, int index, char *result,std::stringstream *config)
+int ServerConfig::ConfValue(char* tag, char* var, int index, char *result,std::stringstream *config)
 {
        ReadConf(config, tag, var, index, result);
        return 0;
@@ -620,7 +1164,7 @@ int ConfValue(char* tag, char* var, int index, char *result,std::stringstream *c
 // This will bind a socket to a port. It works for UDP/TCP
 int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
 {
-       bzero((char *)&server,sizeof(server));
+       memset((char *)&server,0,sizeof(server));
        struct in_addr addy;
        inet_aton(addr,&addy);
        server.sin_family = AF_INET;
@@ -639,7 +1183,7 @@ int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server
        }
        else
        {
-               listen(sockfd,5);
+               listen(sockfd, Config->MaxConn);
                return(TRUE);
        }
 }
@@ -649,7 +1193,7 @@ int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server
 int OpenTCPSocket (void)
 {
        int sockfd;
-       int on = 0;
+       int on = 1;
        struct linger linger = { 0 };
   
        if ((sockfd = socket (AF_INET, SOCK_STREAM, 0)) < 0)
@@ -659,9 +1203,60 @@ int OpenTCPSocket (void)
                setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on));
                /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
                linger.l_onoff = 1;
-               linger.l_linger = 0;
+               linger.l_linger = 1;
                setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (const char*)&linger,sizeof(linger));
                return (sockfd);
        }
 }
 
+int BindPorts()
+{
+        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+       sockaddr_in client,server;
+        int clientportcount = 0;
+       int BoundPortCount = 0;
+        for (int count = 0; count < Config->ConfValueEnum("bind",&Config->config_f); count++)
+        {
+                Config->ConfValue("bind","port",count,configToken,&Config->config_f);
+                Config->ConfValue("bind","address",count,Addr,&Config->config_f);
+                Config->ConfValue("bind","type",count,Type,&Config->config_f);
+                if ((!*Type) || (!strcmp(Type,"clients")))
+                {
+                        // modules handle server bind types now,
+                        // its not a typo in the strcmp.
+                        Config->ports[clientportcount] = atoi(configToken);
+                        strlcpy(Config->addrs[clientportcount],Addr,256);
+                        clientportcount++;
+                        log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type);
+                }
+        }
+        int PortCount = clientportcount;
+
+        for (int count = 0; count < PortCount; count++)
+        {
+                if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
+                {
+                        log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[BoundPortCount]);
+                        return(ERROR);
+                }
+                if (BindSocket(openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]) == ERROR)
+                {
+                        log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)Config->ports[count]);
+                }
+                else    /* well we at least bound to one socket so we'll continue */
+                {
+                        BoundPortCount++;
+                }
+        }
+
+        /* if we didn't bind to anything then abort */
+        if (!BoundPortCount)
+        {
+                log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!");
+                printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)PortCount);
+                return (ERROR);
+        }
+
+        return BoundPortCount;
+}
+