]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/configreader.cpp
Fixified some more
[user/henk/code/inspircd.git] / src / configreader.cpp
index f60885c2e1bf822e9324cc77fe8c420145935e6b..96f46116239cdd655b0ca875ea9c81d8a02db219 100644 (file)
@@ -2,59 +2,59 @@
  *       | 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "configreader.h"
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
+/* $Core: libIRCDconfigreader */
+/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */
+/* $CopyInstall: docs/inspircd.conf.example $(CONPATH) */
+
 #include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "userprocess.h"
+#include <fstream>
 #include "xline.h"
-
-extern time_t TIME;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-
-using irc::sockets::BindPorts;
+#include "exitcodes.h"
+#include "commands/cmd_whowas.h"
 
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
+/* Needs forward declaration */
+bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
+
 ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
        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';
+       *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0';
+       *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
+       *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0';
+       WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
        log_file = NULL;
-       NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
-       writelog = AllowHalfop = true;
+       NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
+       CycleHosts = writelog = AllowHalfop = true;
        dns_timeout = DieDelay = 5;
        MaxTargets = 20;
        NetBufferSize = 10240;
        SoftLimit = MAXCLIENTS;
        MaxConn = SOMAXCONN;
-       MaxWhoResults = 100;
+       MaxWhoResults = 0;
        debugging = 0;
+       MaxChans = 20;
+       OperMaxChans = 30;
        LogLevel = DEFAULT;
        maxbans.clear();
+       DNSServerValidator = &ValidateDnsServer;
 }
 
 void ServerConfig::ClearStack()
@@ -68,6 +68,12 @@ Module* ServerConfig::GetIOHook(int port)
        return (x != IOHookModule.end() ? x->second : NULL);
 }
 
+Module* ServerConfig::GetIOHook(BufferedSocket* is)
+{
+       std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
+       return (x != SocketIOHookModule.end() ? x->second : NULL);
+}
+
 bool ServerConfig::AddIOHook(int port, Module* iomod)
 {
        if (!GetIOHook(port))
@@ -77,8 +83,22 @@ bool ServerConfig::AddIOHook(int port, Module* iomod)
        }
        else
        {
-               ModuleException err("Port already hooked by another module");
-               throw(err);
+               throw ModuleException("Port already hooked by another module");
+               return false;
+       }
+}
+
+bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
+{
+       if (!GetIOHook(is))
+       {
+               SocketIOHookModule[is] = iomod;
+               is->IsIOHooked = true;
+               return true;
+       }
+       else
+       {
+               throw ModuleException("BufferedSocket derived class already hooked by another module");
                return false;
        }
 }
@@ -94,108 +114,102 @@ bool ServerConfig::DelIOHook(int port)
        return false;
 }
 
-bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+bool ServerConfig::DelIOHook(BufferedSocket* is)
 {
-       int count = ConfValueEnum(this->config_data, tag);
-       
-       if (count > 1)
+       std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
+       if (x != SocketIOHookModule.end())
        {
-               if (bail)
-               {
-                       printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
-                       InspIRCd::Exit(ERROR);
-               }
-               else
+               SocketIOHookModule.erase(x);
+               return true;
+       }
+       return false;
+}
+
+void ServerConfig::Update005()
+{
+       std::stringstream out(data005);
+       std::string token;
+       std::string line5;
+       int token_counter = 0;
+       isupport.clear();
+       while (out >> token)
+       {
+               line5 = line5 + token + " ";
+               token_counter++;
+               if (token_counter >= 13)
                {
-                       if (user)
-                       {
-                               user->WriteServ("There were errors in your configuration:");
-                               user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag);
-                       }
-                       else
-                       {
-                               ServerInstance->WriteOpers("There were errors in the configuration file:");
-                               ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
-                       }
+                       char buf[MAXBUF];
+                       snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+                       isupport.push_back(buf);
+                       line5.clear();
+                       token_counter = 0;
                }
+       }
+       if (!line5.empty())
+       {
+               char buf[MAXBUF];
+               snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+               isupport.push_back(buf);
+       }
+}
+
+void ServerConfig::Send005(User* user)
+{
+       for (std::vector<std::string>::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++)
+               user->WriteServ("005 %s %s", user->nick, line->c_str());
+}
+
+bool ServerConfig::CheckOnce(char* tag)
+{
+       int count = ConfValueEnum(this->config_data, tag);
+
+       if (count > 1)
+       {
+               throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
                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);
-                       InspIRCd::Exit(ERROR);
-               }
-               else
-               {
-                       if (user)
-                       {
-                               user->WriteServ("There were errors in your configuration:");
-                               user->WriteServ("You have not defined a <%s> tag, this is required.",tag);
-                       }
-                       else
-                       {
-                               ServerInstance->WriteOpers("There were errors in the configuration file:");
-                               ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag);
-                       }
-               }
+               throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
                return false;
        }
        return true;
 }
 
-bool NoValidation(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool NoValidation(ServerConfig*, const char*, const char*, ValueItem&)
 {
-       log(DEBUG,"No validation for <%s:%s>",tag,value);
        return true;
 }
 
-bool ValidateTempDir(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool DoneConfItem(ServerConfig* conf, const char* tag)
 {
-       char* x = (char*)data;
-       if (!*x)
-               strlcpy(x,"/tmp",1024);
        return true;
 }
-bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, void* data)
+
+bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       int* x = (int*)data;
-       if ((*x < 0) || (*x > 31))
+       if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
        {
-               log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
-               *x = 20;
+               conf->GetInstance()->Log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+               data.Set(20);
        }
        return true;
 }
 
-bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       int* x = (int*)data;    
-       if ((*x < 1) || (*x > MAXCLIENTS))
+       if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
        {
-               log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
-               *x = MAXCLIENTS;
+               conf->GetInstance()->Log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
+               data.Set(MAXCLIENTS);
        }
        return true;
 }
 
-bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       int* x = (int*)data;    
-       if (*x > SOMAXCONN)
-               log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
-       if (!*x)
-               *x = SOMAXCONN;
-       return true;
-}
-
-bool ValidateDnsTimeout(ServerConfig* conf, const char* tag, const char* value, void* data)
-{
-       int* x = (int*)data;
-       if (!*x)
-               *x = 5;
+       if (data.GetInteger() > SOMAXCONN)
+               conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
        return true;
 }
 
@@ -205,31 +219,29 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
        std::string thiscmd;
 
        /* Enable everything first */
-       for (nspace::hash_map<std::string,command_t*>::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+       for (Commandable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
                x->second->Disable(false);
 
        /* Now disable all the ones which the user wants disabled */
        while (dcmds >> thiscmd)
        {
-               nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
+               Commandable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
                if (cm != ServerInstance->Parser->cmdlist.end())
                {
-                       log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
                        cm->second->Disable(true);
                }
        }
        return true;
 }
 
-bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       char* x = (char*)data;
-       if (!*x)
+       if (!*(data.GetString()))
        {
+               std::string nameserver;
                // 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...");
+               conf->GetInstance()->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())
@@ -239,167 +251,283 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, v
                                if ((nameserver == "nameserver") && (!found_server))
                                {
                                        resolv >> nameserver;
-                                       strlcpy(x,nameserver.c_str(),MAXBUF);
+                                       data.Set(nameserver.c_str());
                                        found_server = true;
-                                       log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+                                       conf->GetInstance()->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(x,"127.0.0.1",MAXBUF);
+                               conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+                               data.Set("127.0.0.1");
                        }
                }
                else
                {
-                       log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
-                       strlcpy(x,"127.0.0.1",MAXBUF);
+                       conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+                       data.Set("127.0.0.1");
                }
        }
        return true;
 }
 
-bool ValidateModPath(ServerConfig* conf, const char* tag, const char* value, void* data)
-{
-       char* x = (char*)data;  
-       if (!*x)
-               strlcpy(x,MOD_PATH,MAXBUF);
-       return true;
-}
-
-
-bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       char* x = (char*)data;
-       if (!strchr(x,'.'))
+       /* If we already have a servername, and they changed it, we should throw an exception. */
+       if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName))
+       {
+               throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied.");
+               /* We don't actually reach this return of course... */
+               return false;
+       }
+       if (!strchr(data.GetString(),'.'))
        {
-               log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.');
-               charlcat(x,'.',MAXBUF);
+               conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
+               std::string moo = std::string(data.GetString()).append(".");
+               data.Set(moo.c_str());
        }
-       //strlower(x);
        return true;
 }
 
-bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       if ((!conf->NetBufferSize) || (conf->NetBufferSize > 65535) || (conf->NetBufferSize < 1024))
+       if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024))
        {
-               log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
-               conf->NetBufferSize = 10240;
+               conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+               data.Set(10240);
        }
        return true;
 }
 
-bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       if ((!conf->MaxWhoResults) || (conf->MaxWhoResults > 65535) || (conf->MaxWhoResults < 1))
+       if ((data.GetInteger() > 65535) || (data.GetInteger() < 1))
        {
-               log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
-               conf->MaxWhoResults = 128;
+               conf->GetInstance()->Log(DEFAULT,"<options:maxwhoresults> size out of range, setting to default of 128.");
+               data.Set(128);
        }
        return true;
 }
 
-bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateLogLevel(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       const char* dbg = (const char*)data;
+       std::string dbg = data.GetString();
        conf->LogLevel = DEFAULT;
-       if (!strcmp(dbg,"debug"))
-       {
+
+       if (dbg == "debug")
                conf->LogLevel = DEBUG;
-               conf->debugging = 1;
-       }
-       else if (!strcmp(dbg,"verbose"))
+       else if (dbg  == "verbose")
                conf->LogLevel = VERBOSE;
-       else if (!strcmp(dbg,"default"))
+       else if (dbg == "default")
                conf->LogLevel = DEFAULT;
-       else if (!strcmp(dbg,"sparse"))
+       else if (dbg == "sparse")
                conf->LogLevel = SPARSE;
-       else if (!strcmp(dbg,"none"))
+       else if (dbg == "none")
                conf->LogLevel = NONE;
+
+       conf->debugging = (conf->LogLevel == DEBUG);
+
+       return true;
+}
+
+bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+       conf->ReadFile(conf->MOTD, data.GetString());
+       return true;
+}
+
+bool ValidateNotEmpty(ServerConfig*, const char* tag, const char*, ValueItem &data)
+{
+       if (!*data.GetString())
+               throw CoreException(std::string("The value for ")+tag+" cannot be empty!");
+       return true;
+}
+
+bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+       conf->ReadFile(conf->RULES, data.GetString());
        return true;
 }
 
-bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       conf->ReadFile(conf->MOTD,conf->motd);
+       memset(conf->HideModeLists, 0, 256);
+       for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
+               conf->HideModeLists[*x] = true;
        return true;
 }
 
-bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, void* data)
+bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-       conf->ReadFile(conf->RULES,conf->rules);
+       memset(conf->ExemptChanOps, 0, 256);
+       for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
+               conf->ExemptChanOps[*x] = true;
+       return true;
+}
+
+bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+       std::string v = data.GetString();
+
+       if (v == "ops")
+               conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS;
+       else if (v == "all")
+               conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL;
+       else if (v == "dynamic")
+               conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC;
+       else
+               conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
+
+       return true;
+}
+
+bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+       int sid = data.GetInteger();
+       if ((sid > 999) || (sid < 0))
+       {
+               sid = sid % 1000;
+               data.Set(sid);
+               conf->GetInstance()->Log(DEFAULT,"WARNING: Server ID is less than 0 or greater than 999. Set to %d", sid);
+       }
+       return true;
+}
+
+bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+       conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
+
+       if (conf->WhoWasGroupSize < 0)
+               conf->WhoWasGroupSize = 0;
+
+       if (conf->WhoWasMaxGroups < 0)
+               conf->WhoWasMaxGroups = 0;
+
+       if (conf->WhoWasMaxKeep < 3600)
+       {
+               conf->WhoWasMaxKeep = 3600;
+               conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
+       }
+
+       Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
+       if (whowas_command)
+       {
+               std::deque<classbase*> params;
+               whowas_command->HandleInternal(WHOWAS_PRUNE, params);
+       }
+
        return true;
 }
 
 /* Callback called before processing the first <connect> tag
  */
-bool InitConnect(ServerConfig* conf, const char* tag)
+bool InitConnect(ServerConfig* conf, const char*)
 {
-       log(DEFAULT,"Reading connect classes...");
-       conf->Classes.clear();
+       conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
+
+       for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
+       {
+               ConnectClass *c = *i;
+
+               conf->GetInstance()->Log(DEBUG, "Address of class is %p", c);
+       }
+
+       for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
+       {
+               ConnectClass *c = *i;
+
+               /* only delete a class with refcount 0 */
+               if (c->RefCount == 0)
+               {
+                       conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!");
+                       conf->Classes.erase(i);
+                       i = conf->Classes.begin(); // start over so we don't trample on a bad iterator
+               }
+
+               /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
+               c->SetDisabled(true);
+       }
+
        return true;
 }
 
 /* Callback called to process a single <connect> tag
  */
-bool DoConnect(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 {
        ConnectClass c;
-       char* allow = (char*)values[0]; /* Yeah, there are a lot of values. Live with it. */
-       char* deny = (char*)values[1];
-       char* password = (char*)values[2];
-       int* timeout = (int*)values[3];
-       int* pingfreq = (int*)values[4];
-       int* flood = (int*)values[5];
-       int* threshold = (int*)values[6];
-       int* sendq = (int*)values[7];
-       int* recvq = (int*)values[8];
-       int* localmax = (int*)values[9];
-       int* globalmax = (int*)values[10];
-
-       if (*allow)
+       const char* allow = values[0].GetString(); /* Yeah, there are a lot of values. Live with it. */
+       const char* deny = values[1].GetString();
+       const char* password = values[2].GetString();
+       int timeout = values[3].GetInteger();
+       int pingfreq = values[4].GetInteger();
+       int flood = values[5].GetInteger();
+       int threshold = values[6].GetInteger();
+       int sendq = values[7].GetInteger();
+       int recvq = values[8].GetInteger();
+       int localmax = values[9].GetInteger();
+       int globalmax = values[10].GetInteger();
+       int port = values[11].GetInteger();
+       const char* name = values[12].GetString();
+       const char* parent = values[13].GetString();
+       int maxchans = values[14].GetInteger();
+       unsigned long limit = values[15].GetInteger();
+
+       /*
+        * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes.
+        * easier said than done, but for now we'll just disallow anything with a duplicate host or name. -- w00t
+        */
+       for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
+       {
+               ConnectClass* c = *item;
+               if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny)))
+               {
+                       /* reenable class so users can be shoved into it :P */
+                       c->SetDisabled(false);
+                       conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!");
+                       return true;
+               } 
+       }
+
+       conf->GetInstance()->Log(DEFAULT,"Adding a connect class!");
+
+       if (*parent)
        {
-               c.host = allow;
-               c.type = CC_ALLOW;
-               c.pass = password;
-               c.registration_timeout = *timeout;
-               c.pingtime = *pingfreq;
-               c.flood = *flood;
-               c.threshold = *threshold;
-               c.sendqmax = *sendq;
-               c.recvqmax = *recvq;
-               c.maxlocal = *localmax;
-               c.maxglobal = *globalmax;
-
-
-               if (c.maxlocal == 0)
-                       c.maxlocal = 3;
-               if (c.maxglobal == 0)
-                       c.maxglobal = 3;
-               if (c.threshold == 0)
+               /* Find 'parent' and inherit a new class from it,
+                * then overwrite any values that are set here
+                */
+               ClassVector::iterator item = conf->Classes.begin();
+               for (; item != conf->Classes.end(); ++item)
                {
-                       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());
+                       ConnectClass* c = *item;
+                       conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str());
+                       if (c->GetName() == parent)
+                       {
+                               ConnectClass* newclass = new ConnectClass(name, c);
+                               newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+                               conf->Classes.push_back(newclass);
+                               break;
+                       }
                }
-               if (c.sendqmax == 0)
-                       c.sendqmax = 262114;
-               if (c.recvqmax == 0)
-                       c.recvqmax = 4096;
-               if (c.registration_timeout == 0)
-                       c.registration_timeout = 90;
-               if (c.pingtime == 0)
-                       c.pingtime = 120;
-               conf->Classes.push_back(c);
+               if (item == conf->Classes.end())
+                       throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found.");
        }
        else
        {
-               c.host = deny;
-               c.type = CC_DENY;
-               conf->Classes.push_back(c);
-               log(DEBUG,"Read connect class type DENY, host=%s",deny);
+               if (*allow)
+               {
+                       ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
+                       c->limit = limit;
+                       c->SetPort(port);
+                       conf->Classes.push_back(c);
+               }
+               else
+               {
+                       ConnectClass* c = new ConnectClass(name, deny);
+                       c->SetPort(port);
+                       conf->Classes.push_back(c);
+               }
        }
 
        return true;
