X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=2a9139643bc2af93bac601816d0e1048bbac7404;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=72b2d79a5a0e0d3674c682dcdf5d53ab3314d8ef;hpb=869f115d7f427847ab85b7738905aa3bcccd57d2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 72b2d79a5..6087f4d1c 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,101 +2,45 @@
  *       | 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "channels.h"
-#include "users.h"
+/* $Core */
+
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "cull_list.h"
-
-irc::whowas::whowas_users whowas;
-static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
-
-typedef std::map<irc::string,char*> opertype_t;
-typedef opertype_t operclass_t;
-
-opertype_t opertypes;
-operclass_t operclass;
+#include "bancache.h"
+#include "commands/cmd_whowas.h"
 
 /* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 0;
-
-bool InitTypes(ServerConfig* conf, const char* tag)
-{
-	for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
-	{
-		if (n->second)
-			delete[] n->second;
-	}
-	
-	opertypes.clear();
-	return true;
-}
+unsigned long uniq_id = 1;
 
-bool InitClasses(ServerConfig* conf, const char* tag)
-{
-	for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
-	{
-		if (n->second)
-			delete[] n->second;
-	}
-	
-	operclass.clear();
-	return true;
-}
+static unsigned long* already_sent = NULL;
 
-bool DoType(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
-	char* TypeName = (char*)values[0];
-	char* Classes = (char*)values[1];
-	
-	opertypes[TypeName] = strdup(Classes);
-	conf->GetInstance()->Log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
-	return true;
-}
 
-bool DoClass(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+void InitializeAlreadySent(SocketEngine* SE)
 {
-	char* ClassName = (char*)values[0];
-	char* CommandList = (char*)values[1];
-	
-	operclass[ClassName] = strdup(CommandList);
-	conf->GetInstance()->Log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
-	return true;
+	already_sent = new unsigned long[SE->GetMaxFds()];
+	memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
 }
 
-bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
-{
-	return true;
-}
 
-std::string userrec::ProcessNoticeMasks(const char *sm)
+std::string User::ProcessNoticeMasks(const char *sm)
 {
 	bool adding = true, oldadding = false;
 	const char *c = sm;
 	std::string output;
 
-	ServerInstance->Log(DEBUG,"Process notice masks");
-
 	while (c && *c)
 	{
-		ServerInstance->Log(DEBUG,"Process notice mask %c",*c);
-		
 		switch (*c)
 		{
 			case '+':
@@ -105,6 +49,24 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
 			case '-':
 				adding = false;
 			break;
+			case '*':
+				for (unsigned char d = 'A'; d <= 'z'; d++)
+				{
+					if (ServerInstance->SNO->IsEnabled(d))
+					{
+						if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
+						{
+							if ((oldadding != adding) || (!output.length()))
+								output += (adding ? '+' : '-');
+
+							this->SetNoticeMask(d, adding);
+
+							output += d;
+						}
+					}
+					oldadding = adding;
+				}
+			break;
 			default:
 				if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
 				{
@@ -118,6 +80,9 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
 						output += *c;
 					}
 				}
+				else
+					this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
+
 				oldadding = adding;
 			break;
 		}
@@ -125,106 +90,49 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
 		*c++;
 	}
 
+	std::string s = this->FormatNoticeMasks();
+	if (s.length() == 0)
+	{
+		this->modes[UM_SNOMASK] = false;
+	}
+
 	return output;
 }
 
-void userrec::StartDNSLookup()
+void User::StartDNSLookup()
 {
-	ServerInstance->Log(DEBUG,"Commencing reverse lookup");
 	try
 	{
-		ServerInstance->Log(DEBUG,"Passing instance: %08x",this->ServerInstance);
-		res_reverse = new UserResolver(this->ServerInstance, this, this->GetIPString(), false);
-		this->ServerInstance->AddResolver(res_reverse);
-	}
-	catch (ModuleException& e)
-	{
-		ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
-	}
-}
+		bool cached = false;
+		const char* sip = this->GetIPString();
+		UserResolver *res_reverse;
 
-UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, bool forward) :
-	Resolver(Instance, to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user)
-{
-	this->fwd = forward;
-	this->bound_fd = user->GetFd();
-}
+		QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
+		res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached);
 
-void UserResolver::OnLookupComplete(const std::string &result)
-{
-	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
-	{
-		ServerInstance->Log(DEBUG,"Commencing forward lookup");
-		this->bound_user->stored_host = result;
-		try
-		{
-			/* Check we didnt time out */
-			if (this->bound_user->registered != REG_ALL)
-			{
-				bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, true);
-				this->ServerInstance->AddResolver(bound_user->res_forward);
-			}
-		}
-		catch (ModuleException& e)
-		{
-			ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
-		}
-	}
-	else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
-	{
-		/* Both lookups completed */
-		if (this->bound_user->GetIPString() == result)
-		{
-			std::string hostname = this->bound_user->stored_host;
-			if (hostname.length() < 65)
-			{
-				/* Check we didnt time out */
-				if (this->bound_user->registered != REG_ALL)
-				{
-					/* Hostnames starting with : are not a good thing (tm) */
-					if (*(hostname.c_str()) == ':')
-						hostname = "0" + hostname;
-
-					this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)", hostname.c_str());
-					this->bound_user->dns_done = true;
-					strlcpy(this->bound_user->dhost, hostname.c_str(),64);
-					strlcpy(this->bound_user->host, hostname.c_str(),64);
-				}
-			}
-			else
-			{
-				this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString());
-			}
-		}
-		else
-		{
-			this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString());
-		}
+		this->ServerInstance->AddResolver(res_reverse, cached);
 	}
-}
-
-void UserResolver::OnError(ResolverError e, const std::string &errormessage)
-{
-	if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
+	catch (CoreException& e)
 	{
-		/* Error message here */
-		this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
-		this->bound_user->dns_done = true;
+		ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason());
 	}
 }
 
-
-bool userrec::IsNoticeMaskSet(unsigned char sm)
+bool User::IsNoticeMaskSet(unsigned char sm)
 {
+	if (!isalpha(sm))
+		return false;
 	return (snomasks[sm-65]);
 }
 
-void userrec::SetNoticeMask(unsigned char sm, bool value)
+void User::SetNoticeMask(unsigned char sm, bool value)
 {
+	if (!isalpha(sm))
+		return;
 	snomasks[sm-65] = value;
 }
 
-const char* userrec::FormatNoticeMasks()
+const char* User::FormatNoticeMasks()
 {
 	static char data[MAXBUF];
 	int offset = 0;
@@ -239,210 +147,335 @@ const char* userrec::FormatNoticeMasks()
 	return data;
 }
 
-
-
-bool userrec::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m)
 {
+	if (!isalpha(m))
+		return false;
 	return (modes[m-65]);
 }
 
-void userrec::SetMode(unsigned char m, bool value)
+void User::SetMode(unsigned char m, bool value)
 {
+	if (!isalpha(m))
+		return;
 	modes[m-65] = value;
 }
 
-const char* userrec::FormatModes()
+const char* User::FormatModes(bool showparameters)
 {
 	static char data[MAXBUF];
+	std::string params;
 	int offset = 0;
-	for (int n = 0; n < 64; n++)
+
+	for (unsigned char n = 0; n < 64; n++)
 	{
 		if (modes[n])
-			data[offset++] = n+65;
+		{
+			data[offset++] = n + 65;
+			ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+			if (showparameters && mh && mh->GetNumParams(true))
+			{
+				std::string p = mh->GetUserParameter(this);
+				if (p.length())
+					params.append(" ").append(p);
+			}
+		}
 	}
 	data[offset] = 0;
+	strlcat(data, params.c_str(), MAXBUF);
 	return data;
 }
 
-userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
+void User::DecrementModes()
+{
+	ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
+	for (unsigned char n = 'A'; n <= 'z'; n++)
+	{
+		if (modes[n-65])
+		{
+			ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
+			ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
+			if (mh)
+			{
+				ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
+				mh->ChangeCount(-1);
+			}
+		}
+	}
+}
+
+User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
-	ServerInstance->Log(DEBUG,"userrec::userrec(): Instance: %08x",ServerInstance);
-	// the PROPER way to do it, AVOID bzero at *ALL* costs
-	*password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
-	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-	reset_due = ServerInstance->Time();
-	lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
-	ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-	haspassed = dns_done = false;
+	server = Instance->FindServerNamePtr(Instance->Config->ServerName);
+	age = ServerInstance->Time();
+	Penalty = 0;
+	lastping = signon = idle_lastmsg = nping = registered = 0;
+	bytes_in = bytes_out = cmds_in = cmds_out = 0;
+	quietquit = quitting = exempt = haspassed = dns_done = false;
 	fd = -1;
-	recvq = "";
-	sendq = "";
-	WriteError = "";
-	res_forward = res_reverse = NULL;
-	ip = NULL;
+	server_sa.sa.sa_family = AF_UNSPEC;
+	client_sa.sa.sa_family = AF_UNSPEC;
+	recvq.clear();
+	sendq.clear();
+	Visibility = NULL;
+	MyClass = NULL;
+	AllowedPrivs = AllowedOperCommands = NULL;
 	chans.clear();
 	invites.clear();
-	chans.resize(MAXCHANS);
-	memset(modes,0,sizeof(modes));
-	memset(snomasks,0,sizeof(snomasks));
-	
-	for (unsigned int n = 0; n < MAXCHANS; n++)
-	{
-		ucrec* x = new ucrec();
-		chans[n] = x;
-		x->channel = NULL;
-		x->uc_modes = 0;
-	}
+
+	if (uid.empty())
+		uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
+	else
+		uuid.assign(uid, 0, UUID_LENGTH - 1);
+
+	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), uid.empty() ? "allocated new" : "used remote");
+
+	user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
+	if (finduuid == Instance->Users->uuidlist->end())
+		(*Instance->Users->uuidlist)[uuid] = this;
+	else
+		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
-userrec::~userrec()
+User::~User()
 {
-	for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+	/* NULL for remote users :) */
+	if (this->MyClass)
 	{
-		ucrec* x = (ucrec*)*n;
-		delete x;
+		this->MyClass->RefCount--;
+		ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount);
+		if (MyClass->RefCount == 0)
+			delete MyClass;
 	}
 
