X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=4ac41b1d5c17b0911b02b54be9158c30cb0f75ed;hb=047f09dd572b89223ff3798dc25c34fe4c4172b3;hp=04918e7cf001cd004b8e85aa160e465ef335beb7;hpb=d4ca01f12f539a7f3eda3a682b5d2fbb67fabdb7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 04918e7cf..4ac41b1d5 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -2,51 +2,34 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
-#include <string>
 #include <sstream>
-#include <iostream>
 #include <fstream>
-#include "message.h"
 #include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "userprocess.h"
 #include "xline.h"
-
-extern ServerConfig *Config;
-extern InspIRCd* ServerInstance;
-extern time_t TIME;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+#include "exitcodes.h"
 
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
-ServerConfig::ServerConfig()
+ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	this->ClearStack();
-	*TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+	*ServerName = *Network = *ServerDesc = *AdminName = '\0';
 	*HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
 	*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
-	*OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+	*UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
 	log_file = NULL;
 	NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
-	writelog = AllowHalfop = true;
+	CycleHosts = writelog = AllowHalfop = true;
 	dns_timeout = DieDelay = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
@@ -56,6 +39,9 @@ ServerConfig::ServerConfig()
 	debugging = 0;
 	LogLevel = DEFAULT;
 	maxbans.clear();
+	WhoWasGroupSize = 10;
+	WhoWasMaxGroups = WhoWasGroupSize * MAXCLIENTS;
+	WhoWasMaxKeep = 3600*24*3; // 3 days
 }
 
 void ServerConfig::ClearStack()
@@ -69,6 +55,12 @@ Module* ServerConfig::GetIOHook(int port)
 	return (x != IOHookModule.end() ? x->second : NULL);
 }
 
+Module* ServerConfig::GetIOHook(InspSocket* is)
+{
+	std::map<InspSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
+	return (x != SocketIOHookModule.end() ? x->second : NULL);
+}
+
 bool ServerConfig::AddIOHook(int port, Module* iomod)
 {
 	if (!GetIOHook(port))
@@ -78,8 +70,23 @@ 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, InspSocket* is)
+{
+	if (!GetIOHook(is))
+	{
+		ServerInstance->Log(DEBUG,"Hooked inspsocket %08x", is);
+		SocketIOHookModule[is] = iomod;
+		is->IsIOHooked = true;
+		return true;
+	}
+	else
+	{
+		throw ModuleException("InspSocket derived class already hooked by another module");
 		return false;
 	}
 }
@@ -95,28 +102,70 @@ bool ServerConfig::DelIOHook(int port)
 	return false;
 }
 
+bool ServerConfig::DelIOHook(InspSocket* is)
+{
+	std::map<InspSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
+	if (x != SocketIOHookModule.end())
+	{
+		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)
+		{
+			char buf[MAXBUF];
+			snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+			isupport.push_back(buf);
+			line5 = "";
+			token_counter = 0;
+		}
+	}
+	char buf[MAXBUF];
+	snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+	isupport.push_back(buf);
+}
+
+void ServerConfig::Send005(userrec* 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, bool bail, userrec* user)
 {
-	int count = ConfValueEnum(Config->config_data, tag);
+	int count = ConfValueEnum(this->config_data, tag);
 	
 	if (count > 1)
 	{
 		if (bail)
 		{
 			printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
-			Exit(0);
+			InspIRCd::Exit(EXIT_STATUS_CONFIG);
 		}
 		else
 		{
 			if (user)
 			{
-				WriteServ(user->fd,"There were errors in your configuration:");
-				WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag);
+				user->WriteServ("There were errors in your configuration:");
+				user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag);
 			}
 			else
 			{
-				WriteOpers("There were errors in the configuration file:");
-				WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+				ServerInstance->WriteOpers("There were errors in the configuration file:");
+				ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
 			}
 		}
 		return false;
@@ -126,19 +175,19 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
 		if (bail)
 		{
 			printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
-			Exit(0);
+			InspIRCd::Exit(EXIT_STATUS_CONFIG);
 		}
 		else
 		{
 			if (user)
 			{
-				WriteServ(user->fd,"There were errors in your configuration:");
-				WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag);
+				user->WriteServ("There were errors in your configuration:");
+				user->WriteServ("You have not defined a <%s> tag, this is required.",tag);
 			}
 			else
 			{
-				WriteOpers("There were errors in the configuration file:");
-				WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+				ServerInstance->WriteOpers("There were errors in the configuration file:");
+				ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag);
 			}
 		}
 		return false;