@@ -407,15 +535,15 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, void** value
 
 /* Callback called when there are no more <connect> tags
  */
-bool DoneConnect(ServerConfig* conf, const char* tag)
+bool DoneConnect(ServerConfig *conf, const char*)
 {
-       log(DEBUG,"DoneConnect called for tag: %s",tag);
+       conf->GetInstance()->Log(DEFAULT, "Done adding connect classes!");
        return true;
 }
 
 /* Callback called before processing the first <uline> tag
  */
-bool InitULine(ServerConfig* conf, const char* tag)
+bool InitULine(ServerConfig* conf, const char*)
 {
        conf->ulines.clear();
        return true;
@@ -423,24 +551,24 @@ bool InitULine(ServerConfig* conf, const char* tag)
 
 /* Callback called to process a single <uline> tag
  */
-bool DoULine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoULine(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 {
-       char* server = (char*)values[0];
-       log(DEBUG,"Read ULINE '%s'",server);
-       conf->ulines.push_back(server);
+       const char* server = values[0].GetString();
+       const bool silent = values[1].GetBool();
+       conf->ulines[server] = silent;
        return true;
 }
 
 /* Callback called when there are no more <uline> tags
  */
-bool DoneULine(ServerConfig* conf, const char* tag)
+bool DoneULine(ServerConfig*, const char*)
 {
        return true;
 }
 
 /* Callback called before processing the first <module> tag
  */
-bool InitModule(ServerConfig* conf, const char* tag)
+bool InitModule(ServerConfig* conf, const char*)
 {
        old_module_names.clear();
        new_module_names.clear();
@@ -455,16 +583,16 @@ bool InitModule(ServerConfig* conf, const char* tag)
 
 /* Callback called to process a single <module> tag
  */
-bool DoModule(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoModule(ServerConfig*, const char*, char**, ValueList &values, int*)
 {
-       char* modname = (char*)values[0];
+       const char* modname = values[0].GetString();
        new_module_names.push_back(modname);
        return true;
 }
 
 /* Callback called when there are no more <module> tags
  */
-bool DoneModule(ServerConfig* conf, const char* tag)
+bool DoneModule(ServerConfig*, const char*)
 {
        // 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
@@ -499,7 +627,7 @@ bool DoneModule(ServerConfig* conf, const char* tag)
 
 /* Callback called before processing the first <banlist> tag
  */
-bool InitMaxBans(ServerConfig* conf, const char* tag)
+bool InitMaxBans(ServerConfig* conf, const char*)
 {
        conf->maxbans.clear();
        return true;
@@ -507,305 +635,376 @@ bool InitMaxBans(ServerConfig* conf, const char* tag)
 
 /* Callback called to process a single <banlist> tag
  */
-bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoMaxBans(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 {
-       char* channel = (char*)values[0];
-       int* limit = (int*)values[1];
-       conf->maxbans[channel] = *limit;
+       const char* channel = values[0].GetString();
+       int limit = values[1].GetInteger();
+       conf->maxbans[channel] = limit;
        return true;
 }
 
 /* Callback called when there are no more <banlist> tags.
  */
-bool DoneMaxBans(ServerConfig* conf, const char* tag)
+bool DoneMaxBans(ServerConfig*, const char*)
 {
        return true;
 }
 
-void ServerConfig::Read(bool bail, userrec* user)
+void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user)
 {
-       char debug[MAXBUF];             /* Temporary buffer for debugging value */
-       char* data[12];                 /* Temporary buffers for reading multiple occurance tags into */
-       void* ptr[12];                  /* Temporary pointers for passing to callbacks */
-       int r_i[12];                    /* Temporary array for casting */
+       ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str());
+       if (bail)
+       {
+               /* Unneeded because of the ServerInstance->Log() aboive? */
+               printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str());
+               ServerInstance->Exit(EXIT_STATUS_CONFIG);
+       }
+       else
+       {
+               std::string errors = errormessage;
+               std::string::size_type start;
+               unsigned int prefixlen;
+               start = 0;
+               /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
+               if (user)
+               {
+                       prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11;
+                       user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
+                       while (start < errors.length())
+                       {
+                               user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
+                               start += 510 - prefixlen;
+                       }
+               }
+               else
+               {
+                       ServerInstance->WriteOpers("There were errors in the configuration file:");
+                       while (start < errors.length())
+                       {
+                               ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
+                               start += 360;
+                       }
+               }
+               return;
+       }
+}
+
+void ServerConfig::Read(bool bail, User* user)
+{
+       static char debug[MAXBUF];      /* Temporary buffer for debugging value */
+       static char maxkeep[MAXBUF];    /* Temporary buffer for WhoWasMaxKeep value */
+       static char hidemodes[MAXBUF];  /* Modes to not allow listing from users below halfop */
+       static char exemptchanops[MAXBUF];      /* Exempt channel ops from these modes */
+       static char announceinvites[MAXBUF];    /* options:announceinvites setting */
        int rem = 0, add = 0;           /* Number of modules added, number of modules removed */
        std::ostringstream errstr;      /* String stream containing the error output */
 
        /* These tags MUST occur and must ONLY occur once in the config file */
-       static char* Once[] = { "server", "admin", "files", "power", "options", "pid", NULL };
+       static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
 
        /* These tags can occur ONCE or not at all */
-       static InitialConfig Values[] = {
-               {"options",             "softlimit",                    &this->SoftLimit,               DT_INTEGER, ValidateSoftLimit},
-               {"options",             "somaxconn",                    &this->MaxConn,                 DT_INTEGER, ValidateMaxConn},
-               {"server",              "name",                         &this->ServerName,              DT_CHARPTR, ValidateServerName},
-               {"server",              "description",                  &this->ServerDesc,              DT_CHARPTR, NoValidation},
-               {"server",              "network",                      &this->Network,                 DT_CHARPTR, NoValidation},
-               {"admin",               "name",                         &this->AdminName,               DT_CHARPTR, NoValidation},
-               {"admin",               "email",                        &this->AdminEmail,              DT_CHARPTR, NoValidation},
-               {"admin",               "nick",                         &this->AdminNick,               DT_CHARPTR, NoValidation},
-               {"files",               "motd",                         &this->motd,                    DT_CHARPTR, ValidateMotd},
-               {"files",               "rules",                        &this->rules,                   DT_CHARPTR, ValidateRules},
-               {"power",               "diepass",                      &this->diepass,                 DT_CHARPTR, NoValidation},      
-               {"power",               "pauseval",                     &this->DieDelay,                DT_INTEGER, NoValidation},
-               {"power",               "restartpass",                  &this->restartpass,             DT_CHARPTR, NoValidation},
-               {"options",             "prefixquit",                   &this->PrefixQuit,              DT_CHARPTR, NoValidation},
-               {"die",                 "value",                        &this->DieValue,                DT_CHARPTR, NoValidation},
-               {"options",             "loglevel",                     &debug,                         DT_CHARPTR, ValidateLogLevel},
-               {"options",             "netbuffersize",                &this->NetBufferSize,           DT_INTEGER, ValidateNetBufferSize},
-               {"options",             "maxwho",                       &this->MaxWhoResults,           DT_INTEGER, ValidateMaxWho},
-               {"options",             "allowhalfop",                  &this->AllowHalfop,             DT_BOOLEAN, NoValidation},
-               {"dns",                 "server",                       &this->DNSServer,               DT_CHARPTR, ValidateDnsServer},
-               {"dns",                 "timeout",                      &this->dns_timeout,             DT_INTEGER, ValidateDnsTimeout},
-               {"options",             "moduledir",                    &this->ModPath,                 DT_CHARPTR, ValidateModPath},
-               {"disabled",            "commands",                     &this->DisabledCommands,        DT_CHARPTR, NoValidation},
-               {"options",             "operonlystats",                &this->OperOnlyStats,           DT_CHARPTR, NoValidation},
-               {"options",             "customversion",                &this->CustomVersion,           DT_CHARPTR, NoValidation},
-               {"options",             "hidesplits",                   &this->HideSplits,              DT_BOOLEAN, NoValidation},
-               {"options",             "hidebans",                     &this->HideBans,                DT_BOOLEAN, NoValidation},
-               {"options",             "hidewhois",                    &this->HideWhoisServer,         DT_CHARPTR, NoValidation},
-               {"options",             "operspywhois",                 &this->OperSpyWhois,            DT_BOOLEAN, NoValidation},
-               {"options",             "tempdir",                      &this->TempDir,                 DT_CHARPTR, ValidateTempDir},
-               {"options",             "nouserdns",                    &this->NoUserDns,               DT_BOOLEAN, NoValidation},
-               {"options",             "syntaxhints",                  &this->SyntaxHints,             DT_BOOLEAN, NoValidation},
-               {"pid",                 "file",                         &this->PID,                     DT_CHARPTR, NoValidation},
-               {NULL}
+       InitialConfig Values[] = {
+               {"options",     "softlimit",    MAXCLIENTS_S,           new ValueContainerUInt (&this->SoftLimit),              DT_INTEGER, ValidateSoftLimit},
+               {"options",     "somaxconn",    SOMAXCONN_S,            new ValueContainerInt  (&this->MaxConn),                DT_INTEGER, ValidateMaxConn},
+               {"options",     "moronbanner",  "Youre banned!",        new ValueContainerChar (this->MoronBanner),             DT_CHARPTR, NoValidation},
+               {"server",      "name",         "",                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
+               {"server",      "description",  "Configure Me",         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
+               {"server",      "network",      "Network",              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
+               {"server",      "id",           "0",                    new ValueContainerInt  (&this->sid),                    DT_INTEGER, ValidateSID},
+               {"admin",       "name",         "",                     new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
+               {"admin",       "email",        "Mis@configu.red",      new ValueContainerChar (this->AdminEmail),              DT_CHARPTR, NoValidation},
+               {"admin",       "nick",         "Misconfigured",        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
+               {"files",       "motd",         "",                     new ValueContainerChar (this->motd),                    DT_CHARPTR, ValidateMotd},
+               {"files",       "rules",        "",                     new ValueContainerChar (this->rules),                   DT_CHARPTR, ValidateRules},
+               {"power",       "diepass",      "",                     new ValueContainerChar (this->diepass),                 DT_CHARPTR, ValidateNotEmpty},
+               {"power",       "pause",        "",                     new ValueContainerInt  (&this->DieDelay),               DT_INTEGER, NoValidation},
+               {"power",       "restartpass",  "",                     new ValueContainerChar (this->restartpass),             DT_CHARPTR, ValidateNotEmpty},
+               {"options",     "prefixquit",   "",                     new ValueContainerChar (this->PrefixQuit),              DT_CHARPTR, NoValidation},
+               {"options",     "suffixquit",   "",                     new ValueContainerChar (this->SuffixQuit),              DT_CHARPTR, NoValidation},
+               {"options",     "fixedquit",    "",                     new ValueContainerChar (this->FixedQuit),               DT_CHARPTR, NoValidation},
+               {"options",     "loglevel",     "default",              new ValueContainerChar (debug),                         DT_CHARPTR, ValidateLogLevel},
+               {"options",     "netbuffersize","10240",                new ValueContainerInt  (&this->NetBufferSize),          DT_INTEGER, ValidateNetBufferSize},
+               {"options",     "maxwho",       "128",                  new ValueContainerInt  (&this->MaxWhoResults),          DT_INTEGER, ValidateMaxWho},
+               {"options",     "allowhalfop",  "0",                    new ValueContainerBool (&this->AllowHalfop),            DT_BOOLEAN, NoValidation},
+               {"dns",         "server",       "",                     new ValueContainerChar (this->DNSServer),               DT_CHARPTR, DNSServerValidator},
+               {"dns",         "timeout",      "5",                    new ValueContainerInt  (&this->dns_timeout),            DT_INTEGER, NoValidation},
+               {"options",     "moduledir",    MOD_PATH,               new ValueContainerChar (this->ModPath),                 DT_CHARPTR, NoValidation},
+               {"disabled",    "commands",     "",                     new ValueContainerChar (this->DisabledCommands),        DT_CHARPTR, NoValidation},
+               {"options",     "userstats",    "",                     new ValueContainerChar (this->UserStats),               DT_CHARPTR, NoValidation},
+               {"options",     "customversion","",                     new ValueContainerChar (this->CustomVersion),           DT_CHARPTR, NoValidation},
+               {"options",     "hidesplits",   "0",                    new ValueContainerBool (&this->HideSplits),             DT_BOOLEAN, NoValidation},
+               {"options",     "hidebans",     "0",                    new ValueContainerBool (&this->HideBans),               DT_BOOLEAN, NoValidation},
+               {"options",     "hidewhois",    "",                     new ValueContainerChar (this->HideWhoisServer),         DT_CHARPTR, NoValidation},
+               {"options",     "hidekills",    "",                     new ValueContainerChar (this->HideKillsServer),         DT_CHARPTR, NoValidation},
+               {"options",     "operspywhois", "0",                    new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN, NoValidation},
+               {"options",     "nouserdns",    "0",                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN, NoValidation},
+               {"options",     "syntaxhints",  "0",                    new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN, NoValidation},
+               {"options",     "cyclehosts",   "0",                    new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN, NoValidation},
+               {"options",     "ircumsgprefix","0",                    new ValueContainerBool (&this->UndernetMsgPrefix),      DT_BOOLEAN, NoValidation},
+               {"options",     "announceinvites", "1",                 new ValueContainerChar (announceinvites),               DT_CHARPTR, ValidateInvite},
+               {"options",     "hostintopic",  "1",                    new ValueContainerBool (&this->FullHostInTopic),        DT_BOOLEAN, NoValidation},
+               {"options",     "hidemodes",    "",                     new ValueContainerChar (hidemodes),                     DT_CHARPTR, ValidateModeLists},
+               {"options",     "exemptchanops","",                     new ValueContainerChar (exemptchanops),                 DT_CHARPTR, ValidateExemptChanOps},
+               {"options",     "maxtargets",   "20",                   new ValueContainerUInt (&this->MaxTargets),             DT_INTEGER, ValidateMaxTargets},
+               {"options",     "defaultmodes", "nt",                   new ValueContainerChar (this->DefaultModes),            DT_CHARPTR, NoValidation},
+               {"pid",         "file",         "",                     new ValueContainerChar (this->PID),                     DT_CHARPTR, NoValidation},
+               {"whowas",      "groupsize",    "10",                   new ValueContainerInt  (&this->WhoWasGroupSize),        DT_INTEGER, NoValidation},
+               {"whowas",      "maxgroups",    "10240",                new ValueContainerInt  (&this->WhoWasMaxGroups),        DT_INTEGER, NoValidation},
+               {"whowas",      "maxkeep",      "3600",                 new ValueContainerChar (maxkeep),                       DT_CHARPTR, ValidateWhoWas},
+               {"die",         "value",        "",                     new ValueContainerChar (this->DieValue),                DT_CHARPTR, NoValidation},
+               {"channels",    "users",        "20",                   new ValueContainerUInt (&this->MaxChans),               DT_INTEGER, NoValidation},
+               {"channels",    "opers",        "60",                   new ValueContainerUInt (&this->OperMaxChans),           DT_INTEGER, NoValidation},
+               {NULL,          NULL,           NULL,                   NULL,                                                   DT_NOTHING, NoValidation}
        };
 
        /* These tags can occur multiple times, and therefore they have special code to read them
         * which is different to the code for reading the singular tags listed above.
         */
-       static MultiConfig MultiValues[] = {
+       MultiConfig MultiValues[] = {
 
                {"connect",
                                {"allow",       "deny",         "password",     "timeout",      "pingfreq",     "flood",
-                               "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    NULL},
+                               "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    "port",
+                               "name",         "parent",       "maxchans",     "limit",
+                               NULL},
+                               {"",            "",             "",             "",             "120",          "",
+                                "",            "",             "",             "3",            "3",            "0",
+                                "",            "",             "0",            "0",
+                                NULL},
                                {DT_CHARPTR,    DT_CHARPTR,     DT_CHARPTR,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
-                                DT_INTEGER,    DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER},
+                                DT_INTEGER,    DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
+                                DT_CHARPTR,    DT_CHARPTR,     DT_INTEGER,     DT_INTEGER},
                                InitConnect, DoConnect, DoneConnect},
 
                {"uline",
-                               {"server",      NULL},
-                               {DT_CHARPTR},
+                               {"server",      "silent",       NULL},
+                               {"",            "0",            NULL},
+                               {DT_CHARPTR,    DT_BOOLEAN},
                                InitULine,DoULine,DoneULine},
 
                {"banlist",
                                {"chan",        "limit",        NULL},
+                               {"",            "",             NULL},
                                {DT_CHARPTR,    DT_INTEGER},
                                InitMaxBans, DoMaxBans, DoneMaxBans},
 
                {"module",
                                {"name",        NULL},
+                               {"",            NULL},
                                {DT_CHARPTR},
                                InitModule, DoModule, DoneModule},
 
                {"badip",
                                {"reason",      "ipmask",       NULL},
+                               {"No reason",   "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
-                               InitXLine, DoZLine, DoneXLine},
+                               InitXLine, DoZLine, DoneConfItem},
 
                {"badnick",
                                {"reason",      "nick",         NULL},
+                               {"No reason",   "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
-                               InitXLine, DoQLine, DoneXLine},
+                               InitXLine, DoQLine, DoneConfItem},
 
                {"badhost",
                                {"reason",      "host",         NULL},
+                               {"No reason",   "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
-                               InitXLine, DoKLine, DoneXLine},
+                               InitXLine, DoKLine, DoneConfItem},
 
                {"exception",
                                {"reason",      "host",         NULL},
+                               {"No reason",   "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
-                               InitXLine, DoELine, DoneXLine},
+                               InitXLine, DoELine, DoneELine},
 
                {"type",
                                {"name",        "classes",      NULL},
+                               {"",            "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
                                InitTypes, DoType, DoneClassesAndTypes},
 
                {"class",
                                {"name",        "commands",     NULL},
+                               {"",            "",             NULL},
                                {DT_CHARPTR,    DT_CHARPTR},
                                InitClasses, DoClass, DoneClassesAndTypes},
 
-               {NULL}
+               {NULL,
+                               {NULL},
+                               {NULL},
+                               {0},
+                               NULL, NULL, NULL}
        };
 
        include_stack.clear();
 
        /* Load and parse the config file, if there are any errors then explode */
-       
+
        /* Make a copy here so if it fails then we can carry on running with an unaffected config */
        ConfigDataHash newconfig;
-       
-       if (this->LoadConf(newconfig, CONFIG_FILE, errstr))
+
+       if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr))
        {
                /* If we succeeded, set the ircd config to the new one */
                this->config_data = newconfig;
-               
-/*             int c = 1;
-               std::string last;
-               
-               for(ConfigDataHash::const_iterator i = this->config_data.begin(); i != this->config_data.end(); i++)
-               {
-                       c = (i->first != last) ? 1 : c+1;
-                       last = i->first;
-                       
-                       std::cout << "[" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl;
-                       
-                       for(KeyValList::const_iterator j = i->second.begin(); j != i->second.end(); j++)
-                               std::cout << "\t" << j->first << " = " << j->second << std::endl;
-                       
-                       std::cout << "[/" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl;
-               }
- */    }
+       }
        else
        {
-               log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str());
+               ReportConfigError(errstr.str(), bail, user);
+               return;
+       }
 
-               if (bail)
-               {
-                       /* Unneeded because of the log() aboive? */
-                       printf("There were errors in your configuration:\n%s",errstr.str().c_str());
-                       InspIRCd::Exit(ERROR);
-               }
-               else
+       /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
+       try
+       {
+               /* Check we dont have more than one of singular tags, or any of them missing
+                */
+               for (int Index = 0; Once[Index]; Index++)
+                       if (!CheckOnce(Once[Index]))
+                               return;
+
+               /* Read the values of all the tags which occur once or not at all, and call their callbacks.
+                */
+               for (int Index = 0; Values[Index].tag; Index++)
                {
-                       std::string errors = errstr.str();
-                       std::string::size_type start;
-                       unsigned int prefixlen;
-                       
-                       start = 0;
-                       /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
-                       prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11;
-       
-                       if (user)
+                       char item[MAXBUF];
+                       int dt = Values[Index].datatype;
+                       bool allow_newlines =  ((dt & DT_ALLOW_NEWLINE) > 0);
+                       dt &= ~DT_ALLOW_NEWLINE;
+
+                       ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
+                       ValueItem vi(item);
+
+                       if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
+                               throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
+
+                       switch (Values[Index].datatype)
                        {
-                               user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
-                               
-                               while(start < errors.length())
+                               case DT_CHARPTR:
                                {
-                                       user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
-                                       start += 510 - prefixlen;
+                                       ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+                                       /* Make sure we also copy the null terminator */
+                                       vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
                                }
-                       }
-                       else
-                       {
-                               ServerInstance->WriteOpers("There were errors in the configuration file:");
-                               
-                               while(start < errors.length())
+                               break;
+                               case DT_INTEGER:
+                               {
+                                       int val = vi.GetInteger();
+                                       ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val;
+                                       vci->Set(&val, sizeof(int));
+                               }
+                               break;
+                               case DT_BOOLEAN:
                                {
-                                       ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
-                                       start += 360;
+                                       bool val = vi.GetBool();
+                                       ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val;
+                                       vcb->Set(&val, sizeof(bool));
                                }
+                               break;
+                               default:
+                                       /* You don't want to know what happens if someones bad code sends us here. */
+                               break;
                        }
 
-                       return;
+                       /* We're done with this now */
+                       delete Values[Index].val;
                }
-       }
-
-       /* Check we dont have more than one of singular tags, or any of them missing
-        */
-       for (int Index = 0; Once[Index]; Index++)
-               if (!CheckOnce(Once[Index],bail,user))
-                       return;
-
-       /* Read the values of all the tags which occur once or not at all, and call their callbacks.
-        */
-       for (int Index = 0; Values[Index].tag; Index++)
-       {
-               int* val_i = (int*) Values[Index].val;
-               char* val_c = (char*) Values[Index].val;
 
-               switch (Values[Index].datatype)
+               /* Read the multiple-tag items (class tags, connect tags, etc)
+                * and call the callbacks associated with them. We have three
+                * callbacks for these, a 'start', 'item' and 'end' callback.
+                */
+               for (int Index = 0; MultiValues[Index].tag; Index++)
                {
-                       case DT_CHARPTR:
-                               /* Assuming MAXBUF here, potentially unsafe */
-                               ConfValue(this->config_data, Values[Index].tag, Values[Index].value, 0, val_c, MAXBUF);
-                       break;
-
-                       case DT_INTEGER:
-                               ConfValueInteger(this->config_data, Values[Index].tag, Values[Index].value, 0, *val_i);
-                       break;
-
-                       case DT_BOOLEAN:
-                               *val_i = ConfValueBool(this->config_data, Values[Index].tag, Values[Index].value, 0);
-                       break;
-
-                       case DT_NOTHING:
-                       break;
-               }
-
-               Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, Values[Index].val);
-       }
-
-       /* Claim memory for use when reading multiple tags
-        */
-       for (int n = 0; n < 12; n++)
-               data[n] = new char[MAXBUF];
-
-       /* Read the multiple-tag items (class tags, connect tags, etc)
-        * and call the callbacks associated with them. We have three
-        * callbacks for these, a 'start', 'item' and 'end' callback.
-        */
-       
-       /* XXX - Make this use ConfValueInteger and so on */
-       for (int Index = 0; MultiValues[Index].tag; Index++)
-       {
-               MultiValues[Index].init_function(this, MultiValues[Index].tag);
+                       MultiValues[Index].init_function(this, MultiValues[Index].tag);
 
-               int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag);
+                       int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag);
 
-               for (int tagnum = 0; tagnum < number_of_tags; tagnum++)
-               {
-                       for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++)
+                       for (int tagnum = 0; tagnum < number_of_tags; tagnum++)
                        {
-                               ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, data[valuenum], MAXBUF);
-
-                               switch (MultiValues[Index].datatype[valuenum])
+                               ValueList vl;
+                               for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++)
                                {
-                                       case DT_CHARPTR:
-                                               ptr[valuenum] = data[valuenum];
-                                       break;
-                                       case DT_INTEGER:
-                                               r_i[valuenum] = atoi(data[valuenum]);
-                                               ptr[valuenum] = &r_i[valuenum];
-                                       break;
-                                       case DT_BOOLEAN:
-                                               r_i[valuenum] = ((*data[valuenum] == tolower('y')) || (*data[valuenum] == tolower('t')) || (*data[valuenum] == '1'));
-                                               ptr[valuenum] = &r_i[valuenum];
-                                       break;
-                                       default:
-                                       break;
+                                       int dt = MultiValues[Index].datatype[valuenum];
+                                       bool allow_newlines =  ((dt & DT_ALLOW_NEWLINE) > 0);
+                                       dt &= ~DT_ALLOW_NEWLINE;
+
+                                       switch (dt)
+                                       {
+                                               case DT_CHARPTR:
+                                               {
+                                                       char item[MAXBUF];
+                                                       if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+                                                               vl.push_back(ValueItem(item));
+                                                       else
+                                                               vl.push_back(ValueItem(""));
+                                               }
+                                               break;
+                                               case DT_INTEGER:
+                                               {
+                                                       int item = 0;
+                                                       if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item))
+                                                               vl.push_back(ValueItem(item));
+                                                       else
+                                                               vl.push_back(ValueItem(0));
+                                               }
+                                               break;
+                                               case DT_BOOLEAN:
+                                               {
+                                                       bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum);
+                                                       vl.push_back(ValueItem(item));
+                                               }
+                                               break;
+                                               default:
+                                                       /* Someone was smoking craq if we got here, and we're all gonna die. */
+                                               break;
+                                       }
                                }
+
+                               MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
                        }
-                       MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, ptr, MultiValues[Index].datatype);
+
+                       MultiValues[Index].finish_function(this, MultiValues[Index].tag);
                }
 