-	if (ip)
+	if (this->AllowedOperCommands)
 	{
-		if (this->GetProtocolFamily() == AF_INET)
-		{
-			delete (sockaddr_in*)ip;
-		}
-#ifdef SUPPORT_IP6LINKS
-		else
-		{
-			delete (sockaddr_in6*)ip;
-		}
-#endif
+		delete AllowedOperCommands;
+		AllowedOperCommands = NULL;
+	}
+
+	if (this->AllowedPrivs)
+	{
+		delete AllowedPrivs;
+		AllowedPrivs = NULL;
 	}
+
+	this->InvalidateCache();
+	this->DecrementModes();
+
+	if (client_sa.sa.sa_family != AF_UNSPEC)
+		ServerInstance->Users->RemoveCloneCounts(this);
+
+	ServerInstance->Users->uuidlist->erase(uuid);
 }
 
-/* XXX - minor point, other *Host functions return a char *, this one creates it. Might be nice to be consistant? */
-void userrec::MakeHost(char* nhost)
+const std::string& User::MakeHost()
 {
+	if (!this->cached_makehost.empty())
+		return this->cached_makehost;
+
+	char nhost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = nhost;
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
+
+	this->cached_makehost.assign(nhost);
+
+	return this->cached_makehost;
+}
+
+const std::string& User::MakeHostIP()
+{
+	if (!this->cached_hostip.empty())
+		return this->cached_hostip;
+
+	char ihost[MAXBUF];
+	/* This is much faster than snprintf */
+	char* t = ihost;
+	for(const char* n = ident.c_str(); *n; n++)
+		*t++ = *n;
+	*t++ = '@';
+	for(const char* n = this->GetIPString(); *n; n++)
+		*t++ = *n;
+	*t = 0;
+
+	this->cached_hostip = ihost;
+
+	return this->cached_hostip;
 }
 
-void userrec::CloseSocket()
+void User::CloseSocket()
 {
-	shutdown(this->fd,2);
-	close(this->fd);
+	if (this->fd > -1)
+	{
+		ServerInstance->SE->Shutdown(this, 2);
+		ServerInstance->SE->Close(this);
+	}
 }
- 
-char* userrec::GetFullHost()
+
+const std::string User::GetFullHost()
 {
-	static char result[MAXBUF];
+	if (!this->cached_fullhost.empty())
+		return this->cached_fullhost;
+
+	char result[MAXBUF];
 	char* t = result;
-	for(char* n = nick; *n; n++)
+	for(const char* n = nick.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '!';
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = dhost; *n; n++)
+	for(const char* n = dhost.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return result;
+
+	this->cached_fullhost = result;
+
+	return this->cached_fullhost;
 }
 
-char* userrec::MakeWildHost()
+char* User::MakeWildHost()
 {
 	static char nresult[MAXBUF];
 	char* t = nresult;
 	*t++ = '*';	*t++ = '!';
 	*t++ = '*';	*t++ = '@';
-	for(char* n = dhost; *n; n++)
+	for(const char* n = dhost.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 	return nresult;
 }
 
-int userrec::ReadData(void* buffer, size_t size)
+int User::ReadData(void* buffer, size_t size)
 {
 	if (IS_LOCAL(this))
 	{
+#ifndef WIN32
 		return read(this->fd, buffer, size);
+#else
+		return recv(this->fd, (char*)buffer, size, 0);
+#endif
 	}
 	else
 		return 0;
 }
 
 
-char* userrec::GetFullRealHost()
+const std::string User::GetFullRealHost()
 {
-	static char fresult[MAXBUF];
+	if (!this->cached_fullrealhost.empty())
+		return this->cached_fullrealhost;
+
+	char fresult[MAXBUF];
 	char* t = fresult;
-	for(char* n = nick; *n; n++)
+	for(const char* n = nick.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '!';
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
-	return fresult;
+
+	this->cached_fullrealhost = fresult;
+
+	return this->cached_fullrealhost;
 }
 
-bool userrec::IsInvited(irc::string &channel)
+bool User::IsInvited(const irc::string &channel)
 {
-	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+	time_t now = ServerInstance->Time();
+	InvitedList::iterator safei;
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
 	{
-		irc::string compare = i->channel;
-		
-		if (compare == channel)
+		if (channel == i->first)
 		{
+			if (i->second != 0 && now > i->second)
+			{
+				/* Expired invite, remove it. */
+				safei = i;
+				--i;
+				invites.erase(safei);
+				continue;
+			}
 			return true;
 		}
 	}
 	return false;
 }
 
-InvitedList* userrec::GetInviteList()
+InvitedList* User::GetInviteList()
 {
+	time_t now = ServerInstance->Time();
+	/* Weed out expired invites here. */
+	InvitedList::iterator safei;
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+	{
+		if (i->second != 0 && now > i->second)
+		{
+			/* Expired invite, remove it. */
+			safei = i;
+			--i;
+			invites.erase(safei);
+		}
+	}
 	return &invites;
 }
 
-void userrec::InviteTo(irc::string &channel)
+void User::InviteTo(const irc::string &channel, time_t invtimeout)
 {
-	Invited i;
-	i.channel = channel;
-	invites.push_back(i);
+	time_t now = ServerInstance->Time();
+	if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+	{
+		if (channel == i->first)
+		{
+			if (i->second != 0 && invtimeout > i->second)
+			{
+				i->second = invtimeout;
+			}
+
+			return;
+		}
+	}
+	invites.push_back(std::make_pair(channel, invtimeout));
 }
 
-void userrec::RemoveInvite(irc::string &channel)
+void User::RemoveInvite(const irc::string &channel)
 {
-	ServerInstance->Log(DEBUG,"Removing invites");
-	
-	if (invites.size())
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
-		for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+		if (channel == i->first)
 		{
-			irc::string compare = i->channel;
-			
-			if (compare == channel)
-			{
-				invites.erase(i);
-				return;
-       		 	}
-       		}
-       	}
+			invites.erase(i);
+			return;
+	 	}
+	}
+}
+
+bool User::HasModePermission(unsigned char mode, ModeType type)
+{
+	if (!IS_LOCAL(this))
+		return true;
+
+	if (!IS_OPER(this))
+		return false;
+
+	if (mode < 'A' || mode > ('A' + 64)) return false;
+
+	return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
+
 }
 
-bool userrec::HasPermission(const std::string &command)
+bool User::HasPermission(const std::string &command)
 {
-	char* mycmd;
-	char* savept;
-	char* savept2;
-	
 	/*
 	 * users on remote servers can completely bypass all permissions based checks.
 	 * This prevents desyncs when one server has different type/class tags to another.
@@ -452,104 +485,153 @@ bool userrec::HasPermission(const std::string &command)
 	 */
 	if (!IS_LOCAL(this))
 		return true;
-	
+
 	// are they even an oper at all?
-	if (*this->oper)
+	if (!IS_OPER(this))
 	{
-		opertype_t::iterator iter_opertype = opertypes.find(this->oper);
-		if (iter_opertype != opertypes.end())
-		{
-			char* Classes = strdup(iter_opertype->second);
-			char* myclass = strtok_r(Classes," ",&savept);
-			while (myclass)
-			{
-				operclass_t::iterator iter_operclass = operclass.find(myclass);
-				if (iter_operclass != operclass.end())
-				{
-					char* CommandList = strdup(iter_operclass->second);
-					mycmd = strtok_r(CommandList," ",&savept2);
-					while (mycmd)
-					{
-						if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
-						{
-							free(Classes);
-							free(CommandList);
-							return true;
-						}
-						mycmd = strtok_r(NULL," ",&savept2);
-					}
-					free(CommandList);
-				}
-				myclass = strtok_r(NULL," ",&savept);
-			}
-			free(Classes);
-		}
+		return false;
 	}
+
+	if (!AllowedOperCommands)
+		return false;
+
+	if (AllowedOperCommands->find(command) != AllowedOperCommands->end())
+		return true;
+	else if (AllowedOperCommands->find("*") != AllowedOperCommands->end())
+		return true;
+
 	return false;
 }
 