@@ -146,67 +195,76 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
 	return true;
 }
 
-bool NoValidation(const char* tag, const char* value, void* data)
+bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	log(DEBUG,"No validation for <%s:%s>",tag,value);
+	conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value);
 	return true;
 }
 
-bool ValidateTempDir(const char* tag, const char* value, void* data)
+bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	char* x = (char*)data;
-	if (!*x)
-		strlcpy(x,"/tmp",1024);
+	if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
+	{
+		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 ValidateMaxTargets(const char* tag, const char* value, void* data)
+
+bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	int* x = (int*)data;
-	if ((*x < 0) || (*x > 31))
+	if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
 	{
-		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:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
+		data.Set(MAXCLIENTS);
 	}
 	return true;
 }
 
-bool ValidateSoftLimit(const char* tag, const char* value, void* data)
+bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	int* x = (int*)data;	
-	if ((*x < 1) || (*x > MAXCLIENTS))
-	{
-		log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
-		*x = MAXCLIENTS;
-	}
+	if (data.GetInteger() > SOMAXCONN)
+		conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
+	if (!data.GetInteger())
+		data.Set(SOMAXCONN);
 	return true;
 }
 
-bool ValidateMaxConn(const char* tag, const char* value, void* data)
+bool ValidateDnsTimeout(ServerConfig* conf, const char* tag, const char* value, 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;
+	if (!data.GetInteger())
+		data.Set(5);
 	return true;
 }
 
-bool ValidateDnsTimeout(const char* tag, const char* value, void* data)
+bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
 {
-	int* x = (int*)data;
-	if (!*x)
-		*x = 5;
+	std::stringstream dcmds(data);
+	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++)
+		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);
+		if (cm != ServerInstance->Parser->cmdlist.end())
+		{
+			ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
+			cm->second->Disable(true);
+		}
+	}
 	return true;
 }
 
-bool ValidateDnsServer(const char* tag, const char* value, void* data)
+bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	char* x = (char*)data;
-	if (!*x)
+	if (!*(data.GetString()))
 	{
 		// 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;
@@ -218,167 +276,154 @@ bool ValidateDnsServer(const char* tag, const char* value, void* data)
 				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(const char* tag, const char* value, void* data)
+bool ValidateModPath(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	char* x = (char*)data;	
-	if (!*x)
-		strlcpy(x,MOD_PATH,MAXBUF);
+	if (!*(data.GetString()))
+		data.Set(MOD_PATH);
 	return true;
 }
 
 
-bool ValidateServerName(const char* tag, const char* value, void* data)
+bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	char* x = (char*)data;
-	if (!strchr(x,'.'))
+	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(const char* tag, const char* value, void* data)
+bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	if ((!Config->NetBufferSize) || (Config->NetBufferSize > 65535) || (Config->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.");
-		Config->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(const char* tag, const char* value, void* data)
+bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	if ((!Config->MaxWhoResults) || (Config->MaxWhoResults > 65535) || (Config->MaxWhoResults < 1))
+	if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1))
 	{
-		log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
-		Config->MaxWhoResults = 128;
+		conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
+		data.Set(128);
 	}
 	return true;
 }
 
-bool ValidateLogLevel(const char* tag, const char* value, void* data)
+bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	const char* dbg = (const char*)data;
-	Config->LogLevel = DEFAULT;
-	if (!strcmp(dbg,"debug"))
-	{
-		Config->LogLevel = DEBUG;
-		Config->debugging = 1;
-	}
-	else if (!strcmp(dbg,"verbose"))
-		Config->LogLevel = VERBOSE;
-	else if (!strcmp(dbg,"default"))
-		Config->LogLevel = DEFAULT;
-	else if (!strcmp(dbg,"sparse"))
-		Config->LogLevel = SPARSE;
-	else if (!strcmp(dbg,"none"))
-		Config->LogLevel = NONE;
+	std::string dbg = data.GetString();
+	conf->LogLevel = DEFAULT;
+
+	if (dbg == "debug")
+		conf->LogLevel = DEBUG;
+	else if (dbg  == "verbose")
+		conf->LogLevel = VERBOSE;
+	else if (dbg == "default")
+		conf->LogLevel = DEFAULT;
+	else if (dbg == "sparse")
+		conf->LogLevel = SPARSE;
+	else if (dbg == "none")
+		conf->LogLevel = NONE;
+
+	conf->debugging = (conf->LogLevel == DEBUG);
+
+	return true;
+}
+
+bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+	conf->ReadFile(conf->MOTD, data.GetString());
 	return true;
 }
 