-               MultiValues[Index].finish_function(this, MultiValues[Index].tag);
        }
 
-       /* Free any memory we claimed
-        */
-       for (int n = 0; n < 12; n++)
-               delete[] data[n];
+       catch (CoreException &ce)
+       {
+               ReportConfigError(ce.GetReason(), bail, user);
+               return;
+       }
 
        // write once here, to try it out and make sure its ok
        ServerInstance->WritePID(this->PID);
 
-       log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
+       ServerInstance->Log(DEFAULT,"Done reading configuration file.");
 
        /* If we're rehashing, let's load any new modules, and unload old ones
         */
        if (!bail)
        {
-               ServerInstance->stats->BoundPortCount = BindPorts(false);
+               int found_ports = 0;
+               FailedPortList pl;
+               ServerInstance->BindPorts(false, found_ports, pl);
+
+               if (pl.size() && user)
+               {
+                       user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick);
+                       user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick);
+                       int j = 1;
+                       for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+                       {
+                               user->WriteServ("NOTICE %s :*** %d.   IP: %s     Port: %lu", user->nick, j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
+                       }
+               }
 
                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()))
+                               if (ServerInstance->Modules->Unload(removing->c_str()))
                                {
                                        ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
@@ -817,31 +1016,42 @@ void ServerConfig::Read(bool bail, userrec* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError());
                                }
                        }
