Helps to svn add these too :P

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3849 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 1650 insertions, 0 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
new file mode 100644
index 000000000..4554b58b6
--- /dev/null
+++ b/src/configreader.cpp
@@ -0,0 +1,1229 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; 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;
+
+std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
+
+ServerConfig::ServerConfig()
+{
+	this->ClearStack();
+	*TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+	*HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+	*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
+	*OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+	log_file = NULL;
+	forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
+	writelog = AllowHalfop = true;
+	dns_timeout = DieDelay = 5;
+	MaxTargets = 20;
+	NetBufferSize = 10240;
+	SoftLimit = MAXCLIENTS;
+	MaxConn = SOMAXCONN;
+	MaxWhoResults = 100;
+	debugging = 0;
+	LogLevel = DEFAULT;
+	maxbans.clear();
+}
+
+void ServerConfig::ClearStack()
+{
+	include_stack.clear();
+}
+
+Module* ServerConfig::GetIOHook(int port)
+{
+	std::map<int,Module*>::iterator x = IOHookModule.find(port);
+	return (x != IOHookModule.end() ? x->second : NULL);
+}
+
+bool ServerConfig::AddIOHook(int port, Module* iomod)
+{
+	if (!GetIOHook(port))
+	{
+		IOHookModule[port] = iomod;
+		return true;
+	}
+	else
+	{
+		ModuleException err("Port already hooked by another module");
+		throw(err);
+		return false;
+	}
+}
+
+bool ServerConfig::DelIOHook(int port)
+{
+	std::map<int,Module*>::iterator x = IOHookModule.find(port);
+	if (x != IOHookModule.end())
+	{
+		IOHookModule.erase(x);
+		return true;
+	}
+	return false;
+}
+
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+{
+	int count = ConfValueEnum(Config->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);
+		}
+		else
+		{
+			if (user)
+			{
+				WriteServ(user->fd,"There were errors in your configuration:");
+				WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag);
+			}
+			else
+			{
+				WriteOpers("There were errors in the configuration file:");
+				WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+			}
+		}
+		return false;
+	}
+	if (count < 1)
+	{
+		if (bail)
+		{
+			printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
+			Exit(0);
+		}
+		else
+		{
+			if (user)
+			{
+				WriteServ(user->fd,"There were errors in your configuration:");
+				WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag);
+			}
+			else
+			{
+				WriteOpers("There were errors in the configuration file:");
+				WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+			}
+		}
+		return false;
+	}
+	return true;
+}
+
+bool NoValidation(const char* tag, const char* value, void* data)
+{
+	log(DEBUG,"No validation for <%s:%s>",tag,value);
+	return true;
+}
+
+bool ValidateTempDir(const char* tag, const char* value, void* data)
+{
+	char* x = (char*)data;
+	if (!*x)
+		strlcpy(x,"/tmp",1024);
+	return true;
+}
+ 
+bool ValidateMaxTargets(const char* tag, const char* value, void* data)
+{
+	int* x = (int*)data;
+	if ((*x < 0) || (*x > 31))
+	{
+		log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+		*x = 20;
+	}
+	return true;
+}
+
+bool ValidateSoftLimit(const char* tag, const char* value, void* 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;
+	}
+	return true;
+}
+
+bool ValidateMaxConn(const char* tag, const char* value, void* 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(const char* tag, const char* value, void* data)
+{
+	int* x = (int*)data;
+	if (!*x)
+		*x = 5;
+	return true;
+}
+
+bool ValidateDnsServer(const char* tag, const char* value, void* data)
+{
+	char* x = (char*)data;
+	if (!*x)
+	{
+		// attempt to look up their nameserver from /etc/resolv.conf
+		log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+		ifstream resolv("/etc/resolv.conf");
+		std::string nameserver;
+		bool found_server = false;
+
+		if (resolv.is_open())
+		{
+			while (resolv >> nameserver)
+			{
+				if ((nameserver == "nameserver") && (!found_server))
+				{
+					resolv >> nameserver;
+					strlcpy(x,nameserver.c_str(),MAXBUF);
+					found_server = true;
+					log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+				}
+			}
+
+			if (!found_server)
+			{
+				log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+				strlcpy(x,"127.0.0.1",MAXBUF);
+			}
+		}
+		else
+		{
+			log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+			strlcpy(x,"127.0.0.1",MAXBUF);
+		}
+	}
+	return true;
+}
+
+bool ValidateModPath(const char* tag, const char* value, void* data)
+{
+	char* x = (char*)data;	
+	if (!*x)
+		strlcpy(x,MOD_PATH,MAXBUF);
+	return true;
+}
+
+
+bool ValidateServerName(const char* tag, const char* value, void* data)
+{
+	char* x = (char*)data;
+	if (!strchr(x,'.'))
+	{
+		log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.');
+		charlcat(x,'.',MAXBUF);
+	}
+	//strlower(x);
+	return true;
+}
+
+bool ValidateNetBufferSize(const char* tag, const char* value, void* data)
+{
+	if ((!Config->NetBufferSize) || (Config->NetBufferSize > 65535) || (Config->NetBufferSize < 1024))
+	{
+		log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+		Config->NetBufferSize = 10240;
+	}
+	return true;
+}
+
+bool ValidateMaxWho(const char* tag, const char* value, void* data)
+{
+	if ((!Config->MaxWhoResults) || (Config->MaxWhoResults > 65535) || (Config->MaxWhoResults < 1))
+	{
+		log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
+		Config->MaxWhoResults = 128;
+	}
+	return true;
+}
+
+bool ValidateLogLevel(const char* tag, const char* value, void* 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;
+	return true;
+}
+
+bool ValidateMotd(const char* tag, const char* value, void* data)
+{
+	readfile(Config->MOTD,Config->motd);
+	return true;
+}
+
+bool ValidateRules(const char* tag, const char* value, void* data)
+{
+	readfile(Config->RULES,Config->rules);
+	return true;
+}
+
+/* Callback called before processing the first <connect> tag
+ */
+bool InitConnect(const char* tag)
+{
+	log(DEFAULT,"Reading connect classes...");
+	Config->Classes.clear();
+	return true;
+}
+
+/* Callback called to process a single <connect> tag
+ */
+bool DoConnect(const char* tag, char** entries, void** 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];
+
+	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);
+	}
+	else
+	{
+		c.host = deny;
+		c.type = CC_DENY;
+		Config->Classes.push_back(c);
+		log(DEBUG,"Read connect class type DENY, host=%s",deny);
+	}
+
+	return true;
+}
+
+/* Callback called when there are no more <connect> tags
+ */
+bool DoneConnect(const char* tag)
+{
+	log(DEBUG,"DoneConnect called for tag: %s",tag);
+	return true;
+}
+
+/* Callback called before processing the first <uline> tag
+ */
+bool InitULine(const char* tag)
+{
+	Config->ulines.clear();
+	return true;
+}
+
+/* Callback called to process a single <uline> tag
+ */
+bool DoULine(const char* tag, char** entries, void** values, int* types)
+{
+	char* server = (char*)values[0];
+	log(DEBUG,"Read ULINE '%s'",server);
+	Config->ulines.push_back(server);
+	return true;
+}
+
+/* Callback called when there are no more <uline> tags
+ */
+bool DoneULine(const char* tag)
+{
+	return true;
+}
+
+/* Callback called before processing the first <module> tag
+ */
+bool InitModule(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++)
+	{
+		old_module_names.push_back(*t);
+	}
+	return true;
+}
+
+/* Callback called to process a single <module> tag
+ */
+bool DoModule(const char* tag, char** entries, void** values, int* types)
+{
+	char* modname = (char*)values[0];
+	new_module_names.push_back(modname);
+	return true;
+}
+
+/* Callback called when there are no more <module> tags
+ */
+bool DoneModule(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
+	for (std::vector<std::string>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
+	{
+		bool added = true;
+
+		for (std::vector<std::string>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
+		{
+			if (*old == *_new)
+				added = false;
+		}
+
+		if (added)
+			added_modules.push_back(*_new);
+	}
+
+	for (std::vector<std::string>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
+	{
+		bool removed = true;
+		for (std::vector<std::string>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
+		{
+			if (*newm == *oldm)
+				removed = false;
+		}
+
+		if (removed)
+			removed_modules.push_back(*oldm);
+	}
+	return true;
+}
+
+/* Callback called before processing the first <banlist> tag
+ */
+bool InitMaxBans(const char* tag)
+{
+	Config->maxbans.clear();
+	return true;
+}
+
+/* Callback called to process a single <banlist> tag
+ */
+bool DoMaxBans(const char* tag, char** entries, void** values, int* types)
+{
+	char* channel = (char*)values[0];
+	int* limit = (int*)values[1];
+	Config->maxbans[channel] = *limit;
+	return true;
+}
+
+/* Callback called when there are no more <banlist> tags.
+ */
+bool DoneMaxBans(const char* tag)
+{
+	return true;
+}
+
+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 */
+	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 };
+
+	/* 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},
+		{"pid",			"file",				&this->PID,			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[] = {
+
+		{"connect",
+				{"allow",	"deny",		"password",	"timeout",	"pingfreq",	"flood",
+				"threshold",	"sendq",	"recvq",	"localmax",	"globalmax",	NULL},
+				{DT_CHARPTR,	DT_CHARPTR,	DT_CHARPTR,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
+				 DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER},
+				InitConnect, DoConnect, DoneConnect},
+
+		{"uline",
+				{"server",	NULL},
+				{DT_CHARPTR},
+				InitULine,DoULine,DoneULine},
+
+		{"banlist",
+				{"chan",	"limit",	NULL},
+				{DT_CHARPTR,	DT_INTEGER},
+				InitMaxBans, DoMaxBans, DoneMaxBans},
+
+		{"module",
+				{"name",	NULL},
+				{DT_CHARPTR},
+				InitModule, DoModule, DoneModule},
+
+		{"badip",
+				{"reason",	"ipmask",	NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoZLine, DoneXLine},
+
+		{"badnick",
+				{"reason",	"nick",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoQLine, DoneXLine},
+
+		{"badhost",
+				{"reason",	"host",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoKLine, DoneXLine},
+
+		{"exception",
+				{"reason",	"host",		NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitXLine, DoELine, DoneXLine},
+
+		{"type",
+				{"name",	"classes",	NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitTypes, DoType, DoneClassesAndTypes},
+
+		{"class",
+				{"name",	"commands",	NULL},
+				{DT_CHARPTR,	DT_CHARPTR},
+				InitClasses, DoClass, DoneClassesAndTypes},
+
+		{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 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;
+		}
+ */	}
+	else
+	{
+		log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str());
+
+		if (bail)
+		{
+			/* Unneeded because of the log() aboive? */
+			printf("There were errors in your configuration:\n%s",errstr.str().c_str());
+			Exit(0);
+		}
+		else
+		{
+			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)
+			{
+				WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
+				
+				while(start < errors.length())
+				{
+					WriteServ(user->fd, "NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
+					start += 510 - prefixlen;
+				}
+			}
+			else
+			{
+				WriteOpers("There were errors in the configuration file:");
+				
+				while(start < errors.length())
+				{
+					WriteOpers(errors.substr(start, 360).c_str());
+					start += 360;
+				}
+			}
+
+			return;
+		}
+	}
+
+	/* 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)
+		{
+			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);
+
+		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++)
+			{
+				ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, data[valuenum], MAXBUF);
+
+				switch (MultiValues[Index].datatype[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;
+				}
+			}
+			MultiValues[Index].validation_function(MultiValues[Index].tag, (char**)MultiValues[Index].items, ptr, MultiValues[Index].datatype);
+		}
+
+		MultiValues[Index].finish_function(MultiValues[Index].tag);
+	}
+
+	/* Free any memory we claimed
+	 */
+	for (int n = 0; n < 12; n++)
+		delete[] data[n];
+
+	// write once here, to try it out and make sure its ok
+	WritePID(Config->PID);
+
+	log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
+
+	/* If we're rehashing, let's load any new modules, and unload old ones
+	 */
+	if (!bail)
+	{
+		ServerInstance->stats->BoundPortCount = BindPorts(false);
+
+		if (!removed_modules.empty())
+			for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+			{
+				if (ServerInstance->UnloadModule(removing->c_str()))
+				{
+					WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+
+					if (user)
+						WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+
+					rem++;
+				}
+				else
+				{
+					if (user)
+						WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+				}
+			}
+
+		if (!added_modules.empty())
+		for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+		{
+			if (ServerInstance->LoadModule(adding->c_str()))
+			{
+				WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+
+				if (user)
+					WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+
+				add++;
+			}
+			else
+			{
+				if (user)
+					WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+			}
+		}
+
+		log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
+	}
+}
+
+bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream)
+{
+	std::ifstream conf(filename);
+	std::string line;
+	char ch;
+	long linenumber;
+	bool in_tag;
+	bool in_quote;
+	bool in_comment;
+	
+	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])
+		{
+			errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl;
+			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))
+	{
+		/*
+		 * Here we try and get individual tags on separate lines,
+		 * this would be so easy if we just made people format
+		 * their config files like that, but they don't so...
+		 * We check for a '<' and then know the line is over when
+		 * we get a '>' not inside quotes. If we find two '<' and
+		 * no '>' then die with an error.
+		 */
+		
+		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)
+		{
+			case '\n':
+				linenumber++;
+			case '\r':
+				in_comment = false;
+			case '\0':
+				continue;
+			case '\t':
+				ch = ' ';
+		}
+		
+		if(in_comment)
+			continue;
+		
+		line += ch;
+		
+		if(ch == '<')
+		{
+			if(in_tag)
+			{
+				if(!in_quote)
+				{
+					errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
+					return false;
+				}
+			}
+			else
+			{
+				if(in_quote)
+				{
+					errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
+					return false;
+				}
+				else
+				{
+					// errorstream << "Opening new config tag on line " << linenumber << std::endl;
+					in_tag = true;
+				}
+			}
+		}
+		else if(ch == '"')
+		{
+			if(in_tag)
+			{
+				if(in_quote)
+				{
+					// errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
+					in_quote = false;
+				}
+				else
+				{
+					// errorstream << "Opening quote in config tag on line " << linenumber << std::endl;
+					in_quote = true;
+				}
+			}
+			else
+			{
+				if(in_quote)
+				{
+					errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl;
+				}
+				else
+				{
+					errorstream << "Found a (opening) \" outside a tag: " << filename << ":" << linenumber << std::endl;
+				}
+			}
+		}
+		else if(ch == '>')
+		{
+			if(!in_quote)
+			{
+				if(in_tag)
+				{
+					// errorstream << "Closing config tag on line " << linenumber << std::endl;
+					in_tag = false;
+
+					/*
+					 * 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))
+						return false;
+					
+					line.clear();
+				}
+				else
+				{
+					errorstream << "Got a closing > when we weren't inside a tag: " << filename << ":" << linenumber << std::endl;
+					return false;
+				}
+			}
+		}
+	}
+	
+	return true;
+}
+
+bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream)
+{
+	return this->LoadConf(target, filename.c_str(), errorstream);
+}
+
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream)
+{
+	std::string tagname;
+	std::string current_key;
+	std::string current_value;
+	KeyValList results;
+	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)
+		{
+			/* We don't know the tag name yet. */
+			
+			if(*c != ' ')
+			{
+				if(*c != '<')
+				{
+					tagname += *c;
+				}
+			}
+			else
+			{
+				/* We got to a space, we should have the tagname now. */
+				if(tagname.length())
+				{
+					got_name = true;
+				}
+			}
+		}
+		else
+		{
+			/* We have the tag name */
+			if(!got_key)
+			{
+				/* We're still reading the key name */
+				if(*c != '=')
+				{
+					if(*c != ' ')
+					{
+						current_key += *c;
+					}
+				}
+				else
+				{
+					/* We got an '=', end of the key name. */
+					got_key = true;
+				}
+			}
+			else
+			{
+				/* We have the key name, now we're looking for quotes and the value */
+				if(*c == '"')
+				{
+					if(!in_quote)
+					{
+						/* We're not already in a quote. */
+						in_quote = true;
+					}
+					else
+					{
+						/* 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(!this->DoInclude(target, current_value, errorstream))
+								return false;
+						}
+						
+						current_key.clear();
+						current_value.clear();
+					}
+				}
+				else
+				{
+					if(in_quote)
+					{
+						current_value += *c;
+					}
+				}
+			}
+		}
+	}
+	
+	/* Finished parsing the tag, add it to the config hash */
+	target.insert(std::pair<std::string, KeyValList > (tagname, results));
+	
+	return true;
+}
+
+bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream)
+{
+	std::string confpath;
+	std::string newfile;
+	std::string::size_type pos;
+	
+	confpath = CONFIG_FILE;
+	newfile = file;
+	
+	for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
+	{
+		if (*c == '\\')
+		{
+			*c = '/';
+		}
+	}
+
+	if (file[0] != '/')
+	{
+		if((pos = confpath.find("/inspircd.conf")) != 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;
+			return false;
+		}
+	}
+	
+	return LoadConf(target, newfile, errorstream);
+}
+
+bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length)
+{
+	std::string value;
+	bool r = ConfValue(target, std::string(tag), std::string(var), index, value);
+	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)
+{
+	ConfigDataHash::size_type pos = index;
+	if((pos >= 0) && (pos < target.count(tag)))
+	{
+		ConfigDataHash::const_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++)
+		{
+			if(j->first == var)
+			{
+				result = j->second;
+				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());
+	}
+	
+	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);
+}
+
+bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result)
+{
+	std::string value;
+	std::istringstream stream;
+	bool r = ConfValue(target, tag, var, index, value);
+	stream.str(value);
+	if(!(stream >> result))
+		return false;
+	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);
+}
+
+bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index)
+{
+	std::string result;
+	if(!ConfValue(target, tag, var, index, result))
+		return false;
+	
+	return ((result == "yes") || (result == "true") || (result == "1"));
+}
+	
+int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
+{
+	return target.count(tag);
+}
+
+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);
+}
+
+int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index)
+{
+	ConfigDataHash::size_type pos = index;
+	
+	if((pos >= 0) && (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;
+}
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
new file mode 100644
index 000000000..8177a3182
--- /dev/null
+++ b/src/inspsocket.cpp
@@ -0,0 +1,421 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd_config.h"
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <string>
+#include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <sstream>
+#include <iostream>
+#include <fstream>
+#include <stdexcept>
+#include "socket.h"
+#include "inspircd.h"
+#include "configreader.h"
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "socketengine.h"
+
+
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
+extern time_t TIME;
+
+InspSocket* socket_ref[MAX_DESCRIPTORS];
+
+InspSocket::InspSocket()
+{
+	this->state = I_DISCONNECTED;
+	this->fd = -1;
+	this->ClosePending = false;
+}
+
+InspSocket::InspSocket(int newfd, char* ip)
+{
+	this->fd = newfd;
+	this->state = I_CONNECTED;
+	strlcpy(this->IP,ip,MAXBUF);
+	this->ClosePending = false;
+	ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+	socket_ref[this->fd] = this;
+}
+
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
+{
+	strlcpy(host,ahost.c_str(),MAXBUF);
+	this->ClosePending = false;
+	if (listening) {
+		if ((this->fd = OpenTCPSocket()) == ERROR)
+		{
+			this->fd = -1;
+			this->state = I_ERROR;
+			this->OnError(I_ERR_SOCKET);
+			this->ClosePending = true;
+			log(DEBUG,"OpenTCPSocket() error");
+			return;
+		}
+		else
+		{
+			if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
+			{
+				this->Close();
+				this->fd = -1;
+				this->state = I_ERROR;
+				this->OnError(I_ERR_BIND);
+				this->ClosePending = true;
+				log(DEBUG,"BindSocket() error %s",strerror(errno));
+				return;
+			}
+			else
+			{
+				this->state = I_LISTENING;
+				ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+				socket_ref[this->fd] = this;
+				log(DEBUG,"New socket now in I_LISTENING state");
+				return;
+			}
+		}			
+	}
+	else
+	{
+		strlcpy(this->host,ahost.c_str(),MAXBUF);
+		this->port = aport;
+
+		if (!inet_aton(host,&addy))
+		{
+			log(DEBUG,"Attempting to resolve %s",this->host);
+			/* Its not an ip, spawn the resolver */
+			this->dns.SetNS(std::string(Config->DNSServer));
+			this->dns.ForwardLookupWithFD(host,fd);
+			timeout_end = time(NULL) + maxtime;
+			timeout = false;
+			this->state = I_RESOLVING;
+			socket_ref[this->fd] = this;
+		}
+		else
+		{
+			log(DEBUG,"No need to resolve %s",this->host);
+			strlcpy(this->IP,host,MAXBUF);
+			timeout_end = time(NULL) + maxtime;
+			this->DoConnect();
+		}
+	}
+}
+
+void InspSocket::SetQueues(int nfd)
+{
+	// attempt to increase socket sendq and recvq as high as its possible
+	int sendbuf = 32768;
+	int recvbuf = 32768;
+	setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf));
+	setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
+}
+
+bool InspSocket::DoResolve()
+{
+	log(DEBUG,"In DoResolve(), trying to resolve IP");
+	if (this->dns.HasResult())
+	{
+		log(DEBUG,"Socket has result");
+		std::string res_ip = dns.GetResultIP();
+		if (res_ip != "")
+		{
+			log(DEBUG,"Socket result set to %s",res_ip.c_str());
+			strlcpy(this->IP,res_ip.c_str(),MAXBUF);
+			socket_ref[this->fd] = NULL;
+		}
+		else
+		{
+			log(DEBUG,"Socket DNS failure");
+			this->Close();
+			this->state = I_ERROR;
+			this->OnError(I_ERR_RESOLVE);
+			this->fd = -1;
+			this->ClosePending = true;
+			return false;
+		}
+		return this->DoConnect();
+	}
+	log(DEBUG,"No result for socket yet!");
+	return true;
+}
+
+bool InspSocket::DoConnect()
+{
+	log(DEBUG,"In DoConnect()");
+	if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+	{
+		log(DEBUG,"Cant socket()");
+		this->state = I_ERROR;
+		this->OnError(I_ERR_SOCKET);
+		this->fd = -1;
+		return false;
+	}
+
+	log(DEBUG,"Part 2 DoConnect() %s",this->IP);
+	inet_aton(this->IP,&addy);
+	addr.sin_family = AF_INET;
+	addr.sin_addr = addy;
+	addr.sin_port = htons(this->port);
+
+	int flags;
+	flags = fcntl(this->fd, F_GETFL, 0);
+	fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+
+	if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+	{
+		if (errno != EINPROGRESS)
+		{
+			log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
+			this->OnError(I_ERR_CONNECT);
+			this->Close();
+			this->state = I_ERROR;
+			this->fd = -1;
+			this->ClosePending = true;
+			return false;
+		}
+	}
+	this->state = I_CONNECTING;
+	ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+	socket_ref[this->fd] = this;
+	this->SetQueues(this->fd);
+	log(DEBUG,"Returning true from InspSocket::DoConnect");
+	return true;
+}
+
+
+void InspSocket::Close()
+{
+	if (this->fd != -1)
+	{
+		this->OnClose();
+		shutdown(this->fd,2);
+		close(this->fd);
+		socket_ref[this->fd] = NULL;
+		this->ClosePending = true;
+		this->fd = -1;
+	}
+}
+
+std::string InspSocket::GetIP()
+{
+	return this->IP;
+}
+
+char* InspSocket::Read()
+{
+	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+		return NULL;
+	int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
+	if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
+	{
+		ibuf[n] = 0;
+		return ibuf;
+	}
+	else
+	{
+		if (errno == EAGAIN)
+		{
+			return "";
+		}
+		else
+		{
+			log(DEBUG,"EOF or error on socket: %s",strerror(errno));
+			return NULL;
+		}
+	}
+}
+
+void InspSocket::MarkAsClosed()
+{
+	log(DEBUG,"Marked as closed");
+	this->ClosePending = true;
+}
+
+// There are two possible outcomes to this function.
+// It will either write all of the data, or an undefined amount.
+// If an undefined amount is written the connection has failed
+// and should be aborted.
+int InspSocket::Write(const std::string &data)
+{
+	if (this->ClosePending)
+		return false;
+
+	/*int result = write(this->fd,data.c_str(),data.length());
+	if (result < 1)
+		return false;
+	return true;*/
+
+	/* Try and append the data to the back of the queue, and send it on its way
+	 */
+	outbuffer.push_back(data);
+	return (!this->FlushWriteBuffer());
+}
+
+bool InspSocket::FlushWriteBuffer()
+{
+	if (this->ClosePending)
+		return true;
+
+	if ((this->fd > -1) && (this->state == I_CONNECTED))
+	{
+		if (outbuffer.size())
+		{
+			int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+			if (result > 0)
+			{
+				if ((unsigned int)result == outbuffer[0].length())
+				{
+					/* The whole block was written (usually a line)
+					 * Pop the block off the front of the queue
+					 */
+					outbuffer.pop_front();
+				}
+				else
+				{
+					std::string temp = outbuffer[0].substr(result);
+					outbuffer[0] = temp;
+				}
+			}
+			else if ((result == -1) && (errno != EAGAIN))
+			{
+				log(DEBUG,"Write error on socket: %s",strerror(errno));
+				this->OnError(I_ERR_WRITE);
+				this->state = I_ERROR;
+				this->ClosePending = true;
+				return true;
+			}
+		}
+	}
+	return (fd < 0);
+}
+
+bool InspSocket::Timeout(time_t current)
+{
+	if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+	{
+		log(DEBUG,"No FD or socket ref");
+		return false;
+	}
+
+	if (this->ClosePending)
+	{
+		log(DEBUG,"Close is pending");
+		return true;
+	}
+
+	if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
+	{
+		log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
+		// for non-listening sockets, the timeout can occur
+		// which causes termination of the connection after
+		// the given number of seconds without a successful
+		// connection.
+		this->OnTimeout();
+		this->OnError(I_ERR_TIMEOUT);
+		timeout = true;
+		this->state = I_ERROR;
+		this->ClosePending = true;
+		return true;
+	}
+	return this->FlushWriteBuffer();
+}
+
+bool InspSocket::Poll()
+{
+	if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+		return false;
+
+	int incoming = -1;
+	bool n = true;
+
+	if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
+		return false;
+
+	switch (this->state)
+	{
+		case I_RESOLVING:
+			log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
+			return this->DoResolve();
+		break;
+		case I_CONNECTING:
+			log(DEBUG,"State = I_CONNECTING");
+			this->SetState(I_CONNECTED);
+			/* Our socket was in write-state, so delete it and re-add it
+			 * in read-state.
+			 */
+			ServerInstance->SE->DelFd(this->fd);
+			ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+			return this->OnConnected();
+		break;
+		case I_LISTENING:
+			length = sizeof (client);
+			incoming = accept (this->fd, (sockaddr*)&client,&length);
+			this->SetQueues(incoming);
+			this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
+			return true;
+		break;
+		case I_CONNECTED:
+			n = this->OnDataReady();
+			/* Flush any pending, but not till after theyre done with the event
+			 * so there are less write calls involved.
+			 * Both FlushWriteBuffer AND the return result of OnDataReady must
+			 * return true for this to be ok.
+			 */
+			if (this->FlushWriteBuffer())
+				return false;
+			return n;
+		break;
+		default:
+		break;
+	}
+	return true;
+}
+
+void InspSocket::SetState(InspSocketState s)
+{
+	log(DEBUG,"Socket state change");
+	this->state = s;
+}
+
+InspSocketState InspSocket::GetState()
+{
+	return this->state;
+}
+
+int InspSocket::GetFd()
+{
+	return this->fd;
+}
+
+bool InspSocket::OnConnected() { return true; }
+void InspSocket::OnError(InspSocketError e) { return; }
+int InspSocket::OnDisconnect() { return 0; }
+int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
+bool InspSocket::OnDataReady() { return true; }
+void InspSocket::OnTimeout() { return; }
+void InspSocket::OnClose() { return; }
+
+InspSocket::~InspSocket()
+{
+	this->Close();
+}