-/** NOTE: We cannot pass a const reference to this method.
- * The string is changed by the workings of the method,
- * so that if we pass const ref, we end up copying it to
- * something we can change anyway. Makes sense to just let
- * the compiler do that copy for us.
- */
-bool userrec::AddBuffer(std::string a)
+
+bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 {
-	try
+	if (!IS_LOCAL(this))
+	{
+		ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
+		return true;
+	}
+
+	if (!IS_OPER(this))
+	{
+		if (noisy)
+			this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
+		return false;
+	}
+
+	if (!AllowedPrivs)
+	{
+		if (noisy)
+			this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
+		return false;
+	}
+
+	if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
+	{
+		return true;
+	}
+	else if (AllowedPrivs->find("*") != AllowedPrivs->end())
 	{
-		std::string::size_type i = a.rfind('\r');
-	
+		return true;
+	}
+
+	if (noisy)
+		this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), this->oper.c_str(), privstr.c_str());
+	return false;
+}
+
+bool User::AddBuffer(const std::string &a)
+{
+	std::string::size_type start = 0;
+	std::string::size_type i = a.find('\r');
+
+	/*
+	 * The old implementation here took a copy, and rfind() on \r, removing as it found them, before
+	 * copying a second time onto the recvq. That's ok, but involves three copies minimum (recv() to buffer,
+	 * buffer to here, here to recvq) - The new method now copies twice (recv() to buffer, buffer to recvq).
+	 *
+	 * We use find() instead of rfind() for clarity, however unlike the old code, our scanning of the string is
+	 * contiguous: as we specify a startpoint, we never see characters we have scanned previously, making this
+	 * marginally faster in cases with a number of \r hidden early on in the buffer.
+	 *
+	 * How it works:
+	 * Start at first pos of string, find first \r, append everything in the chunk (excluding \r) to recvq. Set
+	 * i ahead of the \r, search for next \r, add next chunk to buffer... repeat.
+	 *		-- w00t (7 may, 2008)
+	 */
+	if (i == std::string::npos)
+	{
+		// no \r that we need to dance around, just add to buffer
+		recvq.append(a);
+	}
+	else
+	{
+		// While we can find the end of a chunk to add
 		while (i != std::string::npos)
 		{
-			a.erase(i, 1);
-			i = a.rfind('\r');
+			// Append the chunk that we have
+			recvq.append(a, start, (i - start));
+
+			// Start looking for the next one
+			start = i + 1;
+			i = a.find('\r', start);
 		}
 
-		if (a.length())
-			recvq.append(a);
-		
-		if (recvq.length() > (unsigned)this->recvqmax)
+		if (start != a.length())
 		{
-			this->SetWriteError("RecvQ exceeded");
-			ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
-			return false;
+			/*
+			 * This is here to catch a corner case when we get something like:
+			 * NICK w0
+			 * 0t\r\nU
+			 * SER ...
+			 * in successive calls to us.
+			 *
+			 * Without this conditional, the 'U' on the second case will be dropped,
+			 * which is most *certainly* not the behaviour we want!
+			 *		-- w00t
+			 */
+			recvq.append(a, start, (a.length() - start));
 		}
-	
-		return true;
 	}
 
-	catch (...)
+	if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()");
+		ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
 		return false;
 	}
+
+	return true;
 }
 
-bool userrec::BufferIsReady()
+bool User::BufferIsReady()
 {
 	return (recvq.find('\n') != std::string::npos);
 }
 
-void userrec::ClearBuffer()
+void User::ClearBuffer()
 {
-	recvq = "";
+	recvq.clear();
 }
 
-std::string userrec::GetBuffer()
+std::string User::GetBuffer()
 {
 	try
 	{
-		if (!recvq.length())
+		if (recvq.empty())
 			return "";
-	
+
 		/* Strip any leading \r or \n off the string.
 		 * Usually there are only one or two of these,
 		 * so its is computationally cheap to do.
 		 */
-		while ((*recvq.begin() == '\r') || (*recvq.begin() == '\n'))
-			recvq.erase(recvq.begin());
-	
+		std::string::iterator t = recvq.begin();
+		while (t != recvq.end() && (*t == '\r' || *t == '\n'))
+		{
+			recvq.erase(t);
+			t = recvq.begin();
+		}
+
 		for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
 		{
 			/* Find the first complete line, return it as the
@@ -567,780 +649,550 @@ std::string userrec::GetBuffer()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()");
+		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
 		return "";
 	}
 }
 
-void userrec::AddWriteBuf(const std::string &data)
+void User::AddWriteBuf(const std::string &data)
 {
-	if (*this->GetWriteError())
-		return;
-	
-	if (sendq.length() + data.length() > (unsigned)this->sendqmax)
+	if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
 	{
 		/*
-		 * Fix by brain - Set the error text BEFORE calling writeopers, because
+		 * Fix by brain - Set the error text BEFORE calling, because
 		 * if we dont it'll recursively  call here over and over again trying
 		 * to repeatedly add the text to the sendq!
 		 */
-		this->SetWriteError("SendQ exceeded");
-		ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
+		ServerInstance->Users->QuitUser(this, "SendQ exceeded");
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax());
 		return;
 	}
 
-	try 
-	{
-		if (data.length() > 512)
-		{
-			std::string newdata(data);
-			newdata.resize(510);
-			newdata.append("\r\n");
-			sendq.append(newdata);
-		}
-		else
-		{
-			sendq.append(data);
-		}
-	}
-	catch (...)
-	{
-		this->SetWriteError("SendQ exceeded");
-		ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick);
-	}
+	// We still want to append data to the sendq of a quitting user,
+	// e.g. their ERROR message that says 'closing link'
+
+	if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
+		sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
+	else
+		sendq.append(data);
 }
 
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void userrec::FlushWriteBuf()
+void User::FlushWriteBuf()
 {
-	try
+	if (this->fd == FD_MAGIC_NUMBER)
 	{
-		if (this->fd == FD_MAGIC_NUMBER)
-		{
-			sendq = "";
-		}
-		if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+		sendq.clear();
+		return;
+	}
+
+	if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+	{
+		int old_sendq_length = sendq.length();
+		int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+
+		if (n_sent == -1)
 		{
-			const char* tb = this->sendq.c_str();
-			int n_sent = write(this->fd,tb,this->sendq.length());
-			if (n_sent == -1)
+			if (errno == EAGAIN)
 			{
-				if (errno != EAGAIN)
-					this->SetWriteError(strerror(errno));
+				/* The socket buffer is full. This isnt fatal,
+				 * try again later.
+				 */
+				ServerInstance->SE->WantWrite(this);
 			}
 			else
 			{
-				// advance the queue
-				tb += n_sent;
-				this->sendq = tb;
-				// update the user's stats counters
-				this->bytes_out += n_sent;
-				this->cmds_out++;
+				/* Fatal error, set write error and bail */
+				ServerInstance->Users->QuitUser(this, errno ? strerror(errno) : "Write error");
+				return;
 			}
 		}
-	}
-
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()");
-	}
-}
-
-void userrec::SetWriteError(const std::string &error)
-{
-	try
-	{
-		ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
-		// don't try to set the error twice, its already set take the first string.
-		if (!this->WriteError.length())
+		else
 		{
-			ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
-			this->WriteError = error;
+			/* advance the queue */
+			if (n_sent)
+				this->sendq = this->sendq.substr(n_sent);
+			/* update the user's stats counters */
+			this->bytes_out += n_sent;
+			this->cmds_out++;
+			if (n_sent != old_sendq_length)
+				this->ServerInstance->SE->WantWrite(this);
 		}
 	}
 
-	catch (...)
+	/* note: NOT else if! */
+	if (this->sendq.empty())
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()");
+		FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
 	}
 }
 
-const char* userrec::GetWriteError()
+void User::Oper(const std::string &opertype, const std::string &opername)
 {
-	return this->WriteError.c_str();
-}
+	if (this->IsModeSet('o'))
+		this->UnOper();
 
-void userrec::Oper(const std::string &opertype)
-{
-	try
-	{
-		this->modes[UM_OPERATOR] = 1;
-		this->WriteServ("MODE %s :+o", this->nick);
-		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
-		strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
-		ServerInstance->all_opers.push_back(this);
-		FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
-	}
+	this->modes[UM_OPERATOR] = 1;
+	this->WriteServ("MODE %s :+o", this->nick.c_str());
+	FOREACH_MOD(I_OnOper, OnOper(this, opertype));
 
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::Oper()");
-	}
-}
+	ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), irc::Spacify(opertype.c_str()), opername.c_str());
+	this->WriteNumeric(381, "%s :You are now %s %s", this->nick.c_str(), strchr("aeiouAEIOU", *opertype.c_str()) ? "an" : "a", irc::Spacify(opertype.c_str()));
 
-void userrec::UnOper()
-{
-	try
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
+	this->oper.assign(opertype, 0, 512);
+	ServerInstance->Users->all_opers.push_back(this);
+
+	/*
+	 * This might look like it's in the wrong place.
+	 * It is *not*!
+	 *
+	 * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type.
+	 * -- w00t
+	 */
+	opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
+	if (iter_opertype != ServerInstance->Config->opertypes.end())
 	{
-		if (*this->oper)
+		if (AllowedOperCommands)
+			AllowedOperCommands->clear();
+		else
+			AllowedOperCommands = new std::set<std::string>;
+
+		if (AllowedPrivs)
+			AllowedPrivs->clear();
+		else
+			AllowedPrivs = new std::set<std::string>;
+
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
+		this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+
+		std::string myclass, mycmd, mypriv;
+		irc::spacesepstream Classes(iter_opertype->second.c_str());
+		while (Classes.GetToken(myclass))
 		{
-			*this->oper = 0;
-			this->modes[UM_OPERATOR] = 0;
-			for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
+			operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
+			if (iter_operclass != ServerInstance->Config->operclass.end())
 			{
-				if (*a == this)
+				/* Process commands */
+				irc::spacesepstream CommandList(iter_operclass->second.commandlist);
+				while (CommandList.GetToken(mycmd))
+				{
+					this->AllowedOperCommands->insert(mycmd);
+				}
+
+				irc::spacesepstream PrivList(iter_operclass->second.privs);
+				while (PrivList.GetToken(mypriv))
 				{
-					ServerInstance->Log(DEBUG,"Oper removed from optimization list");
-					ServerInstance->all_opers.erase(a);
-					return;
+					this->AllowedPrivs->insert(mypriv);
+				}
+
+				for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
+				{
+					if (*c == '*')
+					{
+						this->AllowedUserModes.set();
+					}
+					else
+					{
+						this->AllowedUserModes[*c - 'A'] = true;
+					}
+				}
+
+				for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+				{
+					if (*c == '*')
+					{
+						this->AllowedChanModes.set();
+					}
+					else
+					{
+						this->AllowedChanModes[*c - 'A'] = true;
+					}
 				}
 			}
 		}
 	}
 
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()");
-	}
+	FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
 }
 