+               }
 
                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()))
+                       for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
                        {
-                               ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+                               if (ServerInstance->Modules->Load(adding->c_str()))
+                               {
+                                       ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
 
-                               if (user)
-                                       user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+                                       if (user)
+                                               user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
 
-                               add++;
-                       }
-                       else
-                       {
-                               if (user)
-                                       user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                                       add++;
+                               }
+                               else
+                               {
+                                       if (user)
+                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError());
+                               }
                        }
                }
 
-               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());
+               ServerInstance->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());
        }
+
+       /** Note: This is safe, the method checks for user == NULL */
+       ServerInstance->Parser->SetupCommandTable(user);
+
+       if (user)
+               user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
+       else
+               ServerInstance->WriteOpers("*** Successfully rehashed server.");
 }
 
 bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream)
@@ -853,22 +1063,23 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
        bool in_tag;
        bool in_quote;
        bool in_comment;
-       
+       int character_count = 0;
+
        linenumber = 1;
        in_tag = false;
        in_quote = false;
        in_comment = false;
-       
+
        /* Check if the file open failed first */
        if (!conf)
        {
                errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
                return false;
        }
-       
+
        /* 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])
@@ -877,13 +1088,28 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        return false;
                }
        }
-       
+
        /* It's not already included, add it to the list of files we've loaded */
        include_stack.push_back(filename);