-bool ValidateMotd(const char* tag, const char* value, void* data)
+bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	readfile(Config->MOTD,Config->motd);
+	conf->ReadFile(conf->RULES, data.GetString());
 	return true;
 }
 
-bool ValidateRules(const char* tag, const char* value, void* data)
+bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-	readfile(Config->RULES,Config->rules);
+	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");
+	}
+	conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep);
+	irc::whowas::PruneWhoWas(conf->GetInstance(), conf->GetInstance()->Time());
 	return true;
 }
 
 /* Callback called before processing the first <connect> tag
  */
-bool InitConnect(const char* tag)
+bool InitConnect(ServerConfig* conf, const char* tag)
 {
-	log(DEFAULT,"Reading connect classes...");
-	Config->Classes.clear();
+	conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
+	conf->Classes.clear();
 	return true;
 }
 
 /* Callback called to process a single <connect> tag
  */
-bool DoConnect(const char* tag, char** entries, void** values, int* types)
+bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
 	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];
+	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();
 
 	if (*allow)
 	{
-		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)
-		{
-			c.threshold = 1;
-			c.flood = 999;
-			log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str());
-		}
-		if (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;
-		Config->Classes.push_back(c);
+		ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax);
+		conf->Classes.push_back(c);
 	}
 	else
 	{
-		c.host = deny;
-		c.type = CC_DENY;
-		Config->Classes.push_back(c);
-		log(DEBUG,"Read connect class type DENY, host=%s",deny);
+		ConnectClass c(deny);
+		conf->Classes.push_back(c);
 	}
 
 	return true;
@@ -386,46 +431,46 @@ bool DoConnect(const char* tag, char** entries, void** values, int* types)
 
 /* Callback called when there are no more <connect> tags
  */
-bool DoneConnect(const char* tag)
+bool DoneConnect(ServerConfig* conf, const char* tag)
 {
-	log(DEBUG,"DoneConnect called for tag: %s",tag);
+	conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag);
 	return true;
 }
 
 /* Callback called before processing the first <uline> tag
  */
-bool InitULine(const char* tag)
+bool InitULine(ServerConfig* conf, const char* tag)
 {
-	Config->ulines.clear();
+	conf->ulines.clear();
 	return true;
 }
 
 /* Callback called to process a single <uline> tag
  */
-bool DoULine(const char* tag, char** entries, void** values, int* types)
+bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
-	char* server = (char*)values[0];
-	log(DEBUG,"Read ULINE '%s'",server);
-	Config->ulines.push_back(server);
+	const char* server = values[0].GetString();
+	conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server);
+	conf->ulines.push_back(server);
 	return true;
 }
 
 /* Callback called when there are no more <uline> tags
  */
-bool DoneULine(const char* tag)
+bool DoneULine(ServerConfig* conf, const char* tag)
 {
 	return true;
 }
 
 /* Callback called before processing the first <module> tag
  */