-void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason)
+void User::UnOper()
 {
-	user_hash::iterator iter = Instance->clientlist.find(user->nick);
-	std::string reason = quitreason;
-
-	if (reason.length() > MAXQUIT - 1)
-		reason.resize(MAXQUIT - 1);
-	
-	if (IS_LOCAL(user))
-		user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason.c_str());
-
-	if (user->registered == REG_ALL)
+	if (IS_OPER(this))
 	{
-		user->PurgeEmptyChannels();
-		FOREACH_MOD_I(Instance,I_OnUserQuit,OnUserQuit(user,reason));
-		user->WriteCommonExcept("QUIT :%s",reason.c_str());
-	}
+		/*
+		 * unset their oper type (what IS_OPER checks).
+		 * note, order is important - this must come before modes as -o attempts
+		 * to call UnOper. -- w00t
+		 */
+		this->oper.clear();
 
-	if (IS_LOCAL(user))
-		user->FlushWriteBuf();
 
-	FOREACH_MOD_I(Instance,I_OnUserDisconnect,OnUserDisconnect(user));
+		/* Remove all oper only modes from the user when the deoper - Bug #466*/
+		std::string moderemove("-");
 
-	if (IS_LOCAL(user))
-	{
-		if (Instance->Config->GetIOHook(user->GetPort()))
+		for (unsigned char letter = 'A'; letter <= 'z'; letter++)
 		{
-			try
-			{
-				Instance->Config->GetIOHook(user->GetPort())->OnRawSocketClose(user->fd);
-			}
-			catch (ModuleException& modexcept)
-			{
-				Instance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
-			}
+			ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+			if (mh && mh->NeedsOper())
+				moderemove += letter;
 		}
-		
-		Instance->SE->DelFd(user);
-		user->CloseSocket();
-	}
 
-	/*
-	 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-	 * if they were an oper with +sn +qQ.
-	 */
-	if (user->registered == REG_ALL)
-	{
-		if (IS_LOCAL(user))
-			Instance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
-		else
-			Instance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,reason.c_str());
-		user->AddToWhoWas();
-	}
 
-	if (iter != Instance->clientlist.end())
-	{
-		Instance->Log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
-		if (IS_LOCAL(user))
-		{
-			if (find(Instance->local_users.begin(),Instance->local_users.end(),user) != Instance->local_users.end())
-				Instance->local_users.erase(find(Instance->local_users.begin(),Instance->local_users.end(),user));
-		}
-		Instance->clientlist.erase(iter);
-		DELETE(user);
-	}
-}
+		std::vector<std::string> parameters;
+		parameters.push_back(this->nick);
+		parameters.push_back(moderemove);
 
-namespace irc
-{
-	namespace whowas
-	{
+		ServerInstance->Parser->CallHandler("MODE", parameters, this);
 
-		WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
-		{
-			this->host = strdup(user->host);
-			this->dhost = strdup(user->dhost);
-			this->ident = strdup(user->ident);
-			this->server = user->server;
-			this->gecos = strdup(user->fullname);
-		}
+		/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
+		ServerInstance->Users->all_opers.remove(this);
 
-		WhoWasGroup::~WhoWasGroup()
+		if (AllowedOperCommands)
 		{
-			if (host)
-				free(host);
-			if (dhost)
-				free(dhost);
-			if (ident)
-				free(ident);
-			if (gecos)
-				free(gecos);
+			delete AllowedOperCommands;
+			AllowedOperCommands = NULL;
 		}
 
-		/* every hour, run this function which removes all entries over 3 days */
-		void MaintainWhoWas(time_t t)
+		if (AllowedPrivs)
 		{
-			for (whowas_users::iterator iter = ::whowas.begin(); iter != ::whowas.end(); iter++)
-			{
-				whowas_set* n = (whowas_set*)iter->second;
-				if (n->size())
-				{
-					while ((n->begin() != n->end()) && ((*n->begin())->signon < t - 259200)) // 3 days
-					{
-						WhoWasGroup *a = *(n->begin());
-						DELETE(a);
-						n->erase(n->begin());
-					}
-				}
-			}
+			delete AllowedPrivs;
+			AllowedPrivs = NULL;
 		}
-	};
-};
+
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
+		this->modes[UM_OPERATOR] = 0;
+	}
+}
 
 /* adds or updates an entry in the whowas list */
-void userrec::AddToWhoWas()
+void User::AddToWhoWas()
 {
-	irc::whowas::whowas_users::iterator iter = whowas.find(this->nick);
-
-	if (iter == whowas.end())
+	Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+	if (whowas_command)
 	{
-		irc::whowas::whowas_set* n = new irc::whowas::whowas_set;
-		irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
-		n->push_back(a);
-		whowas[this->nick] = n;
-	}
-	else
-	{
-		irc::whowas::whowas_set* group = (irc::whowas::whowas_set*)iter->second;
-
-		if (group->size() > 10)
-		{
-			irc::whowas::WhoWasGroup *a = (irc::whowas::WhoWasGroup*)*(group->begin());
-			DELETE(a);
-			group->pop_front();
-		}
-
-		irc::whowas::WhoWasGroup *a = new irc::whowas::WhoWasGroup(this);
-		group->push_back(a);
+		std::deque<classbase*> params;
+		params.push_back(this);
+		whowas_command->HandleInternal(WHOWAS_ADD, params);
 	}
 }
 
-/* add a client connection to the sockets list */
-void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, insp_inaddr ip)
+/*
+ * Check class restrictions
+ */
+void User::CheckClass()
 {
-	std::string tempnick = ConvToStr(socket) + "-unknown";
-	user_hash::iterator iter = Instance->clientlist.find(tempnick);
-	const char *ipaddr = insp_ntoa(ip);
-	userrec* New;
-	int j = 0;
+	ConnectClass* a = this->MyClass;
 
-	/*
-	 * fix by brain.
-	 * as these nicknames are 'RFC impossible', we can be sure nobody is going to be
-	 * using one as a registered connection. As they are per fd, we can also safely assume
-	 * that we wont have collisions. Therefore, if the nick exists in the list, its only
-	 * used by a dead socket, erase the iterator so that the new client may reclaim it.
-	 * this was probably the cause of 'server ignores me when i hammer it with reconnects'
-	 * issue in earlier alphas/betas
-	 */
-	if (iter != Instance->clientlist.end())
-	{
-		userrec* goner = iter->second;
-		DELETE(goner);
-		Instance->clientlist.erase(iter);
-	}
-
-	Instance->Log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
-	
-	New = new userrec(Instance);
-	Instance->clientlist[tempnick] = New;
-	New->fd = socket;
-	strlcpy(New->nick,tempnick.c_str(),NICKMAX-1);
-
-	New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
-	/* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-	strcpy(New->ident, "unknown");
-
-	New->registered = REG_NONE;
-	New->signon = Instance->Time() + Instance->Config->dns_timeout;
-	New->lastping = 1;
-
-	Instance->Log(DEBUG,"Setting socket addresses");
-	New->SetSockAddr(AF_FAMILY, ipaddr, port);
-	Instance->Log(DEBUG,"Socket addresses set.");
-
-	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
-		New->dhost[j] = New->host[j] = *temp;
-	New->dhost[j] = New->host[j] = 0;
-			
-	// set the registration timeout for this user
-	unsigned long class_regtimeout = 90;
-	int class_flood = 0;
-	long class_threshold = 5;
-	long class_sqmax = 262144;      // 256kb
-	long class_rqmax = 4096;	// 4k
-
-	for (ClassVector::iterator i = Instance->Config->Classes.begin(); i != Instance->Config->Classes.end(); i++)
-	{
-		if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str(),true)))
-		{
-			class_regtimeout = (unsigned long)i->registration_timeout;
-			class_flood = i->flood;
-			New->pingmax = i->pingtime;
-			class_threshold = i->threshold;
-			class_sqmax = i->sendqmax;
-			class_rqmax = i->recvqmax;
-			break;
-		}
-	}
-
-	New->nping = Instance->Time() + New->pingmax + Instance->Config->dns_timeout;
-	New->timeout = Instance->Time() + class_regtimeout;
-	New->flood = class_flood;
-	New->threshold = class_threshold;
-	New->sendqmax = class_sqmax;
-	New->recvqmax = class_rqmax;
-
-	Instance->local_users.push_back(New);
-
-	if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
+	if ((!a) || (a->type == CC_DENY))
 	{
-		userrec::QuitUser(Instance, New,"No more connections allowed");
+		ServerInstance->Users->QuitUser(this, "Unauthorised connection");
 		return;
 	}
-
-	/*
-	 * XXX -
-	 * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
-	 * its a pretty big but for the moment valid assumption:
-	 * file descriptors are handed out starting at 0, and are recycled as theyre freed.
-	 * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
-	 * irc server at once (or the irc server otherwise initiating this many connections, files etc)
-	 * which for the time being is a physical impossibility (even the largest networks dont have more
-	 * than about 10,000 users on ONE server!)
-	 */
-	if ((unsigned)socket >= MAX_DESCRIPTORS)
+	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
-		userrec::QuitUser(Instance, New, "Server is full");
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
+		ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
-
-	/*
-	 * XXX really really fixme! QuitUser doesn't like having a null entry in the ref table it seems, moving this up so 
-	 * zlines dont crash ircd. we need a better solution, as this is obviously inefficient (and probably wrong) -- w00t
-	 */
-	if (socket > -1)
-	{
-		if (!Instance->SE->AddFd(New))
-		{
-			userrec::QuitUser(Instance, New, "Internal error handling connection");
-			return;
-		}
-	}
-
-	ELine* e = Instance->XLines->matches_exception(New);
-	if (!e)
+	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
-		ZLine* r = Instance->XLines->matches_zline(ipaddr);
-		if (r)
-		{
-			char reason[MAXBUF];
-			snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
-			userrec::QuitUser(Instance, New, reason);
-			return;
-		}
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
+		ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+		return;
 	}
 
-	New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
+	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
 }
 