-       
-       /* Start reading characters... */       
-       while(conf.get(ch))
+
+       /* Start reading characters... */
+       while (conf.get(ch))
        {
+
+               /*
+                * Fix for moronic windows issue spotted by Adremelech.
+                * Some windows editors save text files as utf-16, which is
+                * a total pain in the ass to parse. Users should save in the
+                * right config format! If we ever see a file where the first
+                * byte is 0xFF or 0xFE, or the second is 0xFF or 0xFE, then
+                * this is most likely a utf-16 file. Bail out and insult user.
+                */
+               if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE'))
+               {
+                       errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
+                       return false;
+               }
+
                /*
                 * Here we try and get individual tags on separate lines,
                 * this would be so easy if we just made people format
@@ -892,28 +1118,25 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                 * we get a '>' not inside quotes. If we find two '<' and
                 * no '>' then die with an error.
                 */
-               
-               if((ch == '#') && !in_quote)
+
+               if ((ch == '#') && !in_quote)
                        in_comment = true;
-               
-               if(((ch == '\n') || (ch == '\r')) && in_quote)
-               {
-                       errorstream << "Got a newline within a quoted section, this is probably a typo: " << filename << ":" << linenumber << std::endl;
-                       return false;
-               }
-               
-               switch(ch)
+
+               switch (ch)
                {
                        case '\n':
+                               if (in_quote)
+                                       line += '\n';
                                linenumber++;
                        case '\r':
-                               in_comment = false;
+                               if (!in_quote)
+                                       in_comment = false;
                        case '\0':
                                continue;
                        case '\t':
                                ch = ' ';
                }
-               
+
                if(in_comment)
                        continue;
 
@@ -928,11 +1151,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                if ((ch == '\\') && (in_quote) && (in_tag))
                {
                        line += ch;
-                       log(DEBUG,"Escape sequence in config line.");
                        char real_character;
                        if (conf.get(real_character))
                        {
-                               log(DEBUG,"Escaping %c", real_character);
+                               if (real_character == 'n')
+                                       real_character = '\n';
                                line += real_character;
                                continue;
                        }
@@ -943,13 +1166,14 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                }
 
-               line += ch;
-               
-               if(ch == '<')
+               if (ch != '\r')
+                       line += ch;
+
+               if (ch == '<')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(!in_quote)
+                               if (!in_quote)
                                {
                                        errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -957,7 +1181,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -969,11 +1193,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '"')
+               else if (ch == '"')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        // errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
                                        in_quote = false;
@@ -986,7 +1210,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl;
                                }
@@ -996,11 +1220,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '>')
+               else if (ch == '>')
                {
-                       if(!in_quote)
+                       if (!in_quote)
                        {
-                               if(in_tag)
+                               if (in_tag)
                                {
                                        // errorstream << "Closing config tag on line " << linenumber << std::endl;
                                        in_tag = false;
@@ -1009,10 +1233,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                         * If this finds an <include> then ParseLine can simply call
                                         * LoadConf() and load the included config into the same ConfigDataHash
                                         */
-                                       
-                                       if(!this->ParseLine(target, line, linenumber, errorstream))
+
+                                       if (!this->ParseLine(target, line, linenumber, errorstream))
                                                return false;
-                                       
+
                                        line.clear();
                                }
                                else
@@ -1023,7 +1247,14 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                }
        }
-       
+
+       /* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */
+       if (in_comment || in_quote)
+       {
+               errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
+                       is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl;
+       }
+
        return true;
 }
 