-bool InitModule(const char* tag)
+bool InitModule(ServerConfig* conf, const char* tag)
 {
 	old_module_names.clear();
 	new_module_names.clear();
 	added_modules.clear();
 	removed_modules.clear();
-	for (std::vector<std::string>::iterator t = Config->module_names.begin(); t != Config->module_names.end(); t++)
+	for (std::vector<std::string>::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++)
 	{
 		old_module_names.push_back(*t);
 	}
@@ -434,16 +479,16 @@ bool InitModule(const char* tag)
 
 /* Callback called to process a single <module> tag
  */
-bool DoModule(const char* tag, char** entries, void** values, int* types)
+bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
-	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(const char* tag)
+bool DoneModule(ServerConfig* conf, const char* tag)
 {
 	// 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
@@ -478,82 +523,124 @@ bool DoneModule(const char* tag)
 
 /* Callback called before processing the first <banlist> tag
  */
-bool InitMaxBans(const char* tag)
+bool InitMaxBans(ServerConfig* conf, const char* tag)
 {
-	Config->maxbans.clear();
+	conf->maxbans.clear();
 	return true;
 }
 
 /* Callback called to process a single <banlist> tag
  */
-bool DoMaxBans(const char* tag, char** entries, void** values, int* types)
+bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
-	char* channel = (char*)values[0];
-	int* limit = (int*)values[1];
-	Config->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(const char* tag)
+bool DoneMaxBans(ServerConfig* conf, const char* tag)
 {
 	return true;
 }
 
+void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user)
+{
+	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());
+		InspIRCd::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 :" */
+		prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11;
+		if (user)
+		{
+			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, userrec* 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 */
+	static char debug[MAXBUF];	/* Temporary buffer for debugging value */
+	static char maxkeep[MAXBUF];	/* Temporary buffer for WhoWasMaxKeep value */
 	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},
-		{"pid",			"file",				&this->PID,			DT_CHARPTR, NoValidation},
+	InitialConfig Values[] = {
+		{"options",	"softlimit",	"",		new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER, ValidateSoftLimit},
+		{"options",	"somaxconn",	"",		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER, ValidateMaxConn},
+		{"server",	"name",		"",		new ValueContainerChar (this->ServerName),		DT_CHARPTR, ValidateServerName},
+		{"server",	"description",	"",		new ValueContainerChar (this->ServerDesc),		DT_CHARPTR, NoValidation},
+		{"server",	"network",	"",		new ValueContainerChar (this->Network),			DT_CHARPTR, NoValidation},
+		{"admin",	"name",		"",		new ValueContainerChar (this->AdminName),		DT_CHARPTR, NoValidation},
+		{"admin",	"email",	"",		new ValueContainerChar (this->AdminEmail),		DT_CHARPTR, NoValidation},
+		{"admin",	"nick",		"",		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, NoValidation},	
+		{"power",	"pause",	"",		new ValueContainerInt  (&this->DieDelay),		DT_INTEGER, NoValidation},
+		{"power",	"restartpass",	"",		new ValueContainerChar (this->restartpass),		DT_CHARPTR, NoValidation},
+		{"options",	"prefixquit",	"",		new ValueContainerChar (this->PrefixQuit),		DT_CHARPTR, NoValidation},
+		{"options",	"loglevel",	"",		new ValueContainerChar (debug),				DT_CHARPTR, ValidateLogLevel},
+		{"options",	"netbuffersize","",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER, ValidateNetBufferSize},
+		{"options",	"maxwho",	"",		new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER, ValidateMaxWho},
+		{"options",	"allowhalfop",	"",		new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN, NoValidation},
+		{"dns",		"server",	"",		new ValueContainerChar (this->DNSServer),		DT_CHARPTR, ValidateDnsServer},
+		{"dns",		"timeout",	"",		new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER, ValidateDnsTimeout},
+		{"options",	"moduledir",	"",		new ValueContainerChar (this->ModPath),			DT_CHARPTR, ValidateModPath},
+		{"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",	"",		new ValueContainerBool (&this->HideSplits),		DT_BOOLEAN, NoValidation},
+		{"options",	"hidebans",	"",		new ValueContainerBool (&this->HideBans),		DT_BOOLEAN, NoValidation},
+		{"options",	"hidewhois",	"",		new ValueContainerChar (this->HideWhoisServer),		DT_CHARPTR, NoValidation},
+		{"options",	"operspywhois",	"",		new ValueContainerBool (&this->OperSpyWhois),		DT_BOOLEAN, NoValidation},
+		{"options",	"nouserdns",	"",		new ValueContainerBool (&this->NoUserDns),		DT_BOOLEAN, NoValidation},
+		{"options",	"syntaxhints",	"",		new ValueContainerBool (&this->SyntaxHints),		DT_BOOLEAN, NoValidation},
+		{"options",	"cyclehosts",	"",		new ValueContainerBool (&this->CycleHosts),		DT_BOOLEAN, NoValidation},
+		{"options",	"ircumsgprefix","0",		new ValueContainerBool (&this->UndernetMsgPrefix),	DT_BOOLEAN, 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},
 		{NULL}
 	};
 
 	/* 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",
@@ -620,205 +707,200 @@ void ServerConfig::Read(bool bail, userrec* user)
 	if (this->LoadConf(newconfig, CONFIG_FILE, errstr))
 	{
 		/* If we succeeded, set the ircd config to the new one */
-		Config->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;
-		}
- */	}
+		this->config_data = newconfig;	
+	}
 	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());