-long userrec::GlobalCloneCount()
+bool User::CheckLines(bool doZline)
 {
-	char u1[128];
-	char u2[128];
-	long x = 0;
+	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
 
-	for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
+	if (!this->exempt)
 	{
-		/* We have to match ip's as strings - we don't know what protocol
-		 * a remote user may be using
-		 */
-		if (strcmp(a->second->GetIPString(u1), this->GetIPString(u2)) == 0)
-			x++;
-	}
-	
-	return x;
-}
+		for (int n = 0; check[n]; ++n)
+		{
+			XLine *r = ServerInstance->XLines->MatchesLine(check[n], this);
 
-long userrec::LocalCloneCount()
-{
-	long x = 0;
-	for (std::vector<userrec*>::const_iterator a = ServerInstance->local_users.begin(); a != ServerInstance->local_users.end(); a++)
-	{
-		userrec* comp = *a;
-#ifdef IPV6
-		/* I dont think theres any faster way of matching two ipv6 addresses than memcmp */
-		in6_addr* s1 = &(((sockaddr_in6*)comp->ip)->sin6_addr);
-		in6_addr* s2 = &(((sockaddr_in6*)this->ip)->sin6_addr);
-		if (!memcmp(s1->s6_addr, s2->s6_addr, sizeof(in6_addr)))
-			x++;
-#else
-		in_addr* s1 = &((sockaddr_in*)comp->ip)->sin_addr;
-		in_addr* s2 = &((sockaddr_in*)this->ip)->sin_addr;
-		if (s1->s_addr == s2->s_addr)
-			x++;
-#endif
+			if (r)
+			{
+				r->Apply(this);
+				return true;
+			}
+		}
 	}
-	return x;
+
+	return false;
 }
 
-void userrec::FullConnect(CullList* Goners)
+void User::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
 
-	ConnectClass a = this->GetClass();
+	/*
+	 * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
+	 * At the time AddClient is called, we don't have a resolved host, by here we probably do - which
+	 * may put the user into a totally seperate class with different restrictions! so we *must* check again.
+	 * Don't remove this! -- w00t
+	 */
+	this->SetClass();
 
-	if (a.type == CC_DENY)
-	{
-		Goners->AddItem(this,"Unauthorised connection");
-		return;
-	}
-	
-	if ((*(a.pass.c_str())) && (!this->haspassed))
-	{
-		Goners->AddItem(this,"Invalid password");
-		return;
-	}
-	
-	if (this->LocalCloneCount() > a.maxlocal)
+	/* Check the password, if one is required by the user's connect class.
+	 * This CANNOT be in CheckClass(), because that is called prior to PASS as well!
+	 */
+	if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
 	{
-		Goners->AddItem(this, "No more connections allowed from your host via this connect class (local)");
-		ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a.maxlocal, this->GetIPString());
+		ServerInstance->Users->QuitUser(this, "Invalid password");
 		return;
 	}
-	else if (this->GlobalCloneCount() > a.maxglobal)
-	{
-		Goners->AddItem(this, "No more connections allowed from your host via this connect class (global)");
-		ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal, this->GetIPString());
+
+	if (this->CheckLines())
 		return;
-	}
 
-	ELine* e = ServerInstance->XLines->matches_exception(this);
+	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-1.2 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
-	if (!e)
-	{
-		GLine* r = ServerInstance->XLines->matches_gline(this);
-		
-		if (r)
-		{
-			char reason[MAXBUF];
-			snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
-			Goners->AddItem(this, reason);
-			return;
-		}
-		
-		KLine* n = ServerInstance->XLines->matches_kline(this);
-		
-		if (n)
-		{
-			char reason[MAXBUF];
-			snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
-			Goners->AddItem(this, reason);
-			return;
-		}
-	}
+	ServerInstance->Config->Send005(this);
+	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
 
-	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
-	this->WriteServ("001 %s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
-	this->WriteServ("002 %s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
-	this->WriteServ("003 %s :This server was created %s %s", this->nick, __TIME__, __DATE__);
-	this->WriteServ("004 %s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
-
-	// anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
-	// so i'd better split it :)
-	std::stringstream out(ServerInstance->Config->data005);
-	std::string token = "";
-	std::string line5 = "";
-	int token_counter = 0;
-	
-	while (!out.eof())
-	{
-		out >> token;
-		line5 = line5 + token + " ";
-		token_counter++;
-		
-		if ((token_counter >= 13) || (out.eof() == true))
-		{
-			this->WriteServ("005 %s %s:are supported by this server", this->nick, line5.c_str());
-			line5 = "";
-			token_counter = 0;
-		}
-	}
-	
 	this->ShowMOTD();
 
+	/* Now registered */
+	if (ServerInstance->Users->unregistered_count)
+		ServerInstance->Users->unregistered_count--;
+
+	/* Trigger LUSERS output, give modules a chance too */
+	int MOD_RESULT = 0;
+	std::string command("LUSERS");
+	std::vector<std::string> parameters;
+	FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS"));
+	if (!MOD_RESULT)
+		ServerInstance->CallCommandHandler(command, parameters, this);
+
 	/*
-	 * fix 3 by brain, move registered = 7 below these so that spurious modes and host
-	 * changes dont go out onto the network and produce 'fake direction'.
+	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
+	 * for a user that doesn't exist yet.
 	 */
 	FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
-	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
 	this->registered = REG_ALL;
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
+
+	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]",
+		this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
+	ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
+	ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 }
 
-/** userrec::UpdateNick()
+/** User::UpdateNick()
  * re-allocates a nick in the user_hash after they change nicknames,
  * returns a pointer to the new user as it may have moved
  */
-userrec* userrec::UpdateNickHash(const char* New)
+User* User::UpdateNickHash(const char* New)
 {
-	try
-	{
-		//user_hash::iterator newnick;
-		user_hash::iterator oldnick = ServerInstance->clientlist.find(this->nick);
+	//user_hash::iterator newnick;
+	user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
 
-		if (!strcasecmp(this->nick,New))
-			return oldnick->second;
+	if (!irc::string(this->nick.c_str()).compare(New))
+		return oldnick->second;
 
-		if (oldnick == ServerInstance->clientlist.end())
-			return NULL; /* doesnt exist */
+	if (oldnick == ServerInstance->Users->clientlist->end())
+		return NULL; /* doesnt exist */
 
-		userrec* olduser = oldnick->second;
-		ServerInstance->clientlist[New] = olduser;
-		ServerInstance->clientlist.erase(oldnick);
-		return ServerInstance->clientlist[New];
-	}
+	User* olduser = oldnick->second;
+	ServerInstance->Users->clientlist->erase(oldnick);
+	(*(ServerInstance->Users->clientlist))[New] = olduser;
+	return olduser;
+}
 
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()");
-		return NULL;
-	}
+void User::InvalidateCache()
+{
+	/* Invalidate cache */
+	cached_fullhost.clear();
+	cached_hostip.clear();
+	cached_makehost.clear();
+	cached_fullrealhost.clear();
 }
 
-bool userrec::ForceNickChange(const char* newnick)
+bool User::ForceNickChange(const char* newnick)
 {
-	try
-	{
-		int MOD_RESULT = 0;
-	
-		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+	int MOD_RESULT = 0;
 
-		if (MOD_RESULT)
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
-	
-		if (ServerInstance->XLines->matches_qline(newnick))
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
+	this->InvalidateCache();
 
-		if (this->registered == REG_ALL)
-		{
-			const char* pars[1];
-			pars[0] = newnick;
-			std::string cmd = "NICK";
-			return (ServerInstance->Parser->CallHandler(cmd, pars, 1, this) == CMD_SUCCESS);
-		}
-		return false;
-	}
+	this->Extend("NICKForced", "Enabled");
 
-	catch (...)
+	FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+
+	this->Shrink("NICKForced");
+
+	if (MOD_RESULT)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()");
+		ServerInstance->stats->statsCollisions++;
 		return false;
 	}
-}
 