@@ -1032,7 +1263,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename,
        return this->LoadConf(target, filename.c_str(), errorstream);
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream)
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream)
 {
        std::string tagname;
        std::string current_key;
@@ -1041,20 +1272,18 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
        bool got_name;
        bool got_key;
        bool in_quote;
-       
+
        got_name = got_key = in_quote = false;
-       
-       // std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
-       
+
        for(std::string::iterator c = line.begin(); c != line.end(); c++)
        {
-               if(!got_name)
+               if (!got_name)
                {
                        /* We don't know the tag name yet. */
-                       
-                       if(*c != ' ')
+
+                       if (*c != ' ')
                        {
-                               if(*c != '<')
+                               if (*c != '<')
                                {
                                        tagname += *c;
                                }
@@ -1097,9 +1326,23 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                if ((*c == '\\') && (in_quote))
                                {
                                        c++;
-                                       current_value += *c;
+                                       if (*c == 'n')
+                                               current_value += '\n';
+                                       else
+                                               current_value += *c;
+                                       continue;
+                               }
+                               else if ((*c == '\n') && (in_quote))
+                               {
+                                       /* Got a 'real' \n, treat it as part of the value */
+                                       current_value += '\n';
+                                       linenumber++;
                                        continue;
                                }
+                               else if ((*c == '\r') && (in_quote))
+                                       /* Got a \r, drop it */
+                                       continue;
+
                                if (*c == '"')
                                {
                                        if (!in_quote)
@@ -1111,25 +1354,25 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                        {
                                                /* Leaving quotes, we have the value */
                                                results.push_back(KeyVal(current_key, current_value));
-                                               
+
                                                // std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl;
-                                               
+
                                                in_quote = false;
                                                got_key = false;
-                                               
-                                               if((tagname == "include") && (current_key == "file"))
+
+                                               if ((tagname == "include") && (current_key == "file"))
                                                {
-                                                       if(!this->DoInclude(target, current_value, errorstream))
+                                                       if (!this->DoInclude(target, current_value, errorstream))
                                                                return false;
                                                }
-                                               
+
                                                current_key.clear();
                                                current_value.clear();
                                        }
                                }
                                else
                                {
-                                       if(in_quote)
+                                       if (in_quote)
                                        {
                                                current_value += *c;
                                        }
@@ -1137,10 +1380,10 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                        }
                }
        }
-       
+
        /* Finished parsing the tag, add it to the config hash */
        target.insert(std::pair<std::string, KeyValList > (tagname, results));
-       
+
        return true;
 }
 
@@ -1149,104 +1392,180 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
        std::string confpath;
        std::string newfile;
        std::string::size_type pos;
-       
-       confpath = CONFIG_FILE;
+
+       confpath = ServerInstance->ConfigFileName;
        newfile = file;
-       
-       for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
-       {
-               if (*c == '\\')
-               {
-                       *c = '/';
-               }
-       }
 
-       if (file[0] != '/')
+       std::replace(newfile.begin(),newfile.end(),'\\','/');
+       std::replace(confpath.begin(),confpath.end(),'\\','/');
+
+       if (newfile[0] != '/')
        {
-               if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+               if((pos = confpath.rfind("/")) != std::string::npos)
                {
                        /* Leaves us with just the path */
                        newfile = confpath.substr(0, pos) + std::string("/") + newfile;
                }
                else
                {
-                       errorstream << "Couldn't get config path from: " << confpath << std::endl;
+                       errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
                        return false;
                }
        }
-       
+
        return LoadConf(target, newfile, errorstream);
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length)
+bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
+{
+       return ConfValue(target, tag, var, "", index, result, length, allow_linefeeds);
+}
+
+bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds)
 {
        std::string value;
-       bool r = ConfValue(target, std::string(tag), std::string(var), index, value);
+       bool r = ConfValue(target, std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds);
        strlcpy(result, value.c_str(), length);
        return r;
 }
 
-bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result)
+bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds)
+{
+       return ConfValue(target, tag, var, "", index, result, allow_linefeeds);
+}
+
+bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds)
 {
        ConfigDataHash::size_type pos = index;
-       if((pos >= 0) && (pos < target.count(tag)))
+       if (pos < target.count(tag))
        {
-               ConfigDataHash::const_iterator iter = target.find(tag);
-               
+               ConfigDataHash::iterator iter = target.find(tag);
+
                for(int i = 0; i < index; i++)
                        iter++;
-               
-               for(KeyValList::const_iterator j = iter->second.begin(); j != iter->second.end(); j++)
+
+               for(KeyValList::iterator j = iter->second.begin(); j != iter->second.end(); j++)
                {
                        if(j->first == var)
                        {
-                               result = j->second;
-                               return true;
+                               if ((!allow_linefeeds) && (j->second.find('\n') != std::string::npos))
+                               {
+                                       ServerInstance->Log(DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces.");
+                                       for (std::string::iterator n = j->second.begin(); n != j->second.end(); n++)
+                                               if (*n == '\n')
+                                                       *n = ' ';
+                               }
+                               else
+                               {
+                                       result = j->second;
+                                       return true;
+                               }
                        }
                }
+               if (!default_value.empty())
+               {
+                       result = default_value;
+                       return true;
+               }
        }
        else if(pos == 0)
        {
-               log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
+               if (!default_value.empty())
+               {
+                       result = default_value;
+                       return true;
+               }
        }
-       
        return false;
 }
-       
+
 bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result)
 {
-       return ConfValueInteger(target, std::string(tag), std::string(var), index, result);
+       return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result);
+}
+
+bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result)
+{
+       return ConfValueInteger(target, std::string(tag), std::string(var), std::string(default_value), index, result);
 }
 
 bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result)
+{
+       return ConfValueInteger(target, tag, var, "", index, result);
+}
+
+bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result)
 {
        std::string value;
        std::istringstream stream;
-       bool r = ConfValue(target, tag, var, index, value);
+       bool r = ConfValue(target, tag, var, default_value, index, value);
        stream.str(value);
        if(!(stream >> result))
                return false;
+       else
+       {
+               if (!value.empty())
+               {
+                       if (value.substr(0,2) == "0x")
+                       {
+                               char* endptr;
+
+                               value.erase(0,2);
+                               result = strtol(value.c_str(), &endptr, 16);
+
+                               /* No digits found */
+                               if (endptr == value.c_str())
+                                       return false;
+                       }
+                       else
+                       {
+                               char denominator = *(value.end() - 1);
+                               switch (toupper(denominator))
+                               {
+                                       case 'K':
+                                               /* Kilobytes -> bytes */
+                                               result = result * 1024;
+                                       break;
+                                       case 'M':
+                                               /* Megabytes -> bytes */
+                                               result = result * 1024 * 1024;
+                                       break;
+                                       case 'G':
+                                               /* Gigabytes -> bytes */
+                                               result = result * 1024 * 1024 * 1024;
+                                       break;
+                               }
+                       }
+               }
+       }
        return r;
 }
-       
+
+
 bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index)
 {
-       return ConfValueBool(target, std::string(tag), std::string(var), index);
+       return ConfValueBool(target, std::string(tag), std::string(var), "", index);
+}
+
+bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index)
+{
+       return ConfValueBool(target, std::string(tag), std::string(var), std::string(default_value), index);
 }
 
 bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index)
+{
+       return ConfValueBool(target, tag, var, "", index);
+}
+
+bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index)
 {
        std::string result;
-       if(!ConfValue(target, tag, var, index, result))
+       if(!ConfValue(target, tag, var, default_value, index, result))
                return false;
-       
+
        return ((result == "yes") || (result == "true") || (result == "1"));
 }
-       
+
 int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
 {
        return target.count(tag);
@@ -1256,7 +1575,7 @@ int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag)
 {
        return target.count(tag);
 }
-       
+
 int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index)
 {
        return ConfVarEnum(target, std::string(tag), index);
@@ -1265,25 +1584,17 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index
 int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index)
 {
        ConfigDataHash::size_type pos = index;
-       
-       if((pos >= 0) && (pos < target.count(tag)))
+
+       if (pos < target.count(tag))
        {
                ConfigDataHash::const_iterator iter = target.find(tag);
-               
+
                for(int i = 0; i < index; i++)
                        iter++;
-               
+
                return iter->second.size();
        }
-       else if(pos == 0)
-       {
-               log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
-       }
-       
+
        return 0;
 }
 