-			Exit(0);
-		}
-		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], 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++)
 		{
-			std::string errors = errstr.str();
-			std::string::size_type start;
-			unsigned int prefixlen;
-			
-			start = 0;
-			/* ":Config->ServerName NOTICE user->nick :" */
-			prefixlen = strlen(Config->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);
+
+			Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi);
+
+			switch (Values[Index].datatype)
 			{
-				WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
-				
-				while(start < errors.length())
+				case DT_CHARPTR:
 				{
-					WriteServ(user->fd, "NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
-					start += 510 - prefixlen;
+					ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+					vcc->Set(vi.GetString(), strlen(vi.GetString()));
 				}
-			}
-			else
-			{
-				WriteOpers("There were errors in the configuration file:");
-				
-				while(start < errors.length())
+				break;
+				case DT_INTEGER:
 				{
-					WriteOpers(errors.substr(start, 360).c_str());
-					start += 360;
+					int val = vi.GetInteger();
+					ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val;
+					vci->Set(&val, sizeof(int));
 				}
+				break;
+				case DT_BOOLEAN:
+				{
+					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(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(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], 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], 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], 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(MultiValues[Index].tag, (char**)MultiValues[Index].items, ptr, MultiValues[Index].datatype);
+	
+			MultiValues[Index].finish_function(this, MultiValues[Index].tag);
 		}
 
-		MultiValues[Index].finish_function(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(Config->PID);
+	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->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports, pl);
+
+		if (pl.size())
+		{
+			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, found_ports - ServerInstance->stats->BoundPortCount != 1 ? "s" : "");
+			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()))
 				{
-					WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+					ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
 					if (user)
-						WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+						user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
 
 					rem++;
 				}
 				else
 				{
 					if (user)
-						WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+						user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
 				}
 			}
+		}
 
 		if (!added_modules.empty())
-		for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 		{
-			if (ServerInstance->LoadModule(adding->c_str()))
+			for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 			{
-				WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
-
-				if (user)
-					WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
-
-				add++;
-			}
-			else
-			{
-				if (user)
-					WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+				if (ServerInstance->LoadModule(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());
+	
+					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());
+				}
 			}
 		}
 
-		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());
 	}
 }
 
@@ -874,18 +956,24 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 		if((ch == '#') && !in_quote)
 			in_comment = true;
 		
-		if(((ch == '\n') || (ch == '\r')) && in_quote)
+		/*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)
 		{
 			case '\n':
+				if (in_quote)
+				{
+					ServerInstance->Log(DEBUG, "Got \\n inside value");
+					line += '\n';
+				}
 				linenumber++;
 			case '\r':
-				in_comment = false;
+				if (!in_quote)
+					in_comment = false;
 			case '\0':
 				continue;
 			case '\t':
@@ -906,11 +994,13 @@ 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.");
+			ServerInstance->Log(DEBUG,"Escape sequence in config line.");
 			char real_character;
 			if (conf.get(real_character))
 			{
-				log(DEBUG,"Escaping %c", real_character);
+				ServerInstance->Log(DEBUG,"Escaping %c", real_character);
+				if (real_character == 'n')
+					real_character = '\n';
 				line += real_character;
 				continue;
 			}
@@ -921,7 +1011,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 			}
 		}
 
-		line += ch;
+		if (ch != '\r')
+			line += ch;
 		
 		if(ch == '<')
 		{
@@ -1021,8 +1112,8 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
 	bool in_quote;
 	
 	got_name = got_key = in_quote = false;
-	
-	// std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
+
+	//std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
 	
 	for(std::string::iterator c = line.begin(); c != line.end(); c++)
 	{
@@ -1075,9 +1166,22 @@ 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';
+					continue;
+				}
+				else if ((*c == '\r') && (in_quote))
+					/* Got a \r, drop it */
+					continue;
+
 				if (*c == '"')
 				{
 					if (!in_quote)
@@ -1089,7 +1193,7 @@ 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;
@@ -1156,42 +1260,68 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
 	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)))
 	{
-		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;
+				}
 			}
 		}
 	}
 	else if(pos == 0)
 	{
-		log(DEBUG, "No <%s> tags in config file.", tag.c_str());
+		if (!default_value.empty())
+		{
+			result = default_value;
+			ServerInstance->Log(DEBUG, "No <%s> tags in config file using default.", tag.c_str());
+			return true;
+		}
+		ServerInstance->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());
+		ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
 	}