-void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
-{
-	switch (protocol_family)
+	std::deque<classbase*> dummy;
+	Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+	if (nickhandler) // wtfbbq, when would this not be here
 	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			ServerInstance->Log(DEBUG,"Set inet6 protocol address");
-			sockaddr_in6* sin = new sockaddr_in6;
-			sin->sin6_family = AF_INET6;
-			sin->sin6_port = port;
-			inet_pton(AF_INET6, ip, &sin->sin6_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-#endif
-		case AF_INET:
-		{
-			ServerInstance->Log(DEBUG,"Set inet4 protocol address");
-			sockaddr_in* sin = new sockaddr_in;
-			sin->sin_family = AF_INET;
-			sin->sin_port = port;
-			inet_pton(AF_INET, ip, &sin->sin_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-		default:
-			ServerInstance->Log(DEBUG,"Ut oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
-		break;
+		std::vector<std::string> parameters;
+		nickhandler->HandleInternal(1, dummy);
+		parameters.push_back(newnick);
+		this->Extend("NICKForced", "Enabled");
+		bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
+		this->Shrink("NICKForced");
+		nickhandler->HandleInternal(0, dummy);
+		return result;
 	}
+
+	// Unreachable, we hope
+	return false;
 }
 
-int userrec::GetPort()
+int User::GetServerPort()
 {
-	if (this->ip == NULL)
-		return 0;
-
-	switch (this->GetProtocolFamily())
+	switch (this->server_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
-		{
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			return sin->sin6_port;
-		}
-		break;
-#endif
+			return htons(this->server_sa.in6.sin6_port);
 		case AF_INET:
-		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			return sin->sin_port;
-		}
-		break;
-		default:
-			ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
-		break;
+			return htons(this->server_sa.in4.sin_port);
 	}
 	return 0;
 }
 
-int userrec::GetProtocolFamily()
-{
-	if (this->ip == NULL)
-		return 0;
-
-	sockaddr_in* sin = (sockaddr_in*)this->ip;
-	return sin->sin_family;
-}
-
-const char* userrec::GetIPString()
+const char* User::GetCIDRMask(int range)
 {
-	static char buf[1024];
+	static char buf[44];
 
-	if (this->ip == NULL)
-		return "";
+	if (range < 0)
+		throw "Negative range, sorry, no.";
 
-	switch (this->GetProtocolFamily())
+	/*
+	 * Original code written by Oliver Lupton (Om).
+	 * Integrated by me. Thanks. :) -- w00t
+	 */
+	switch (this->client_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
 		{
-			static char temp[1024];
-		
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
-			/* IP addresses starting with a : on irc are a Bad Thing (tm) */
-			if (*buf == ':')
+			/* unsigned char s6_addr[16]; */
+			struct in6_addr v6;
+			int i, bytestozero, extrabits;
+			char buffer[40];
+
+			if(range > 128)
+				throw "CIDR mask width greater than address width (IPv6, 128 bit)";
+
+			/* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+			 * to zero. This means the last (128 - range) bits of the address must be set to zero.
+			 * Hence this number divided by 8 is the number of whole bytes from the end of the address
+			 * which must be set to zero.
+			 */
+			bytestozero = (128 - range) / 8;
+
+			/* Some of the least significant bits of the next most significant byte may also have to
+			 * be zeroed. The number of bits is the remainder of the above division.
+			 */
+			extrabits = (128 - range) % 8;
+
+			/* Populate our working struct with the parts of the user's IP which are required in the
+			 * final CIDR mask. Set all the subsequent bytes to zero.
+			 * (16 - bytestozero) is the number of bytes which must be populated with actual IP data.
+			 */
+			for(i = 0; i < (16 - bytestozero); i++)
 			{
-				strlcpy(&temp[1], buf, sizeof(temp));
-				*temp = '0';
-				return temp;
+				v6.s6_addr[i] = client_sa.in6.sin6_addr.s6_addr[i];
 			}
+
+			/* And zero all the remaining bytes in the IP. */
+			for(; i < 16; i++)
+			{
+				v6.s6_addr[i] = 0;
+			}
+
+			/* And finally, zero the extra bits required. */
+			v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits;
+
+			snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET6, &v6, buffer, 40), range);
 			return buf;
 		}
 		break;
-#endif
 		case AF_INET:
 		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
-			return buf;
-		}
-		break;
-		default:
-			ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
-		break;
-	}
-	return "";
-}
+			struct in_addr v4;
+			char buffer[16];
 
-const char* userrec::GetIPString(char* buf)
-{
-	if (this->ip == NULL)
-	{
-		*buf = 0;
-		return buf;
-	}
+			if (range > 32)
+				throw "CIDR mask width greater than address width (IPv4, 32 bit)";
 
-	switch (this->GetProtocolFamily())
-	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			static char temp[1024];
-		
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
-			/* IP addresses starting with a : on irc are a Bad Thing (tm) */
-			if (*buf == ':')
+			/* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */
+			v4.s_addr = client_sa.in4.sin_addr.s_addr;
+
+			/* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+			 * to zero. This means the last (32 - range) bits of the address must be set to zero.
+			 * This is done by shifting the value right and then back left by (32 - range) bits.
+			 */
+			if(range > 0)
 			{
-				strlcpy(&temp[1], buf, sizeof(temp));
-				*temp = '0';
-				strlcpy(buf, temp, sizeof(temp));
+				v4.s_addr = ntohl(v4.s_addr);
+				v4.s_addr = (v4.s_addr >> (32 - range)) << (32 - range);
+				v4.s_addr = htonl(v4.s_addr);
 			}
+			else
+			{
+				/* a range of zero would cause a 32 bit value to be shifted by 32 bits.
+				 * this has undefined behaviour, but for CIDR purposes the resulting mask
+				 * from a.b.c.d/0 is 0.0.0.0/0
+				 */
+				v4.s_addr = 0;
+			}
+
+			snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET, &v4, buffer, 16), range);
 			return buf;
 		}
 		break;
-#endif
-		case AF_INET:
-		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
-			return buf;
-		}
-		break;
+	}
 
-		default:
-			ServerInstance->Log(DEBUG,"Ut oh, '%s' has an unknown protocol family!",this->nick);
-		break;
+	return ""; // unused, but oh well
+}
+
+std::string User::GetServerIP()
+{
+	int port;
+	std::string ip;
+	irc::sockets::satoap(&server_sa, ip, port);
+	return ip;
+}
+
+const char* User::GetIPString()
+{
+	int port;
+	if (cachedip.empty())
+	{
+		irc::sockets::satoap(&client_sa, cachedip, port);
+		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
+		if (cachedip.c_str()[0] == ':')
+			cachedip.insert(0,1,'0');
 	}
-	return "";
+
+	return cachedip.c_str();
+}
+
+bool User::SetClientIP(const char* sip)
+{
+	this->cachedip = "";
+	return irc::sockets::aptosa(sip, 0, &client_sa);
 }
 
 /** NOTE: We cannot pass a const reference to this method.
@@ -1349,30 +1201,34 @@ const char* userrec::GetIPString(char* buf)
  * something we can change anyway. Makes sense to just let
  * the compiler do that copy for us.
  */
-void userrec::Write(std::string text)
+void User::Write(std::string text)
 {
-	if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
+	if (!ServerInstance->SE->BoundsCheckFd(this))
 		return;
 
 	try
 	{
+		ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
 		text.append("\r\n");
 	}
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+		ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"Exception in User::Write() std::string::append");
 		return;
 	}
 
-	if (ServerInstance->Config->GetIOHook(this->GetPort()))
+	if (this->GetIOHook())
 	{
+		/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+		 * implement their own buffering mechanisms
+		 */
 		try
 		{
-			ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
+			this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
-		catch (ModuleException& modexcept)
+		catch (CoreException& modexcept)
 		{
-			ServerInstance->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+			ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
 	else
@@ -1380,11 +1236,12 @@ void userrec::Write(std::string text)
 		this->AddWriteBuf(text);
 	}
 	ServerInstance->stats->statsSent += text.length();
+	this->ServerInstance->SE->WantWrite(this);
 }
 
 /** Write()
  */
-void userrec::Write(const char *text, ...)
+void User::Write(const char *text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1396,7 +1253,7 @@ void userrec::Write(const char *text, ...)
 	this->Write(std::string(textbuffer));
 }
 
-void userrec::WriteServ(const std::string& text)
+void User::WriteServ(const std::string& text)
 {
 	char textbuffer[MAXBUF];
 
@@ -1407,7 +1264,7 @@ void userrec::WriteServ(const std::string& text)
 /** WriteServ()
  *  Same as Write(), except `text' is prefixed with `:server.name '.
  */
-void userrec::WriteServ(const char* text, ...)
+void User::WriteServ(const char* text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1420,19 +1277,45 @@ void userrec::WriteServ(const char* text, ...)
 }
 
 
-void userrec::WriteFrom(userrec *user, const std::string &text)
+void User::WriteNumeric(unsigned int numeric, const char* text, ...)
+{
+	va_list argsPtr;
+	char textbuffer[MAXBUF];
+
+	va_start(argsPtr, text);
+	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
+
+	this->WriteNumeric(numeric, std::string(textbuffer));
+}
+
+void User::WriteNumeric(unsigned int numeric, const std::string &text)
+{
+	char textbuffer[MAXBUF];
+	int MOD_RESULT = 0;
+
+	FOREACH_RESULT(I_OnNumeric, OnNumeric(this, numeric, text));
+
+	if (MOD_RESULT)
+		return;
+
+	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str());
+	this->Write(std::string(textbuffer));
+}
+
+void User::WriteFrom(User *user, const std::string &text)
 {
 	char tb[MAXBUF];
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
-	
+	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(),text.c_str());
+
 	this->Write(std::string(tb));
 }
 
 
 /* write text from an originating user to originating user */
 
-void userrec::WriteFrom(userrec *user, const char* text, ...)
+void User::WriteFrom(User *user, const char* text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1447,7 +1330,7 @@ void userrec::WriteFrom(userrec *user, const char* text, ...)
 
 /* write text to an destination user from a source user (e.g. user privmsg) */
 
-void userrec::WriteTo(userrec *dest, const char *data, ...)
+void User::WriteTo(User *dest, const char *data, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1459,13 +1342,13 @@ void userrec::WriteTo(userrec *dest, const char *data, ...)
 	this->WriteTo(dest, std::string(textbuffer));
 }
 
-void userrec::WriteTo(userrec *dest, const std::string &data)
+void User::WriteTo(User *dest, const std::string &data)
 {
 	dest->WriteFrom(this, data);
 }
 
 
-void userrec::WriteCommon(const char* text, ...)
+void User::WriteCommon(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1480,49 +1363,44 @@ void userrec::WriteCommon(const char* text, ...)
 	this->WriteCommon(std::string(textbuffer));
 }
 
-void userrec::WriteCommon(const std::string &text)
+void User::WriteCommon(const std::string &text)
 {
-	try
+	bool sent_to_at_least_one = false;
+	char tb[MAXBUF];
+
+	if (this->registered != REG_ALL)
+		return;
+
+	uniq_id++;
+
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
+
+	/* We dont want to be doing this n times, just once */
+	snprintf(tb,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
+	std::string out = tb;
+
+	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
 	{
-		bool sent_to_at_least_one = false;
-	
-		if (this->registered != REG_ALL)
-			return;
-	
-		uniq_id++;
-	
-		for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+		CUList* ulist = v->first->GetUsers();
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			ucrec *n = *v;
-			if (n->channel)
+			if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
 			{
-				CUList *ulist= n->channel->GetUsers();
-		
-				for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				{
-					if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
-					{
-						already_sent[i->second->fd] = uniq_id;
-						i->second->WriteFrom(this, std::string(text));
-						sent_to_at_least_one = true;
-					}
-				}
+				already_sent[i->first->fd] = uniq_id;
+				i->first->Write(out);
+				sent_to_at_least_one = true;
 			}
 		}
-	
-		/*
-		 * if the user was not in any channels, no users will receive the text. Make sure the user
-		 * receives their OWN message for WriteCommon
-		 */
-		if (!sent_to_at_least_one)
-		{
-			this->WriteFrom(this,std::string(text));
-		}
 	}
 
-	catch (...)
+	/*
+	 * if the user was not in any channels, no users will receive the text. Make sure the user
+	 * receives their OWN message for WriteCommon
+	 */
+	if (!sent_to_at_least_one)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()");
+		this->Write(std::string(tb));
 	}
 }
 