@@ -1291,27 +1602,48 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
  */
 bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 {
-       FILE* file;
+       if (!fname || !*fname)
+               return false;
+
+       FILE* file = NULL;
        char linebuf[MAXBUF];
 
        F.clear();
-       file =  fopen(fname,"r");
+
+       if ((*fname != '/') && (*fname != '\\'))
+       {
+               std::string::size_type pos;
+               std::string confpath = ServerInstance->ConfigFileName;
+               std::string newfile = fname;
+
+               if ((pos = confpath.rfind("/")) != std::string::npos)
+                       newfile = confpath.substr(0, pos) + std::string("/") + fname;
+               else if ((pos = confpath.rfind("\\")) != std::string::npos)
+                       newfile = confpath.substr(0, pos) + std::string("\\") + fname;
+
+               if (!FileExists(newfile.c_str()))
+                       return false;
+               file =  fopen(newfile.c_str(), "r");
+       }
+       else
+       {
+               if (!FileExists(fname))
+                       return false;
+               file =  fopen(fname, "r");
+       }
 
        if (file)
        {
                while (!feof(file))
                {
-                       fgets(linebuf,sizeof(linebuf),file);
-                       linebuf[strlen(linebuf)-1]='\0';
-
-                       if (!*linebuf)
-                       {
-                               strcpy(linebuf," ");
-                       }
+                       if (fgets(linebuf, sizeof(linebuf), file))
+                               linebuf[strlen(linebuf)-1] = 0;
+                       else
+                               *linebuf = 0;
 
                        if (!feof(file))
                        {
-                               F.push_back(linebuf);
+                               F.push_back(*linebuf ? linebuf : " ");
                        }
                }
 
@@ -1325,11 +1657,16 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 
 bool ServerConfig::FileExists(const char* file)
 {
+       struct stat sb;
+       if (stat(file, &sb) == -1)
+               return false;
+
+       if ((sb.st_mode & S_IFDIR) > 0)
+               return false;
+            
        FILE *input;
        if ((input = fopen (file, "r")) == NULL)
-       {
                return false;
-       }
        else
        {
                fclose(input);
@@ -1340,19 +1677,23 @@ bool ServerConfig::FileExists(const char* file)
 char* ServerConfig::CleanFilename(char* name)
 {
        char* p = name + strlen(name);
-       while ((p != name) && (*p != '/')) p--;
+       while ((p != name) && (*p != '/') && (*p != '\\')) p--;
        return (p != name ? ++p : p);
 }
 
 
 bool ServerConfig::DirValid(const char* dirandfile)
 {
-       char work[MAXBUF];
-       char buffer[MAXBUF];
-       char otherdir[MAXBUF];
+#ifdef WINDOWS
+       return true;
+#endif
+
+       char work[1024];
+       char buffer[1024];
+       char otherdir[1024];
        int p;
 
-       strlcpy(work, dirandfile, MAXBUF);
+       strlcpy(work, dirandfile, 1024);
        p = strlen(work);
 
        // we just want the dir
@@ -1368,22 +1709,23 @@ bool ServerConfig::DirValid(const char* dirandfile)
        }
 
        // Get the current working directory
-       if (getcwd(buffer, MAXBUF ) == NULL )
+       if (getcwd(buffer, 1024 ) == NULL )
                return false;
 
-       chdir(work);
+       if (chdir(work) == -1)
+               return false;
 
-       if (getcwd(otherdir, MAXBUF ) == NULL )
+       if (getcwd(otherdir, 1024 ) == NULL )
                return false;
 
-       chdir(buffer);
+       if (chdir(buffer) == -1)
+               return false;
 
        size_t t = strlen(work);
 
        if (strlen(otherdir) >= t)
        {
                otherdir[t] = '\0';
-
                if (!strcmp(otherdir,work))
                {
                        return true;
@@ -1397,39 +1739,237 @@ bool ServerConfig::DirValid(const char* dirandfile)
        }
 }
 
-std::string ServerConfig::GetFullProgDir(char** argv, int argc)
+std::string ServerConfig::GetFullProgDir()
 {
-       char work[MAXBUF];
-       char buffer[MAXBUF];
-       char otherdir[MAXBUF];
-       int p;
+       char buffer[PATH_MAX+1];
+#ifdef WINDOWS
+       /* Windows has specific api calls to get the exe path that never fail.
+        * For once, windows has something of use, compared to the POSIX code
+        * for this, this is positively neato.
+        */
+       if (GetModuleFileName(NULL, buffer, MAX_PATH))
+       {
+               std::string fullpath = buffer;
+               std::string::size_type n = fullpath.rfind("\\inspircd.exe");
+               return std::string(fullpath, 0, n);
+       }
+#else
+       // Get the current working directory
+       if (getcwd(buffer, PATH_MAX))
+       {
+               std::string remainder = this->argv[0];
 
-       strlcpy(work,argv[0],MAXBUF);
-       p = strlen(work);
+               /* Does argv[0] start with /? its a full path, use it */
+               if (remainder[0] == '/')
+               {
+                       std::string::size_type n = remainder.rfind("/inspircd");
+                       return std::string(remainder, 0, n);
+               }
 
-       // we just want the dir
-       while (*work)
+               std::string fullpath = std::string(buffer) + "/" + remainder;
+               std::string::size_type n = fullpath.rfind("/inspircd");
+               return std::string(fullpath, 0, n);
+       }
+#endif
+       return "/";
+}
+
+InspIRCd* ServerConfig::GetInstance()
+{
+       return ServerInstance;
+}
+
+std::string ServerConfig::GetSID()
+{
+       std::string OurSID;
+       OurSID += (char)((sid / 100) + 48);
+       OurSID += (char)((sid / 10) % 10 + 48);
+       OurSID += (char)(sid % 10 + 48);
+       return OurSID;
+}
+
+ValueItem::ValueItem(int value)
+{
+       std::stringstream n;
+       n << value;
+       v = n.str();
+}
+
+ValueItem::ValueItem(bool value)
+{
+       std::stringstream n;
+       n << value;
+       v = n.str();
+}
+
+ValueItem::ValueItem(char* value)
+{
+       v = value;
+}
+
+void ValueItem::Set(char* value)
+{
+       v = value;
+}
+
+void ValueItem::Set(const char* value)
+{
+       v = value;
+}
+
+void ValueItem::Set(int value)
+{
+       std::stringstream n;
+       n << value;
+       v = n.str();
+}
+
+int ValueItem::GetInteger()
+{
+       if (v.empty())
+               return 0;
+       return atoi(v.c_str());
+}
+
+char* ValueItem::GetString()
+{
+       return (char*)v.c_str();
+}
+
+bool ValueItem::GetBool()
+{
+       return (GetInteger() || v == "yes" || v == "true");
+}
+
+
+
+
+/*
+ * XXX should this be in a class? -- w00t
+ */
+bool InitTypes(ServerConfig* conf, const char*)
+{
+       if (conf->opertypes.size())
        {
-               if (work[p] == '/')
+               for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++)
                {
-                       work[p] = '\0';
-                       break;
+                       if (n->second)
+                               delete[] n->second;
                }
+       }
 
-               work[p--] = '\0';
+       conf->opertypes.clear();
+       return true;
+}
+
+/*
+ * XXX should this be in a class? -- w00t
+ */
+bool InitClasses(ServerConfig* conf, const char*)
+{
+       if (conf->operclass.size())
+       {
+               for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++)
+               {
+                       if (n->second)
+                               delete[] n->second;
+               }
        }
 
-       // Get the current working directory
-       if (getcwd(buffer, MAXBUF) == NULL)
-               return "";
+       conf->operclass.clear();
+       return true;
+}
+
+/*
+ * XXX should this be in a class? -- w00t
+ */
+bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*)
+{
+       const char* TypeName = values[0].GetString();
+       const char* Classes = values[1].GetString();
+
+       conf->opertypes[TypeName] = strnewdup(Classes);
+       return true;
+}
 
-       chdir(work);
+/*
+ * XXX should this be in a class? -- w00t
+ */
+bool DoClass(ServerConfig* conf, const char*, char**, ValueList &values, int*)
+{
+       const char* ClassName = values[0].GetString();
+       const char* CommandList = values[1].GetString();
 
-       if (getcwd(otherdir, MAXBUF) == NULL)
-               return "";
+       conf->operclass[ClassName] = strnewdup(CommandList);
+       return true;
+}
 
-       chdir(buffer);
-       return otherdir;
+/*
+ * XXX should this be in a class? -- w00t
+ */
+bool DoneClassesAndTypes(ServerConfig*, const char*)
+{
+       return true;
 }
 
 
+
+bool InitXLine(ServerConfig* conf, const char* tag)
+{
+       return true;
+}
+
+bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* reason = values[0].GetString();
+       const char* ipmask = values[1].GetString();
+
+       ZLine* zl = new ZLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ipmask);
+       if (!conf->GetInstance()->XLines->AddLine(zl))
+               delete zl;
+
+       return true;
+}
+
+bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* reason = values[0].GetString();
+       const char* nick = values[1].GetString();
+
+       QLine* ql = new QLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, nick);
+       if (!conf->GetInstance()->XLines->AddLine(ql))
+               delete ql;
+
+       return true;
+}
+
+bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* reason = values[0].GetString();
+       const char* host = values[1].GetString();
+
+       XLineManager* xlm = conf->GetInstance()->XLines;
+
+       IdentHostPair ih = xlm->IdentSplit(host);
+
+       KLine* kl = new KLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+       if (!xlm->AddLine(kl))
+               delete kl;
+       return true;
+}
+
+bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+       const char* reason = values[0].GetString();
+       const char* host = values[1].GetString();
+
+       XLineManager* xlm = conf->GetInstance()->XLines;
+
+       IdentHostPair ih = xlm->IdentSplit(host);
+
+       ELine* el = new ELine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+       if (!xlm->AddLine(el))
+               delete el;
+       return true;
+}
+