-	
+
 	return false;
 }
 	
@@ -1255,12 +1385,233 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
 	}
 	else if(pos == 0)
 	{
-		log(DEBUG, "No <%s> tags in config file.", tag.c_str());
+		ServerInstance->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());
+		ServerInstance->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;
 }
+
+/** Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
+ */
+bool ServerConfig::ReadFile(file_cache &F, const char* fname)
+{
+	FILE* file = NULL;
+	char linebuf[MAXBUF];
+
+	F.clear();
+	
+	if (*fname != '/')
+	{
+		std::string::size_type pos;
+		std::string confpath = CONFIG_FILE;
+		if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+		{
+			/* Leaves us with just the path */
+			std::string newfile = confpath.substr(0, pos) + std::string("/") + fname;
+			file =  fopen(newfile.c_str(), "r");
+			
+		}
+	}
+	else
+		file =  fopen(fname, "r");
+
+	if (file)
+	{
+		while (!feof(file))
+		{
+			if (fgets(linebuf, sizeof(linebuf), file))
+				linebuf[strlen(linebuf)-1] = 0;
+			else
+				*linebuf = 0;
+
+			if (!feof(file))
+			{
+				F.push_back(*linebuf ? linebuf : " ");
+			}
+		}
+
+		fclose(file);
+	}
+	else
+		return false;
+
+	return true;
+}
+
+bool ServerConfig::FileExists(const char* file)
+{
+	FILE *input;
+	if ((input = fopen (file, "r")) == NULL)
+	{
+		return false;
+	}
+	else
+	{
+		fclose(input);
+		return true;
+	}
+}
+
+char* ServerConfig::CleanFilename(char* name)
+{
+	char* p = name + strlen(name);
+	while ((p != name) && (*p != '/')) p--;
+	return (p != name ? ++p : p);
+}
+
+
+bool ServerConfig::DirValid(const char* dirandfile)
+{
+	char work[MAXBUF];
+	char buffer[MAXBUF];
+	char otherdir[MAXBUF];
+	int p;
+
+	strlcpy(work, dirandfile, MAXBUF);
+	p = strlen(work);
+
+	// we just want the dir
+	while (*work)
+	{
+		if (work[p] == '/')
+		{
+			work[p] = '\0';
+			break;
+		}
+
+		work[p--] = '\0';
+	}
+
+	// Get the current working directory
+	if (getcwd(buffer, MAXBUF ) == NULL )
+		return false;
+
+	if (chdir(work) == -1)
+		return false;
+
+	if (getcwd(otherdir, MAXBUF ) == NULL )
+		return false;
+
+	if (chdir(buffer) == -1)
+		return false;
+
+	size_t t = strlen(work);
+
+	if (strlen(otherdir) >= t)
+	{
+		otherdir[t] = '\0';
+
+		if (!strcmp(otherdir,work))
+		{
+			return true;
+		}
+
+		return false;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+std::string ServerConfig::GetFullProgDir(char** argv, int argc)
+{
+	char work[MAXBUF];
+	char buffer[MAXBUF];
+	char otherdir[MAXBUF];
+	int p;
+
+	strlcpy(work,argv[0],MAXBUF);
+	p = strlen(work);
+
+	// we just want the dir
+	while (*work)
+	{
+		if (work[p] == '/')
+		{
+			work[p] = '\0';
+			break;
+		}
+
+		work[p--] = '\0';
+	}
+
+	// Get the current working directory
+	if (getcwd(buffer, MAXBUF) == NULL)
+		return "";
+
+	if (chdir(work) == -1)
+		return "";
+
+	if (getcwd(otherdir, MAXBUF) == NULL)
+		return "";
+
+	if (chdir(buffer) == -1)
+		return "";
+
+	return otherdir;
+}
+
+InspIRCd* ServerConfig::GetInstance()
+{
+	return ServerInstance;
+}
+
+
+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");
+}
+