@@ -1531,7 +1409,7 @@ void userrec::WriteCommon(const std::string &text)
  * channel, NOT including the source user e.g. for use in QUIT
  */
 
-void userrec::WriteCommonExcept(const char* text, ...)
+void User::WriteCommonExcept(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1543,76 +1421,68 @@ void userrec::WriteCommonExcept(const char* text, ...)
 	this->WriteCommonExcept(std::string(textbuffer));
 }
 
-void userrec::WriteCommonExcept(const std::string &text)
+void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
 {
-	bool quit_munge = false;
-	char oper_quit[MAXBUF];
-	char textbuffer[MAXBUF];
-
-	strlcpy(textbuffer, text.c_str(), MAXBUF);
+	char tb1[MAXBUF];
+	char tb2[MAXBUF];
 
 	if (this->registered != REG_ALL)
 		return;
 
 	uniq_id++;
 
-	/* TODO: We need some form of WriteCommonExcept that will send two lines, one line to
-	 * opers and the other line to non-opers, then all this hidebans and hidesplits gunk
-	 * can go byebye.
-	 */
-	if (ServerInstance->Config->HideSplits)
-	{
-		char* check = textbuffer + 6;
-
-		if (!strncasecmp(textbuffer, "QUIT :",6))
-		{
-			std::stringstream split(check);
-			std::string server_one;
-			std::string server_two;
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
 
-			split >> server_one;
-			split >> server_two;
+	snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),normal_text.c_str());
+	snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),oper_text.c_str());
+	std::string out1 = tb1;
+	std::string out2 = tb2;
 
-			if ((ServerInstance->FindServerName(server_one)) && (ServerInstance->FindServerName(server_two)))
+	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	{
+		CUList *ulist = v->first->GetUsers();
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			if (this != i->first)
 			{
-				strlcpy(oper_quit,textbuffer,MAXQUIT);
-				strlcpy(check,"*.net *.split",MAXQUIT);
-				quit_munge = true;
+				if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
+				{
+					already_sent[i->first->fd] = uniq_id;
+					i->first->Write(IS_OPER(i->first) ? out2 : out1);
+				}
 			}
 		}
 	}
+}
 
-	if ((ServerInstance->Config->HideBans) && (!quit_munge))
-	{
-		if ((!strncasecmp(textbuffer, "QUIT :G-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :K-Lined:",14))
-		|| (!strncasecmp(textbuffer, "QUIT :Q-Lined:",14)) || (!strncasecmp(textbuffer, "QUIT :Z-Lined:",14)))
-		{
-			char* check = textbuffer + 13;
-			strlcpy(oper_quit,textbuffer,MAXQUIT);
-			*check = 0;  // We don't need to strlcpy, we just chop it from the :
-			quit_munge = true;
-		}
-	}
+void User::WriteCommonExcept(const std::string &text)
+{
+	char tb1[MAXBUF];
+	std::string out1;
+
+	if (this->registered != REG_ALL)
+		return;
+
+	uniq_id++;
 
-	for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
+
+	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
+	out1 = tb1;
+
+	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
 	{
-		ucrec* n = *v;
-		if (n->channel)
+		CUList *ulist = v->first->GetUsers();
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			CUList *ulist= n->channel->GetUsers();
-
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+			if (this != i->first)
 			{
-				if (this != i->second)
+				if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
 				{
-					if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
-					{
-						already_sent[i->second->fd] = uniq_id;
-						if (quit_munge)
-							i->second->WriteFrom(this, *i->second->oper ? std::string(oper_quit) : std::string(textbuffer));
-						else
-							i->second->WriteFrom(this, std::string(textbuffer));
-					}
+					already_sent[i->first->fd] = uniq_id;
+					i->first->Write(out1);
 				}
 			}
 		}
@@ -1620,43 +1490,33 @@ void userrec::WriteCommonExcept(const std::string &text)
 
 }
 
-void userrec::WriteWallOps(const std::string &text)
+void User::WriteWallOps(const std::string &text)
 {
-	/* Does nothing if theyre not opered */
-	if ((!*this->oper) && (IS_LOCAL(this)))
-		return;
-
-	std::string wallop = "WALLOPS :";
-
-	try
-	{
-		wallop.append(text);
-	}
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
-		return;
-	}
+	std::string wallop("WALLOPS :");
+	wallop.append(text);
 
-	for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
-		userrec* t = *i;
-		if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
+		User* t = *i;
+		if (t->IsModeSet('w'))
 			this->WriteTo(t,wallop);
 	}
 }
 
-void userrec::WriteWallOps(const char* text, ...)
-{       
+void User::WriteWallOps(const char* text, ...)
+{
+	if (!IS_LOCAL(this))
+		return;
+
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
 	va_start(argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);		
-					
+	va_end(argsPtr);
+
 	this->WriteWallOps(std::string(textbuffer));
-}				       
+}
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
  * (used by QUIT, NICK etc which arent channel specific notices)
@@ -1665,47 +1525,31 @@ void userrec::WriteWallOps(const char* text, ...)
  * the first users channels then the second users channels within the outer loop,
  * therefore it was a maximum of x*y iterations (upon returning 0 and checking
  * all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * channel's userlist in the inner loop which is a std::map<User*,User*>
  * and saves us time as we already know what pointer value we are after.
  * Don't quote me on the maths as i am not a mathematician or computer scientist,
  * but i believe this algorithm is now x+(log y) maximum iterations instead.
  */
-bool userrec::SharesChannelWith(userrec *other)
+bool User::SharesChannelWith(User *other)
 {
 	if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
 		return false;
 
 	/* Outer loop */
-	for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+	for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 	{
-		/* Fetch the channel from the user */
-		ucrec* user_channel = *i;
-
-		if (user_channel->channel)
-		{
-			/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
-			 * by replacing it with a map::find which *should* be more efficient
-			 */
-			if (user_channel->channel->HasUser(other))
-				return true;
-		}
+		/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
+		 * by replacing it with a map::find which *should* be more efficient
+		 */
+		if (i->first->HasUser(other))
+			return true;
 	}
 	return false;
 }
 
-int userrec::CountChannels()
-{
-	return ChannelCount;
-}
-
-void userrec::ModChannelCount(int n)
+bool User::ChangeName(const char* gecos)
 {
-	ChannelCount += n;
-}
-
-bool userrec::ChangeName(const char* gecos)
-{
-	if (!strcmp(gecos, this->fullname))
+	if (!this->fullname.compare(gecos))
 		return true;
 
 	if (IS_LOCAL(this))
@@ -1716,76 +1560,84 @@ bool userrec::ChangeName(const char* gecos)
 			return false;
 		FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
 	}
-	strlcpy(this->fullname,gecos,MAXGECOS+1);
+	this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
+
 	return true;
 }
 
-bool userrec::ChangeDisplayedHost(const char* host)
+bool User::ChangeDisplayedHost(const char* shost)
 {
-	if (!strcmp(host, this->dhost))
+	if (dhost == shost)
 		return true;
 
 	if (IS_LOCAL(this))
 	{
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,host));
+		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
 		if (MOD_RESULT)
 			return false;
-		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
 	}
-	if (this->ServerInstance->Config->CycleHosts)
-		this->WriteCommonExcept("%s","QUIT :Changing hosts");
 
-	strlcpy(this->dhost,host,63);
+	FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost));
 
-	if (this->ServerInstance->Config->CycleHosts)
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
+		this->WriteCommonExcept("QUIT :Changing hosts");
+
+	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
+	this->dhost.assign(shost, 0, 64);
+
+	this->InvalidateCache();
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 	{
-		for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
-			if ((*i)->channel)
-			{
-				(*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
-				std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
-				if (n.length() > 0)
-					(*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
-			}
+			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
+			std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
+			if (n.length() > 0)
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
 	if (IS_LOCAL(this))
-		this->WriteServ("396 %s %s :is now your hidden host",this->nick,this->dhost);
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
 
 	return true;
 }
 
-bool userrec::ChangeIdent(const char* newident)
+bool User::ChangeIdent(const char* newident)
 {
-	if (!strcmp(newident, this->ident))
+	if (this->ident == newident)
 		return true;
 
-	if (this->ServerInstance->Config->CycleHosts)
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");
 
-	strlcpy(this->ident, newident, IDENTMAX+2);
+	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
+
+	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 	{
-		for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
-			if ((*i)->channel)
-			{
-				(*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
-				std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
-				if (n.length() > 0)
-					(*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
-			}
+			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
+			std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
+			if (n.length() > 0)
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
 	return true;
 }
 
-void userrec::NoticeAll(char* text, ...)
+void User::SendAll(const char* command, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	char formatbuffer[MAXBUF];
@@ -1795,189 +1647,354 @@ void userrec::NoticeAll(char* text, ...)
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost().c_str(), command, textbuffer);
+	std::string fmt = formatbuffer;
 
-	for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
-		userrec* t = *i;
-		t->WriteFrom(this, std::string(formatbuffer));
+		(*i)->Write(fmt);
 	}
 }
 
 
-std::string userrec::ChannelList(userrec* source)
+std::string User::ChannelList(User* source)
 {
-	try
+	std::string list;
+
+	for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 	{
-		std::string list;
-		for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+		/* If the target is the same as the sender, let them see all their channels.
+		 * If the channel is NOT private/secret OR the user shares a common channel
+		 * If the user is an oper, and the <options:operspywhois> option is set.
+		 */
+		if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
 		{
-			ucrec* rec = *i;
-	
-			if(rec->channel && rec->channel->name)
-			{
-				/* If the target is the same as the sender, let them see all their channels.
-				 * If the channel is NOT private/secret OR the user shares a common channel
-				 * If the user is an oper, and the <options:operspywhois> option is set.
-				 */
-				if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
-				{
-					list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
-				}
-			}
+			list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
 		}
-		return list;
-	}
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()");
-		return "";
 	}
+
+	return list;
 }
 
-void userrec::SplitChanList(userrec* dest, const std::string &cl)
+void User::SplitChanList(User* dest, const std::string &cl)
 {
 	std::string line;
 	std::ostringstream prefix;
 	std::string::size_type start, pos, length;
 
-	try
+	prefix << this->nick << " " << dest->nick << " :";
+	line = prefix.str();
+	int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+
+	for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+	{
+		length = (pos == std::string::npos) ? cl.length() : pos;
+
+		if (line.length() + namelen + length - start > 510)
+		{
+			ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+			line = prefix.str();
+		}
+
+		if(pos == std::string::npos)
+		{
+			line.append(cl.substr(start, length - start));
+			break;
+		}
+		else
+		{
+			line.append(cl.substr(start, length - start + 1));
+		}
+	}
+
+	if (line.length())
+	{
+		ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+	}
+}
+
+/*
+ * Sets a user's connection class.
+ * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc.
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass* User::SetClass(const std::string &explicit_name)
+{
+	ConnectClass *found = NULL;
+
+	if (!IS_LOCAL(this))
+		return NULL;
+
+	ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid.c_str());
+
+	if (!explicit_name.empty())
 	{
-		prefix << ":" << ServerInstance->Config->ServerName << " 319 " << this->nick << " " << dest->nick << " :";
-		line = prefix.str();
-	
-		for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+		for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
 		{
-			length = (pos == std::string::npos) ? cl.length() : pos;
-	
-			if (line.length() + length - start > 510)
+			ConnectClass* c = *i;
+
+			if (explicit_name == c->name)
 			{
-				this->Write(line);
-				line = prefix.str();
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
+				found = c;
 			}
-	
-			if(pos == std::string::npos)
+		}
+	}
+	else
+	{
+		for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+		{
+			ConnectClass* c = *i;
+
+			if (c->type == CC_ALLOW)
 			{
-				line.append(cl.substr(start, length - start));
-				break;
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str());
 			}
 			else
 			{
-				line.append(cl.substr(start, length - start + 1));
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
 			}
-		}
-	
-		if (line.length())
-		{
-			this->Write(line);
+
+			/* check if host matches.. */
+			if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
+			    !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
+				continue;
+			}
+
+			/*
+			 * deny change if change will take class over the limit check it HERE, not after we found a matching class,
+			 * because we should attempt to find another class if this one doesn't match us. -- w00t
+			 */
+			if (c->limit && (c->RefCount >= c->limit))
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+				continue;
+			}
+
+			/* if it requires a port ... */
+			if (c->GetPort())
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
+
+				/* and our port doesn't match, fail. */
+				if (this->GetServerPort() != c->GetPort())
+				{
+					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort());
+					continue;
+				}
+			}
+
+			/* we stop at the first class that meets ALL critera. */
+			found = c;
+			break;
 		}
 	}
 
-	catch (...)
+	/*
+	 * Okay, assuming we found a class that matches.. switch us into that class, keeping refcounts up to date.
+	 */
+	if (found)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()");
+		/* only fiddle with refcounts if they are already in a class .. */
+		if (this->MyClass)
+		{
+			if (found == this->MyClass) // no point changing this shit :P
+				return this->MyClass;
+			this->MyClass->RefCount--;
+			ServerInstance->Logs->Log("USERS", DEBUG, "Untying user from connect class -- refcount: %lu", this->MyClass->RefCount);
+			if (MyClass->RefCount == 0)
+				delete MyClass;
+		}
+
+		this->MyClass = found;
+		this->MyClass->RefCount++;
+		ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %lu", this->MyClass->RefCount);
 	}
-}
 
+	return this->MyClass;
+}
 
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
  * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
  * then their ip will be taken as 'priority' anyway, so for example,
  * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
  */
-ConnectClass& userrec::GetClass()
+ConnectClass* User::GetClass()
 {
-	for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
-	{
-		if ((match(this->GetIPString(),i->host.c_str(),true)) || (match(this->host,i->host.c_str())))
-			return *i;
-	}
-
-	return *(ServerInstance->Config->Classes.begin());
+	return this->MyClass;
 }
 
-void userrec::PurgeEmptyChannels()
+void User::PurgeEmptyChannels()
 {
-	std::vector<chanrec*> to_delete;
+	std::vector<Channel*> to_delete;
 
 	// firstly decrement the count on each channel
-	for (std::vector<ucrec*>::iterator f = this->chans.begin(); f != this->chans.end(); f++)
+	for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
 	{
-		ucrec* uc = *f;
-		if (uc->channel)
+		f->first->RemoveAllPrefixes(this);
+		if (f->first->DelUser(this) == 0)
 		{
-			uc->channel->RemoveAllPrefixes(this);
-			if (uc->channel->DelUser(this) == 0)
+			/* No users left in here, mark it for deletion */
+			try
 			{
-				/* No users left in here, mark it for deletion */
-				try
-				{
-					to_delete.push_back(uc->channel);
-				}
-				catch (...)
-				{
-					ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()");
-				}
-				uc->channel = NULL;
+				to_delete.push_back(f->first);
+			}
+			catch (...)
+			{
+				ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
 			}
 		}
 	}
 
-	for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+	for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
 	{
-		chanrec* thischan = *n;
-		chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
-		if (i2 != ServerInstance->chanlist.end())
+		Channel* thischan = *n;
+		chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
+		if (i2 != ServerInstance->chanlist->end())
 		{
+			int MOD_RESULT = 0;
+			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(i2->second));
+			if (MOD_RESULT == 1)
+				continue; // delete halted by module
 			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-			DELETE(i2->second);
-			ServerInstance->chanlist.erase(i2);
+			delete i2->second;
+			ServerInstance->chanlist->erase(i2);
+			this->chans.erase(*n);
 		}
 	}
 
 	this->UnOper();
 }
 
-void userrec::ShowMOTD()
+void User::ShowMOTD()
 {
 	if (!ServerInstance->Config->MOTD.size())
 	{
-		this->WriteServ("422 %s :Message of the day file is missing.",this->nick);
+		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
 		return;
 	}
-	this->WriteServ("375 %s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
 
-	for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
-		this->WriteServ("372 %s :- %s",this->nick,ServerInstance->Config->MOTD[i].c_str());
+	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
+		this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
 
-	this->WriteServ("376 %s :End of message of the day.", this->nick);
+	this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
 }
 
-void userrec::ShowRULES()
+void User::ShowRULES()
 {
 	if (!ServerInstance->Config->RULES.size())
 	{
-		this->WriteServ("NOTICE %s :Rules file is missing.",this->nick);
+		this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
 		return;
 	}
-	this->WriteServ("NOTICE %s :%s rules",this->nick,ServerInstance->Config->ServerName);
 
-	for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
-		this->WriteServ("NOTICE %s :%s",this->nick,ServerInstance->Config->RULES[i].c_str());
+	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName);
 
-	this->WriteServ("NOTICE %s :End of %s rules.",this->nick,ServerInstance->Config->ServerName);
+	for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
+		this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
+
+	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
 }
 
-void userrec::HandleEvent(EventType et)
+void User::HandleEvent(EventType et, int errornum)
 {
-	/* WARNING: May delete this user! */
-	try
-	{
-		ServerInstance->ProcessUser(this);
-	}
-	catch (...)
+	if (this->quitting) // drop everything, user is due to be quit
+		return;
+
+	switch (et)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted");
+		case EVENT_READ:
+			ServerInstance->ProcessUser(this);
+		break;
+		case EVENT_WRITE:
+			this->FlushWriteBuf();
+		break;
+		case EVENT_ERROR:
+			ServerInstance->Users->QuitUser(this, errornum ? strerror(errornum) : "Client closed the connection");
+		break;
 	}
 }
 
+void User::SetOperQuit(const std::string &oquit)
+{
+	operquitmsg = oquit;
+}
+
+const std::string& User::GetOperQuit()
+{
+	return operquitmsg;
+}
+
+void User::IncreasePenalty(int increase)
+{
+	this->Penalty += increase;
+}
+
+void User::DecreasePenalty(int decrease)
+{
+	this->Penalty -= decrease;
+}
+
+void FakeUser::SetFakeServer(std::string name)
+{
+	this->nick = name;
+	this->server = nick.c_str();
+}
+
+const std::string FakeUser::GetFullHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
+const std::string FakeUser::GetFullRealHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
+VisData::VisData()
+{
+}
+
+VisData::~VisData()
+{
+}
+
+bool VisData::VisibleTo(User* user)
+{
+	return true;
+}
+
+
+ConnectClass::ConnectClass(char t, const std::string& mask)
+	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
+{
+}
+
+ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
+	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
+{
+}
+
+void ConnectClass::Update(const ConnectClass* src)
+{
+	name = src->name;
+	registration_timeout = src->registration_timeout;
+	host = src->host;
+	pingtime = src->pingtime;
+	pass = src->pass;
+	hash = src->hash;
+	sendqmax = src->sendqmax;
+	recvqmax = src->recvqmax;
+	maxlocal = src->maxlocal;
+	maxglobal = src->maxglobal;
+	limit = src->limit;
+}