X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=418f2c9aa3557f187e45eb189c892a07b154970c;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=9da9059188c49421d06e973e22edb99a64c44f0d;hpb=b8412d56a27ef5f09b1febe0cb682aee2eb57bff;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 9da905918..418f2c9aa 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1,30 +1,36 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core: libIRCDusers */
 
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 #include "commands/cmd_whowas.h"
 
-static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
-
-/* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 0;
+already_sent_t LocalUser::already_sent_id = 0;
 
 std::string User::ProcessNoticeMasks(const char *sm)
 {
@@ -43,9 +49,9 @@ std::string User::ProcessNoticeMasks(const char *sm)
 				adding = false;
 			break;
 			case '*':
-				for (unsigned char d = 'A'; d <= 'z'; d++)
+				for (unsigned char d = 'a'; d <= 'z'; d++)
 				{
-					if (ServerInstance->SNO->IsEnabled(d))
+					if (!ServerInstance->SNO->masks[d - 'a'].Description.empty())
 					{
 						if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
 						{
@@ -56,12 +62,23 @@ std::string User::ProcessNoticeMasks(const char *sm)
 
 							output += d;
 						}
+						oldadding = adding;
+						char u = toupper(d);
+						if ((!IsNoticeMaskSet(u) && adding) || (IsNoticeMaskSet(u) && !adding))
+						{
+							if ((oldadding != adding) || (!output.length()))
+								output += (adding ? '+' : '-');
+
+							this->SetNoticeMask(u, adding);
+
+							output += u;
+						}
+						oldadding = adding;
 					}
-					oldadding = adding;
 				}
 			break;
 			default:
-				if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+				if (isalpha(*c))
 				{
 					if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
 					{
@@ -71,49 +88,59 @@ std::string User::ProcessNoticeMasks(const char *sm)
 						this->SetNoticeMask(*c, adding);
 
 						output += *c;
+						oldadding = adding;
 					}
 				}
 				else
-					this->WriteServ("501 %s %c :is unknown snomask char to me", this->nick, *c);
+					this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
 
-				oldadding = adding;
 			break;
 		}
 
-		*c++;
+		c++;
+	}
+
+	std::string s = this->FormatNoticeMasks();
+	if (s.length() == 0)
+	{
+		this->modes[UM_SNOMASK] = false;
 	}
 
 	return output;
 }
 
-void User::StartDNSLookup()
+void LocalUser::StartDNSLookup()
 {
 	try
 	{
-		bool cached;
+		bool cached = false;
 		const char* sip = this->GetIPString();
+		UserResolver *res_reverse;
 
-		/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
-		if (!strncmp(sip, "0::ffff:", 8))
-			res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
-		else
-			res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+		QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
+		res_reverse = new UserResolver(this, sip, resolvtype, cached);
 
-		this->ServerInstance->AddResolver(res_reverse, cached);
+		ServerInstance->AddResolver(res_reverse, cached);
 	}
 	catch (CoreException& e)
 	{
 		ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason());
+		dns_done = true;
+		ServerInstance->stats->statsDnsBad++;
 	}
 }
 
 bool User::IsNoticeMaskSet(unsigned char sm)
 {
+	if (!isalpha(sm))
+		return false;
 	return (snomasks[sm-65]);
 }
 
 void User::SetNoticeMask(unsigned char sm, bool value)
 {
+	if (!isalpha(sm))
+		return;
 	snomasks[sm-65] = value;
 }
 
@@ -132,189 +159,142 @@ const char* User::FormatNoticeMasks()
 	return data;
 }
 
-
-
 bool User::IsModeSet(unsigned char m)
 {
+	if (!isalpha(m))
+		return false;
 	return (modes[m-65]);
 }
 
 void User::SetMode(unsigned char m, bool value)
 {
+	if (!isalpha(m))
+		return;
 	modes[m-65] = value;
 }
 
-const char* User::FormatModes()
+const char* User::FormatModes(bool showparameters)
 {
 	static char data[MAXBUF];
+	std::string params;
 	int offset = 0;
-	for (int n = 0; n < 64; n++)
-	{
-		if (modes[n])
-			data[offset++] = n+65;
-	}
-	data[offset] = 0;
-	return data;
-}
 
-void User::DecrementModes()
-{
-	ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
-	for (unsigned char n = 'A'; n <= 'z'; n++)
+	for (unsigned char n = 0; n < 64; n++)
 	{
-		if (modes[n-65])
+		if (modes[n])
 		{
-			ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
-			ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
-			if (mh)
+			data[offset++] = n + 65;
+			ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+			if (showparameters && mh && mh->GetNumParams(true))
 			{
-				ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
-				mh->ChangeCount(-1);
+				std::string p = mh->GetUserParameter(this);
+				if (p.length())
+					params.append(" ").append(p);
 			}
 		}
 	}
+	data[offset] = 0;
+	strlcat(data, params.c_str(), MAXBUF);
+	return data;
 }
 
-User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
+User::User(const std::string &uid, const std::string& sid, int type)
+	: uuid(uid), server(sid), usertype(type)
 {
-	*password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
-	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-	reset_due = ServerInstance->Time();
 	age = ServerInstance->Time();
-	Penalty = 0;
-	lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
-	ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-	quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
-	fd = -1;
-	recvq.clear();
-	sendq.clear();
-	WriteError.clear();
-	res_forward = res_reverse = NULL;
-	Visibility = NULL;
-	ip = NULL;
-	MyClass = NULL;
-	AllowedOperCommands = NULL;
-	chans.clear();
-	invites.clear();
-	memset(modes,0,sizeof(modes));
-	memset(snomasks,0,sizeof(snomasks));
-	/* Invalidate cache */
-	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+	signon = idle_lastmsg = 0;
+	registered = 0;
+	quietquit = quitting = exempt = dns_done = false;
+	quitting_sendq = false;
+	client_sa.sa.sa_family = AF_UNSPEC;
 
-	if (uid.empty())
-		strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
-	else
-		strlcpy(uuid, uid.c_str(), UUID_LENGTH);
-
-	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+	ServerInstance->Logs->Log("USERS", DEBUG, "New UUID for user: %s", uuid.c_str());
 
-	user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
-	if (finduuid == Instance->Users->uuidlist->end())
-		(*Instance->Users->uuidlist)[uuid] = this;
+	user_hash::iterator finduuid = ServerInstance->Users->uuidlist->find(uuid);
+	if (finduuid == ServerInstance->Users->uuidlist->end())
+		(*ServerInstance->Users->uuidlist)[uuid] = this;
 	else
 		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
-User::~User()
+LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
+	: User(ServerInstance->GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this),
+	localuseriter(ServerInstance->Users->local_users.end()),
+	bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0),
+	already_sent(0)
 {
-	/* NULL for remote users :) */
-	if (this->MyClass)
-	{
-		this->MyClass->RefCount--;
-		ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %u", this->MyClass->RefCount);
-	}
-	if (this->AllowedOperCommands)
-	{
-		delete AllowedOperCommands;
-		AllowedOperCommands = NULL;
-	}
-
-	this->InvalidateCache();
-	this->DecrementModes();
-
-	if (ip)
-	{
-		ServerInstance->Users->RemoveCloneCounts(this);
-
-		if (this->GetProtocolFamily() == AF_INET)
-		{
-			delete (sockaddr_in*)ip;
-		}
-#ifdef SUPPORT_IP6LINKS
-		else
-		{
-			delete (sockaddr_in6*)ip;
-		}
-#endif
-	}
+	ident = "unknown";
+	lastping = 0;
+	eh.SetFd(myfd);
+	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
+	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
+	dhost = host = GetIPString();
+}
 
-	ServerInstance->Users->uuidlist->erase(uuid);
+User::~User()
+{
+	if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end())
+		ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str());
 }
 
-char* User::MakeHost()
+const std::string& User::MakeHost()
 {
-	if (this->cached_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 = strdup(nhost);
+	this->cached_makehost.assign(nhost);
 
 	return this->cached_makehost;
 }
 
-char* User::MakeHostIP()
+const std::string& User::MakeHostIP()
 {
-	if (this->cached_hostip)
+	if (!this->cached_hostip.empty())
 		return this->cached_hostip;
 
 	char ihost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = ihost;
-	for(char* n = ident; *n; n++)
+	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 = strdup(ihost);
+	this->cached_hostip = ihost;
 
 	return this->cached_hostip;
 }
 
-void User::CloseSocket()
-{
-	ServerInstance->SE->Shutdown(this, 2);
-	ServerInstance->SE->Close(this);
-}
-
-char* User::GetFullHost()
+const std::string& User::GetFullHost()
 {
-	if (this->cached_fullhost)
+	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;
 
-	this->cached_fullhost = strdup(result);
+	this->cached_fullhost = result;
 
 	return this->cached_fullhost;
 }
@@ -325,457 +305,464 @@ char* User::MakeWildHost()
 	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 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* User::GetFullRealHost()
+const std::string& User::GetFullRealHost()
 {
-	if (this->cached_fullrealhost)
+	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;
 
-	this->cached_fullrealhost = strdup(fresult);
+	this->cached_fullrealhost = fresult;
 
 	return this->cached_fullrealhost;
 }
 
-bool User::IsInvited(const irc::string &channel)
+bool LocalUser::IsInvited(const irc::string &channel)
 {
-	time_t now = time(NULL);
-	InvitedList::iterator safei;
-	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
-	{
-		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;
+	Channel* chan = ServerInstance->FindChan(channel.c_str());
+	if (!chan)
+		return false;
+
+	return (Invitation::Find(chan, this) != NULL);
 }
 
-InvitedList* User::GetInviteList()
+InviteList& LocalUser::GetInviteList()
 {
-	time_t now = time(NULL);
-	/* 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;
+	RemoveExpiredInvites();
+	return invites;
 }
 
-void User::InviteTo(const irc::string &channel, time_t invtimeout)
+void LocalUser::InviteTo(const irc::string &channel, time_t invtimeout)
 {
-	time_t now = time(NULL);
-	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)
+	Channel* chan = ServerInstance->FindChan(channel.c_str());
+	if (chan)
+		Invitation::Create(chan, this, invtimeout);
+}
+
+void LocalUser::RemoveInvite(const irc::string &channel)
+{
+	Channel* chan = ServerInstance->FindChan(channel.c_str());
+	if (chan)
 	{
-		if (channel == i->first)
+		Invitation* inv = Invitation::Find(chan, this);
+		if (inv)
 		{
-			if (i->second != 0 && invtimeout > i->second)
-			{
-				i->second = invtimeout;
-			}
+			inv->cull();
+			delete inv;
 		}
 	}
-	invites.push_back(std::make_pair(channel, invtimeout));
 }
 
-void User::RemoveInvite(const irc::string &channel)
+void LocalUser::RemoveExpiredInvites()
 {
-	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
-	{
-		if (channel == i->first)
-		{
-			invites.erase(i);
-			return;
-	 	}
-	}
+	Invitation::Find(NULL, this);
 }
 
-bool User::HasPermission(const std::string &command)
+bool User::HasModePermission(unsigned char, ModeType)
 {
-	/*
-	 * users on remote servers can completely bypass all permissions based checks.
-	 * This prevents desyncs when one server has different type/class tags to another.
-	 * That having been said, this does open things up to the possibility of source changes
-	 * allowing remote kills, etc - but if they have access to the src, they most likely have
-	 * access to the conf - so it's an end to a means either way.
-	 */
-	if (!IS_LOCAL(this))
-		return true;
+	return true;
+}
+
+bool LocalUser::HasModePermission(unsigned char mode, ModeType type)
+{
+	if (!IS_OPER(this))
+		return false;
+
+	if (mode < 'A' || mode > ('A' + 64)) return false;
+
+	return ((type == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
+
+}
+/*
+ * users on remote servers can completely bypass all permissions based checks.
+ * This prevents desyncs when one server has different type/class tags to another.
+ * That having been said, this does open things up to the possibility of source changes
+ * allowing remote kills, etc - but if they have access to the src, they most likely have
+ * access to the conf - so it's an end to a means either way.
+ */
+bool User::HasPermission(const std::string&)
+{
+	return true;
+}
 
+bool LocalUser::HasPermission(const std::string &command)
+{
 	// are they even an oper at all?
 	if (!IS_OPER(this))
 	{
 		return false;
 	}
 
-	if (!AllowedOperCommands)
-		return false;
-
-	if (AllowedOperCommands->find(command) != AllowedOperCommands->end())
+	if (oper->AllowedOperCommands.find(command) != oper->AllowedOperCommands.end())
 		return true;
-	else if (AllowedOperCommands->find("*") != AllowedOperCommands->end())
+	else if (oper->AllowedOperCommands.find("*") != oper->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 User::AddBuffer(std::string a)
+bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 {
-	try
-	{
-		std::string::size_type i = a.rfind('\r');
-
-		while (i != std::string::npos)
-		{
-			a.erase(i, 1);
-			i = a.rfind('\r');
-		}
-
-		if (a.length())
-			recvq.append(a);
+	return true;
+}
 
-		if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
-		{
-			this->SetWriteError("RecvQ exceeded");
-			ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
-			return false;
-		}
+bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy)
+{
+	if (!IS_OPER(this))
+	{
+		if (noisy)
+			this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
+		return false;
+	}
 
+	if (oper->AllowedPrivs.find(privstr) != oper->AllowedPrivs.end())
+	{
 		return true;
 	}
-
-	catch (...)
+	else if (oper->AllowedPrivs.find("*") != oper->AllowedPrivs.end())
 	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::AddBuffer()");
-		return false;
+		return true;
 	}
-}
 
-bool User::BufferIsReady()
-{
-	return (recvq.find('\n') != std::string::npos);
+	if (noisy)
+		this->WriteServ("NOTICE %s :Oper type %s does not have access to priv %s", this->nick.c_str(), oper->NameStr(), privstr.c_str());
+	return false;
 }
 
-void User::ClearBuffer()
+void UserIOHandler::OnDataReady()
 {
-	recvq.clear();
-}
+	if (user->quitting)
+		return;
 
-std::string User::GetBuffer()
-{
-	try
+	if (recvq.length() > user->MyClass->GetRecvqMax() && !user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		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.
-		 */
-		std::string::iterator t = recvq.begin();
-		while (t != recvq.end() && (*t == '\r' || *t == '\n'))
-		{
-			recvq.erase(t);
-			t = recvq.begin();
-		}
+		ServerInstance->Users->QuitUser(user, "RecvQ exceeded");
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",
+			user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax());
+		return;
+	}
+	unsigned long sendqmax = ULONG_MAX;
+	if (!user->HasPrivPermission("users/flood/increased-buffers"))
+		sendqmax = user->MyClass->GetSendqSoftMax();
+	unsigned long penaltymax = ULONG_MAX;
+	if (!user->HasPrivPermission("users/flood/no-fakelag"))
+		penaltymax = user->MyClass->GetPenaltyThreshold() * 1000;
 
-		for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
+	{
+		std::string line;
+		line.reserve(MAXBUF);
+		std::string::size_type qpos = 0;
+		while (qpos < recvq.length())
 		{
-			/* Find the first complete line, return it as the
-			 * result, and leave the recvq as whats left
-			 */
-			if (*x == '\n')
+			char c = recvq[qpos++];
+			switch (c)
 			{
-				std::string ret = std::string(recvq.begin(), x);
-				recvq.erase(recvq.begin(), x + 1);
-				return ret;
+			case '\0':
+				c = ' ';
+				break;
+			case '\r':
+				continue;
+			case '\n':
+				goto eol_found;
 			}
+			if (line.length() < MAXBUF - 2)
+				line.push_back(c);
 		}
-		return "";
-	}
+		// if we got here, the recvq ran out before we found a newline
+		return;
+eol_found:
+		// just found a newline. Terminate the string, and pull it out of recvq
+		recvq = recvq.substr(qpos);
 
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
-		return "";
+		// TODO should this be moved to when it was inserted in recvq?
+		ServerInstance->stats->statsRecv += qpos;
+		user->bytes_in += qpos;
+		user->cmds_in++;
+
+		ServerInstance->Parser->ProcessBuffer(line, user);
+		if (user->quitting)
+			return;
 	}
+	if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
+		ServerInstance->Users->QuitUser(user, "Excess Flood");
 }
 
-void User::AddWriteBuf(const std::string &data)
+void UserIOHandler::AddWriteBuf(const std::string &data)
 {
-	if (*this->GetWriteError())
+	if (user->quitting_sendq)
 		return;
-
-	if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+	if (!user->quitting && getSendQSize() + data.length() > user->MyClass->GetSendqHardMax() &&
+		!user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		/*
-		 * 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->SNO->WriteToSnoMask('A', "User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
+		user->quitting_sendq = true;
+		ServerInstance->GlobalCulls.AddSQItem(user);
 		return;
 	}
 
-	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);
+	// We still want to append data to the sendq of a quitting user,
+	// e.g. their ERROR message that says 'closing link'
+
+	WriteData(data);
 }
 
-// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void User::FlushWriteBuf()
+void UserIOHandler::OnError(BufferedSocketError)
 {
-	try
-	{
-		if ((this->fd == FD_MAGIC_NUMBER) || (*this->GetWriteError()))
-		{
-			sendq.clear();
-		}
-		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);
+	ServerInstance->Users->QuitUser(user, getError());
+}
 
-			if (n_sent == -1)
-			{
-				if (errno == EAGAIN)
-				{
-					/* The socket buffer is full. This isnt fatal,
-					 * try again later.
-					 */
-					this->ServerInstance->SE->WantWrite(this);
-				}
-				else
-				{
-					/* Fatal error, set write error and bail
-					 */
-					this->SetWriteError(errno ? strerror(errno) : "EOF from client");
-					return;
-				}
-			}
-			else
-			{
-				/* 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);
-			}
-		}
-	}
+CullResult User::cull()
+{
+	if (!quitting)
+		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
+	PurgeEmptyChannels();
 
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()");
-	}
+	if (client_sa.sa.sa_family != AF_UNSPEC)
+		ServerInstance->Users->RemoveCloneCounts(this);
+
+	return Extensible::cull();
+}
 
-	if (this->sendq.empty())
+CullResult LocalUser::cull()
+{
+	// The iterator is initialized to local_users.end() in the constructor. It is
+	// overwritten in UserManager::AddUser() with the real iterator so this check
+	// is only a precaution currently.
+	if (localuseriter != ServerInstance->Users->local_users.end())
 	{
-		FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
+		ServerInstance->Users->local_count--;
+		ServerInstance->Users->local_users.erase(localuseriter);
 	}
+	else
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick);
+
+	ClearInvites();
+	eh.cull();
+	return User::cull();
 }
 
-void User::SetWriteError(const std::string &error)
+CullResult FakeUser::cull()
 {
-	// don't try to set the error twice, its already set take the first string.
-	if (this->WriteError.empty())
-		this->WriteError = error;
+	// Fake users don't quit, they just get culled.
+	quitting = true;
+	ServerInstance->Users->clientlist->erase(nick);
+	ServerInstance->Users->uuidlist->erase(uuid);
+	return User::cull();
 }
 
-const char* User::GetWriteError()
+void User::Oper(OperInfo* info)
 {
-	return this->WriteError.c_str();
+	if (this->IsModeSet('o'))
+		this->UnOper();
+
+	this->modes[UM_OPERATOR] = 1;
+	this->oper = info;
+	this->WriteServ("MODE %s :+o", this->nick.c_str());
+	FOREACH_MOD(I_OnOper, OnOper(this, info->name));
+
+	std::string opername;
+	if (info->oper_block)
+		opername = info->oper_block->getString("name");
+
+	if (IS_LOCAL(this))
+	{
+		LocalUser* l = IS_LOCAL(this);
+		std::string vhost = oper->getConfig("vhost");
+		if (!vhost.empty())
+			l->ChangeDisplayedHost(vhost.c_str());
+		std::string opClass = oper->getConfig("class");
+		if (!opClass.empty())
+			l->SetClass(opClass);
+	}
+
+	ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",
+		nick.c_str(), ident.c_str(), host.c_str(), oper->NameStr(), opername.c_str());
+	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->NameStr());
+
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->NameStr());
+	ServerInstance->Users->all_opers.push_back(this);
+
+	// Expand permissions from config for faster lookup
+	if (IS_LOCAL(this))
+		oper->init();
+
+	FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername));
 }
 
-void User::Oper(const std::string &opertype, const std::string &opername)
+void OperInfo::init()
 {
-	char* mycmd;
-	char* savept;
-	char* savept2;
+	AllowedOperCommands.clear();
+	AllowedPrivs.clear();
+	AllowedUserModes.reset();
+	AllowedChanModes.reset();
+	AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
-	try
+	for(std::vector<reference<ConfigTag> >::iterator iter = class_blocks.begin(); iter != class_blocks.end(); ++iter)
 	{
-		this->modes[UM_OPERATOR] = 1;
-		this->WriteServ("MODE %s :+o", this->nick);
-		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Logs->Log("OPER", DEFAULT, "%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->Users->all_opers.push_back(this);
-
-		opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
-		if (iter_opertype != ServerInstance->Config->opertypes.end())
+		ConfigTag* tag = *iter;
+		std::string mycmd, mypriv;
+		/* Process commands */
+		irc::spacesepstream CommandList(tag->getString("commands"));
+		while (CommandList.GetToken(mycmd))
 		{
+			AllowedOperCommands.insert(mycmd);
+		}
 
-			if (AllowedOperCommands)
-				AllowedOperCommands->clear();
-			else
-				AllowedOperCommands = new std::map<std::string, bool>;
+		irc::spacesepstream PrivList(tag->getString("privs"));
+		while (PrivList.GetToken(mypriv))
+		{
+			AllowedPrivs.insert(mypriv);
+		}
 
-			char* Classes = strdup(iter_opertype->second);
-			char* myclass = strtok_r(Classes," ",&savept);
-			while (myclass)
+		std::string modes = tag->getString("usermodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
+		{
+			if (*c == '*')
 			{
-				operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
-				if (iter_operclass != ServerInstance->Config->operclass.end())
-				{
-					char* CommandList = strdup(iter_operclass->second);
-					mycmd = strtok_r(CommandList," ",&savept2);
-					while (mycmd)
-					{
-						this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
-						mycmd = strtok_r(NULL," ",&savept2);
-					}
-					free(CommandList);
-				}
-				myclass = strtok_r(NULL," ",&savept);
+				this->AllowedUserModes.set();
+			}
+			else if (*c >= 'A' && *c <= 'z')
+			{
+				this->AllowedUserModes[*c - 'A'] = true;
 			}
-			free(Classes);
 		}
 
-		FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
-	}
-
-	catch (...)
-	{
-		ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()");
+		modes = tag->getString("chanmodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
+		{
+			if (*c == '*')
+			{
+				this->AllowedChanModes.set();
+			}
+			else if (*c >= 'A' && *c <= 'z')
+			{
+				this->AllowedChanModes[*c - 'A'] = true;
+			}
+		}
 	}
 }
 
 void User::UnOper()
 {
-	if (IS_OPER(this))
+	if (!IS_OPER(this))
+		return;
+
+	/*
+	 * unset their oper type (what IS_OPER checks).
+	 * note, order is important - this must come before modes as -o attempts
+	 * to call UnOper. -- w00t
+	 */
+	oper = NULL;
+
+
+	/* Remove all oper only modes from the user when the deoper - Bug #466*/
+	std::string moderemove("-");
+
+	for (unsigned char letter = 'A'; letter <= 'z'; letter++)
 	{
-		// unset their oper type (what IS_OPER checks), and remove +o
-		*this->oper = 0;
-		this->modes[UM_OPERATOR] = 0;
-			
-		// remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404
-		ServerInstance->Users->all_opers.remove(this);
-
-		if (AllowedOperCommands)
-		{
-			delete AllowedOperCommands;
-			AllowedOperCommands = NULL;
-		}
+		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+		if (mh && mh->NeedsOper())
+			moderemove += letter;
 	}
-}
 
-void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
-{
-	Instance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
-	user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
-	user->quietquit = false;
-	user->quitmsg = quitreason;
 
-	if (!*operreason)
-		user->operquitmsg = quitreason;
-	else
-		user->operquitmsg = operreason;
+	std::vector<std::string> parameters;
+	parameters.push_back(this->nick);
+	parameters.push_back(moderemove);
+
+	ServerInstance->Parser->CallHandler("MODE", parameters, this);
+
+	/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
+	ServerInstance->Users->all_opers.remove(this);
 
-	Instance->GlobalCulls.AddItem(user);
+	this->modes[UM_OPERATOR] = 0;
 }
 
 /* adds or updates an entry in the whowas list */
 void User::AddToWhoWas()
 {
-	Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
-	if (whowas_command)
+	Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so");
+	if (whowas)
 	{
-		std::deque<classbase*> params;
-		params.push_back(this);
-		whowas_command->HandleInternal(WHOWAS_ADD, params);
+		WhowasRequest req(NULL, whowas, WhowasRequest::WHOWAS_ADD);
+		req.user = this;
+		req.Send();
 	}
 }
 
 /*
  * Check class restrictions
  */
-void User::CheckClass()
+void LocalUser::CheckClass()
 {
 	ConnectClass* a = this->MyClass;
 
-	if ((!a) || (a->GetType() == CC_DENY))
+	if (!a)
 	{
-		User::QuitUser(ServerInstance, this, "Unauthorised connection");
+		ServerInstance->Users->QuitUser(this, "Access denied by configuration");
+		return;
+	}
+	else if (a->type == CC_DENY)
+	{
+		ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection"));
 		return;
 	}
 	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
-		User::QuitUser(ServerInstance, 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());
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
+		if (a->maxconnwarn)
+			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
-		User::QuitUser(ServerInstance, 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());
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
+		if (a->maxconnwarn)
+			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
 
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
-	this->timeout = ServerInstance->Time() + a->GetRegTimeout();
-	this->MaxChans = a->GetMaxChans();
 }
 
-void User::FullConnect()
+bool User::CheckLines(bool doZline)
+{
+	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
+
+	if (!this->exempt)
+	{
+		for (int n = 0; check[n]; ++n)
+		{
+			XLine *r = ServerInstance->XLines->MatchesLine(check[n], this);
+
+			if (r)
+			{
+				r->Apply(this);
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+void LocalUser::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
@@ -786,58 +773,48 @@ void User::FullConnect()
 	 * may put the user into a totally seperate class with different restrictions! so we *must* check again.
 	 * Don't remove this! -- w00t
 	 */
-	this->SetClass();
-	
-	/* 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)
-	{
-		User::QuitUser(ServerInstance, this, "Invalid password");
+	MyClass = NULL;
+	SetClass();
+	CheckClass();
+	CheckLines();
+
+	if (quitting)
 		return;
-	}
 
-	if (!this->exempt)
-	{
-		GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this);
+	if (ServerInstance->Config->WelcomeNotice)
+		this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str());
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
+	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
 
-		if (r)
-		{
-			r->Apply(this);
-			return;
-		}
-
-		KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this);
-
-		if (n)
-		{
-			n->Apply(this);
-			return;
-		}
-	}
-
-	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());
+	std::string umlist = ServerInstance->Modes->UserModeList();
+	std::string cmlist = ServerInstance->Modes->ChannelModeList();
+	std::string pmlist = ServerInstance->Modes->ParaModeList();
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str());
 
 	ServerInstance->Config->Send005(this);
-
-	this->WriteServ("042 %s %s :your unique ID", this->nick, this->uuid);
-
-
-	this->ShowMOTD();
+	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
 	/* Now registered */
 	if (ServerInstance->Users->unregistered_count)
 		ServerInstance->Users->unregistered_count--;
 
-	/* Trigger LUSERS output, give modules a chance too */
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnPreCommand, OnPreCommand("LUSERS", NULL, 0, this, true, "LUSERS"));
+	/* Trigger MOTD and LUSERS output, give modules a chance too */
+	ModResult MOD_RESULT;
+	std::string command("MOTD");
+	std::vector<std::string> parameters;
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler("LUSERS", NULL, 0, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
+
+	MOD_RESULT = MOD_RES_PASSTHRU;
+	command = "LUSERS";
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
+	if (!MOD_RESULT)
+		ServerInstance->Parser->CallHandler(command, parameters, this);
+
+	if (ServerInstance->Config->RawLog)
+		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
 
 	/*
 	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
@@ -849,259 +826,252 @@ void User::FullConnect()
 
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
+		this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().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(), "", "");
-}
-
-/** 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
- */
-User* User::UpdateNickHash(const char* New)
-{
-	//user_hash::iterator newnick;
-	user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
-
-	if (!strcasecmp(this->nick,New))
-		return oldnick->second;
-
-	if (oldnick == ServerInstance->Users->clientlist->end())
-		return NULL; /* doesnt exist */
-
-	User* olduser = oldnick->second;
-	(*(ServerInstance->Users->clientlist))[New] = olduser;
-	ServerInstance->Users->clientlist->erase(oldnick);
-	return olduser;
+	// reset the flood penalty (which could have been raised due to things like auto +x)
+	CommandFloodPenalty = 0;
 }
 
 void User::InvalidateCache()
 {
 	/* Invalidate cache */
-	if (cached_fullhost)
-		free(cached_fullhost);
-	if (cached_hostip)
-		free(cached_hostip);
-	if (cached_makehost)
-		free(cached_makehost);
-	if (cached_fullrealhost)
-		free(cached_fullrealhost);
-	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+	cached_fullhost.clear();
+	cached_hostip.clear();
+	cached_makehost.clear();
+	cached_fullrealhost.clear();
 }
 
-bool User::ForceNickChange(const char* newnick)
+bool User::ChangeNick(const std::string& newnick, bool force)
 {
-	/*
-	 * XXX this makes no sense..
-	 * why do we do nothing for change on users not REG_ALL?
-	 * why do we trigger events twice for everyone previously (and just them now)
-	 * i think the first if () needs removing totally, or? -- w00t
-	 */
-	if (this->registered != REG_ALL)
+	if (quitting)
 	{
-		int MOD_RESULT = 0;
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Attempted to change nick of a quitting user: " + this->nick);
+		return false;
+	}
 
-		this->InvalidateCache();
+	ModResult MOD_RESULT;
 
-		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+	if (force)
+		ServerInstance->NICKForced.set(this, 1);
+	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+	ServerInstance->NICKForced.set(this, 0);
 
-		if (MOD_RESULT)
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
+	if (MOD_RESULT == MOD_RES_DENY)
+	{
+		ServerInstance->stats->statsCollisions++;
+		return false;
+	}
 
-		if (ServerInstance->XLines->MatchesLine("Q",newnick))
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
+	if (assign(newnick) == assign(nick))
+	{
+		// case change, don't need to check Q:lines and such
+		// and, if it's identical including case, we can leave right now
+		if (newnick == nick)
+			return true;
 	}
 	else
 	{
-		std::deque<classbase*> dummy;
-		Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
-		if (nickhandler) // wtfbbq, when would this not be here
+		/*
+		 * Don't check Q:Lines if it's a server-enforced change, just on the off-chance some fucking *moron*
+		 * tries to Q:Line SIDs, also, this means we just get our way period, as it really should be.
+		 * Thanks Kein for finding this. -- w00t
+		 *
+		 * Also don't check Q:Lines for remote nickchanges, they should have our Q:Lines anyway to enforce themselves.
+		 *		-- w00t
+		 */
+		if (IS_LOCAL(this) && !force)
 		{
-			nickhandler->HandleInternal(1, dummy);
-			bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
-			nickhandler->HandleInternal(0, dummy);
-			return result;
+			XLine* mq = ServerInstance->XLines->MatchesLine("Q",newnick);
+			if (mq)
+			{
+				if (this->registered == REG_ALL)
+				{
+					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
+						newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str());
+				}
+				this->WriteNumeric(432, "%s %s :Invalid nickname: %s",this->nick.c_str(), newnick.c_str(), mq->reason.c_str());
+				return false;
+			}
+
+			if (ServerInstance->Config->RestrictBannedUsers)
+			{
+				for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+				{
+					Channel *chan = *i;
+					if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this))
+					{
+						this->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", this->nick.c_str(), chan->name.c_str());
+						return false;
+					}
+				}
+			}
+		}
+
+		/*
+		 * Uh oh.. if the nickname is in use, and it's not in use by the person using it (doh) --
+		 * then we have a potential collide. Check whether someone else is camping on the nick
+		 * (i.e. connect -> send NICK, don't send USER.) If they are camping, force-change the
+		 * camper to their UID, and allow the incoming nick change.
+		 *
+		 * If the guy using the nick is already using it, tell the incoming nick change to gtfo,
+		 * because the nick is already (rightfully) in use. -- w00t
+		 */
+		User* InUse = ServerInstance->FindNickOnly(newnick);
+		if (InUse && (InUse != this))
+		{
+			if (InUse->registered != REG_ALL)
+			{
+				/* force the camper to their UUID, and ask them to re-send a NICK. */
+				InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str());
+				InUse->WriteNumeric(433, "%s %s :Nickname overruled.", InUse->nick.c_str(), InUse->nick.c_str());
+
+				ServerInstance->Users->clientlist->erase(InUse->nick);
+				(*(ServerInstance->Users->clientlist))[InUse->uuid] = InUse;
+
+				InUse->nick = InUse->uuid;
+				InUse->InvalidateCache();
+				InUse->registered &= ~REG_NICK;
+			}
+			else
+			{
+				/* No camping, tell the incoming user  to stop trying to change nick ;p */
+				this->WriteNumeric(433, "%s %s :Nickname is already in use.", this->registered >= REG_NICK ? this->nick.c_str() : "*", newnick.c_str());
+				return false;
+			}
 		}
 	}
 
-	// Unreachable.
-	return false;
+	if (this->registered == REG_ALL)
+		this->WriteCommon("NICK %s",newnick.c_str());
+	std::string oldnick = nick;
+	nick = newnick;
+
+	InvalidateCache();
+	ServerInstance->Users->clientlist->erase(oldnick);
+	(*(ServerInstance->Users->clientlist))[newnick] = this;
+
+	if (registered == REG_ALL)
+		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(this,oldnick));
+
+	return true;
 }
 
-void User::SetSockAddr(int protocol_family, const char* sip, int port)
+int LocalUser::GetServerPort()
 {
-	this->cachedip = "";
-
-	switch (protocol_family)
+	switch (this->server_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
-		{
-			sockaddr_in6* sin = new sockaddr_in6;
-			sin->sin6_family = AF_INET6;
-			sin->sin6_port = port;
-			inet_pton(AF_INET6, sip, &sin->sin6_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-#endif
+			return htons(this->server_sa.in6.sin6_port);
 		case AF_INET:
-		{
-			sockaddr_in* sin = new sockaddr_in;
-			sin->sin_family = AF_INET;
-			sin->sin_port = port;
-			inet_pton(AF_INET, sip, &sin->sin_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-		default:
-			ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
-		break;
+			return htons(this->server_sa.in4.sin_port);
 	}
+	return 0;
 }
 
-int User::GetPort()
+const char* User::GetIPString()
 {
-	if (this->ip == NULL)
-		return 0;
+	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(cachedip.begin(),1,'0');
+	}
+
+	return cachedip.c_str();
+}
 
-	switch (this->GetProtocolFamily())
+irc::sockets::cidr_mask User::GetCIDRMask()
+{
+	int range = 0;
+	switch (client_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
-		{
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			return sin->sin6_port;
-		}
-		break;
-#endif
+			range = ServerInstance->Config->c_ipv6_range;
+			break;
 		case AF_INET:
-		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			return sin->sin_port;
-		}
-		break;
-		default:
-		break;
+			range = ServerInstance->Config->c_ipv4_range;
+			break;
 	}
-	return 0;
+	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-int User::GetProtocolFamily()
+bool User::SetClientIP(const char* sip, bool recheck_eline)
 {
-	if (this->ip == NULL)
-		return 0;
-
-	sockaddr_in* sin = (sockaddr_in*)this->ip;
-	return sin->sin_family;
+	cachedip.clear();
+	cached_hostip.clear();
+	return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
-/*
- * XXX the duplication here is horrid..
- * do we really need two methods doing essentially the same thing?
- */
-const char* User::GetIPString()
+void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
 {
-	static char buf[1024];
+	cachedip.clear();
+	cached_hostip.clear();
+	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
+}
 
-	if (this->ip == NULL)
-		return "";
+bool LocalUser::SetClientIP(const char* sip, bool recheck_eline)
+{
+	irc::sockets::sockaddrs sa;
+	if (!irc::sockets::aptosa(sip, 0, sa))
+		// Invalid
+		return false;
 
-	if (!this->cachedip.empty())
-		return this->cachedip.c_str();
+	LocalUser::SetClientIP(sa, recheck_eline);
+	return true;
+}
 
-	switch (this->GetProtocolFamily())
+void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
+{
+	if (sa != client_sa)
 	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			static char temp[1024];
+		User::SetClientIP(sa);
+		if (recheck_eline)
+			this->exempt = (ServerInstance->XLines->MatchesLine("E", this) != NULL);
 
-			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 == ':')
-			{
-				strlcpy(&temp[1], buf, sizeof(temp) - 1);
-				*temp = '0';
-				this->cachedip = temp;
-				return temp;
-			}
-			
-			this->cachedip = buf;
-			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));
-			this->cachedip = buf;
-			return buf;
-		}
-		break;
-		default:
-		break;
+		FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this));
 	}
-	
-	// Unreachable, probably
-	return "";
 }
 
-/** 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.
- */
-void User::Write(std::string text)
+static std::string wide_newline("\r\n");
+
+void User::Write(const std::string& text)
+{
+}
+
+void User::Write(const char *text, ...)
+{
+}
+
+void LocalUser::Write(const std::string& text)
 {
-	if (!ServerInstance->SE->BoundsCheckFd(this))
+	if (!ServerInstance->SE->BoundsCheckFd(&eh))
 		return;
 
-	try
+	if (text.length() > MAXBUF - 2)
 	{
-		ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
-		text.append("\r\n");
-	}
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"Exception in User::Write() std::string::append");
+		// this should happen rarely or never. Crop the string at 512 and try again.
+		std::string try_again = text.substr(0, MAXBUF - 2);
+		Write(try_again);
 		return;
 	}
 
-	if (ServerInstance->Config->GetIOHook(this->GetPort()))
-	{
-		/* 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());
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-		}
-	}
-	else
-	{
-		this->AddWriteBuf(text);
-	}
-	ServerInstance->stats->statsSent += text.length();
-	this->ServerInstance->SE->WantWrite(this);
+	ServerInstance->Logs->Log("USEROUTPUT", RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str());
+
+	eh.AddWriteBuf(text);
+	eh.AddWriteBuf(wide_newline);
+
+	ServerInstance->stats->statsSent += text.length() + 2;
+	this->bytes_out += text.length() + 2;
+	this->cmds_out++;
 }
 
 /** Write()
  */
-void User::Write(const char *text, ...)
+void LocalUser::Write(const char *text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1115,10 +1085,7 @@ void User::Write(const char *text, ...)
 
 void User::WriteServ(const std::string& text)
 {
-	char textbuffer[MAXBUF];
-
-	snprintf(textbuffer,MAXBUF,":%s %s",ServerInstance->Config->ServerName,text.c_str());
-	this->Write(std::string(textbuffer));
+	this->Write(":%s %s",ServerInstance->Config->ServerName.c_str(),text.c_str());
 }
 
 /** WriteServ()
@@ -1137,11 +1104,37 @@ void User::WriteServ(const char* 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];
+	ModResult MOD_RESULT;
+
+	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
+
+	if (MOD_RESULT == MOD_RES_DENY)
+		return;
+
+	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName.c_str(), 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));
 }
@@ -1181,164 +1174,166 @@ void User::WriteTo(User *dest, const std::string &data)
 	dest->WriteFrom(this, data);
 }
 
-
 void User::WriteCommon(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
-	if (this->registered != REG_ALL)
+	if (this->registered != REG_ALL || quitting)
 		return;
 
+	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
+
 	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteCommon(std::string(textbuffer));
-}
-
-void User::WriteCommon(const std::string &text)
-{
-	bool sent_to_at_least_one = false;
-	char tb[MAXBUF];
-
-	if (this->registered != REG_ALL)
-		return;
-
-	uniq_id++;
-
-	/* We dont want to be doing this n times, just once */
-	snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
-	std::string out = tb;
-
-	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 ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
-			{
-				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->Write(std::string(tb));
-	}
+	this->WriteCommonRaw(std::string(textbuffer), true);
 }
 
-
-/* write a formatted string to all users who share at least one common
- * channel, NOT including the source user e.g. for use in QUIT
- */
-
 void User::WriteCommonExcept(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
+	if (this->registered != REG_ALL || quitting)
+		return;
+
+	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
+
 	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteCommonExcept(std::string(textbuffer));
+	this->WriteCommonRaw(std::string(textbuffer), false);
 }
 
-void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
+void User::WriteCommonRaw(const std::string &line, bool include_self)
 {
-	char tb1[MAXBUF];
-	char tb2[MAXBUF];
-
-	if (this->registered != REG_ALL)
+	if (this->registered != REG_ALL || quitting)
 		return;
 
-	uniq_id++;
-	snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost(),normal_text.c_str());
-	snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost(),oper_text.c_str());
-	std::string out1 = tb1;
-	std::string out2 = tb2;
+	LocalUser::already_sent_id++;
+
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
+
+	exceptions[this] = include_self;
 
-	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	{
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
+		{
+			u->already_sent = LocalUser::already_sent_id;
+			if (i->second)
+				u->Write(line);
+		}
+	}
+	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
 	{
-		CUList *ulist = v->first->GetUsers();
-		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		Channel* c = *v;
+		const UserMembList* ulist = c->GetUsers();
+		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			if (this != i->first)
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && u->already_sent != LocalUser::already_sent_id)
 			{
-				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);
-				}
+				u->already_sent = LocalUser::already_sent_id;
+				u->Write(line);
 			}
 		}
 	}
 }
 
-void User::WriteCommonExcept(const std::string &text)
+void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
 {
 	char tb1[MAXBUF];
-	std::string out1;
+	char tb2[MAXBUF];
 
 	if (this->registered != REG_ALL)
 		return;
 
-	uniq_id++;
-	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
-	out1 = tb1;
+	already_sent_t uniq_id = ++LocalUser::already_sent_id;
 
-	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	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;
+
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
+
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	{
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
+		{
+			u->already_sent = uniq_id;
+			if (i->second)
+				u->Write(IS_OPER(u) ? out2 : out1);
+		}
+	}
+	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
 	{
-		CUList *ulist = v->first->GetUsers();
-		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		const UserMembList* ulist = (*v)->GetUsers();
+		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			if (this != i->first)
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && (u->already_sent != uniq_id))
 			{
-				if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
-				{
-					already_sent[i->first->fd] = uniq_id;
-					i->first->Write(out1);
-				}
+				u->already_sent = uniq_id;
+				u->Write(IS_OPER(u) ? out2 : out1);
 			}
 		}
 	}
-
 }
 
-void User::WriteWallOps(const std::string &text)
+void LocalUser::SendText(const std::string& line)
 {
-	if (!IS_OPER(this) && IS_LOCAL(this))
-		return;
+	Write(line);
+}
 
-	std::string wallop("WALLOPS :");
-	wallop.append(text);
+void RemoteUser::SendText(const std::string& line)
+{
+	ServerInstance->PI->PushToClient(this, line);
+}
 
-	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
-	{
-		User* t = *i;
-		if (t->IsModeSet('w'))
-			this->WriteTo(t,wallop);
-	}
+void FakeUser::SendText(const std::string& line)
+{
 }
 
-void User::WriteWallOps(const char* text, ...)
+void User::SendText(const char *text, ...)
 {
-	char textbuffer[MAXBUF];
 	va_list argsPtr;
+	char line[MAXBUF];
 
 	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	vsnprintf(line, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteWallOps(std::string(textbuffer));
+	SendText(std::string(line));
+}
+
+void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
+{
+	std::string line;
+	std::string Word;
+	while (TextStream >> Word)
+	{
+		size_t lineLength = LinePrefix.length() + line.length() + Word.length() + 13;
+		if (lineLength > MAXBUF)
+		{
+			SendText(LinePrefix + line);
+			line.clear();
+		}
+		line += " " + Word;
+	}
+	SendText(LinePrefix + line);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1364,7 +1359,7 @@ bool User::SharesChannelWith(User *other)
 		/* 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))
+		if ((*i)->HasUser(other))
 			return true;
 	}
 	return false;
@@ -1372,83 +1367,135 @@ bool User::SharesChannelWith(User *other)
 
 bool User::ChangeName(const char* gecos)
 {
-	if (!strcmp(gecos, this->fullname))
+	if (!this->fullname.compare(gecos))
 		return true;
 
 	if (IS_LOCAL(this))
 	{
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(this,gecos));
-		if (MOD_RESULT)
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (IS_LOCAL(this),gecos));
+		if (MOD_RESULT == MOD_RES_DENY)
 			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;
 }
 
+void User::DoHostCycle(const std::string &quitline)
+{
+	char buffer[MAXBUF];
+
+	if (!ServerInstance->Config->CycleHosts)
+		return;
+
+	already_sent_t silent_id = ++LocalUser::already_sent_id;
+	already_sent_t seen_id = ++LocalUser::already_sent_id;
+
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
+
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	{
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
+		{
+			if (i->second)
+			{
+				u->already_sent = seen_id;
+				u->Write(quitline);
+			}
+			else
+			{
+				u->already_sent = silent_id;
+			}
+		}
+	}
+	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+	{
+		Channel* c = *v;
+		snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
+		std::string joinline(buffer);
+		Membership* memb = c->GetUser(this);
+		std::string modeline = memb->modes;
+		if (modeline.length() > 0)
+		{
+			for(unsigned int i=0; i < memb->modes.length(); i++)
+				modeline.append(" ").append(nick);
+			snprintf(buffer, MAXBUF, ":%s MODE %s +%s",
+				ServerInstance->Config->CycleHostsFromUser ? GetFullHost().c_str() : ServerInstance->Config->ServerName.c_str(),
+				c->name.c_str(), modeline.c_str());
+			modeline = buffer;
+		}
+
+		const UserMembList *ulist = c->GetUsers();
+		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u == NULL || u == this)
+				continue;
+			if (u->already_sent == silent_id)
+				continue;
+
+			if (u->already_sent != seen_id)
+			{
+				u->Write(quitline);
+				u->already_sent = seen_id;
+			}
+			u->Write(joinline);
+			if (modeline.length() > 0)
+				u->Write(modeline);
+		}
+	}
+}
+
 bool User::ChangeDisplayedHost(const char* shost)
 {
-	if (!strcmp(shost, this->dhost))
+	if (dhost == shost)
 		return true;
 
 	if (IS_LOCAL(this))
 	{
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
-		if (MOD_RESULT)
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (IS_LOCAL(this),shost));
+		if (MOD_RESULT == MOD_RES_DENY)
 			return false;
-		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
 	}
 
-	if (this->ServerInstance->Config->CycleHosts)
-		this->WriteCommonExcept("QUIT :Changing hosts");
+	FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost));
+
+	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host";
 
 	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
-	strlcpy(this->dhost,shost,64);
+	this->dhost.assign(shost, 0, 64);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
-	{
-		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
-		{
-			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
-			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, n.c_str());
-		}
-	}
+	this->DoHostCycle(quitstr);
 
 	if (IS_LOCAL(this))
-		this->WriteServ("396 %s %s :is now your displayed 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 User::ChangeIdent(const char* newident)
 {
-	if (!strcmp(newident, this->ident))
+	if (this->ident == newident)
 		return true;
 
-	if (this->ServerInstance->Config->CycleHosts)
-		this->WriteCommonExcept("%s","QUIT :Changing ident");
+	FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident));
+
+	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
 
-	strlcpy(this->ident, newident, IDENTMAX+1);
+	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
-	{
-		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
-		{
-			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
-			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, n.c_str());
-		}
-	}
+	this->DoHostCycle(quitstr);
 
 	return true;
 }
@@ -1463,30 +1510,29 @@ void User::SendAll(const char* command, const char* text, ...)
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
+	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost().c_str(), command, textbuffer);
 	std::string fmt = formatbuffer;
 
-	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+	for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
-		(*i)->Write(fmt);
+		if ((*i)->registered == REG_ALL)
+			(*i)->Write(fmt);
 	}
 }
 
 
-std::string User::ChannelList(User* source)
+std::string User::ChannelList(User* source, bool spy)
 {
 	std::string list;
 
 	for (UCListIter 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.
+		Channel* c = *i;
+		/* If the target is the sender, neither +p nor +s is set, or
+		 * the channel contains the user, it is not a spy channel
 		 */
-		if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
-		{
-			list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
-		}
+		if (spy != (source == this || !(c->IsModeSet('p') || c->IsModeSet('s')) || c->HasUser(source)))
+			list.append(c->GetPrefixChar(this)).append(c->name).append(" ");
 	}
 
 	return list;
@@ -1496,45 +1542,29 @@ void User::SplitChanList(User* dest, const std::string &cl)
 {
 	std::string line;
 	std::ostringstream prefix;
-	std::string::size_type start, pos, length;
+	std::string::size_type start, pos;
 
 	prefix << this->nick << " " << dest->nick << " :";
 	line = prefix.str();
-	int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+	int namelen = ServerInstance->Config->ServerName.length() + 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)
+		if (line.length() + namelen + pos - 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));
-		}
+		line.append(cl.substr(start, pos - start + 1));
 	}
 
-	if (line.length())
+	if (line.length() != prefix.str().length())
 	{
 		ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
 	}
 }
 
-unsigned int User::GetMaxChans()
-{
-	return this->MaxChans;
-}
-
-
 /*
  * 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.
@@ -1542,12 +1572,11 @@ unsigned int User::GetMaxChans()
  * 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)
+void LocalUser::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())
 	{
@@ -1555,8 +1584,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (explicit_name == c->GetName() && !c->GetDisabled())
+			if (explicit_name == c->name)
 			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
 				found = c;
 			}
 		}
@@ -1566,52 +1596,77 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
 		{
 			ConnectClass* c = *i;
+			ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Checking %s", c->GetName().c_str());
 
-			if (((match(this->GetIPString(),c->GetHost().c_str(),true)) || (match(this->host,c->GetHost().c_str()))))
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnSetConnectClass, MOD_RESULT, (this,c));
+			if (MOD_RESULT == MOD_RES_DENY)
+				continue;
+			if (MOD_RESULT == MOD_RES_ALLOW)
 			{
-				if (c->GetPort())
-				{
-					if (this->GetPort() == c->GetPort() && !c->GetDisabled())
-					{
-						found = c;
-					}
-					else
-						continue;
-				}
-				else
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class forced by module to %s", c->GetName().c_str());
+				found = c;
+				break;
+			}
+
+			if (c->type == CC_NAMED)
+				continue;
+
+			bool regdone = (registered != REG_NONE);
+			if (c->config->getBool("registered", regdone) != regdone)
+				continue;
+
+			/* check if host matches.. */
+			if (!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->GetReferenceCount() >= c->limit))
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
+				continue;
+			}
+
+			/* if it requires a port ... */
+			int port = c->config->getInt("port");
+			if (port)
+			{
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", port);
+
+				/* and our port doesn't match, fail. */
+				if (this->GetServerPort() != port)
+					continue;
+			}
+
+			if (regdone && !c->config->getString("password").empty())
+			{
+				if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
 				{
-					if (!c->GetDisabled())
-						found = c;
+					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Bad password, skipping");
+					continue;
 				}
 			}
+
+			/* we stop at the first class that meets ALL critera. */
+			found = c;
+			break;
 		}
 	}
 
-	/* ensure we don't fuck things up refcount wise, only remove them from a class if we find a new one :P */
+	/*
+	 * Okay, assuming we found a class that matches.. switch us into that class, keeping refcounts up to date.
+	 */
 	if (found)
 	{
-		/* deny change if change will take class over the limit */
-		if (found->limit && (found->RefCount + 1 >= found->limit))
-		{
-			ServerInstance->Logs->Log("USERS", DEBUG, "OOPS: Connect class limit (%u) hit, denying", found->limit);
-			return this->MyClass;
-		}
-
-		/* should always be valid, but just in case .. */
-		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: %u", this->MyClass->RefCount);
-		}
-
-		this->MyClass = found;
-		this->MyClass->RefCount++;
-		ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %u", this->MyClass->RefCount);
+		MyClass = found;
 	}
-
-	return this->MyClass;
 }
 
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
@@ -1619,149 +1674,76 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
  * then their ip will be taken as 'priority' anyway, so for example,
  * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
  */
+ConnectClass* LocalUser::GetClass()
+{
+	return MyClass;
+}
+
 ConnectClass* User::GetClass()
 {
-	return this->MyClass;
+	return NULL;
 }
 
 void User::PurgeEmptyChannels()
 {
-	std::vector<Channel*> to_delete;
-
 	// firstly decrement the count on each channel
 	for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
 	{
-		f->first->RemoveAllPrefixes(this);
-		if (f->first->DelUser(this) == 0)
-		{
-			/* No users left in here, mark it for deletion */
-			try
-			{
-				to_delete.push_back(f->first);
-			}
-			catch (...)
-			{
-				ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
-			}
-		}
-	}
-
-	for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
-	{
-		Channel* thischan = *n;
-		chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
-		if (i2 != ServerInstance->chanlist->end())
-		{
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-			delete i2->second;
-			ServerInstance->chanlist->erase(i2);
-			this->chans.erase(*n);
-		}
+		Channel* c = *f;
+		c->DelUser(this);
 	}
 
 	this->UnOper();
 }
 
-void User::ShowMOTD()
-{
-	if (!ServerInstance->Config->MOTD.size())
-	{
-		this->WriteServ("422 %s :Message of the day file is missing.",this->nick);
-		return;
-	}
-	this->WriteServ("375 %s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
-
-	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-		this->WriteServ("372 %s :- %s",this->nick,i->c_str());
-
-	this->WriteServ("376 %s :End of message of the day.", this->nick);
-}
-
-void User::ShowRULES()
-{
-	if (!ServerInstance->Config->RULES.size())
-	{
-		this->WriteServ("434 %s :RULES File is missing",this->nick);
-		return;
-	}
-
-	this->WriteServ("308 %s :- %s Server Rules -",this->nick,ServerInstance->Config->ServerName);
-
-	for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
-		this->WriteServ("232 %s :- %s",this->nick,i->c_str());
-
-	this->WriteServ("309 %s :End of RULES command.",this->nick);
-}
-
-void User::HandleEvent(EventType et, int errornum)
-{
-	if (this->quitting) // drop everything, user is due to be quit
-		return;
-
-	/* WARNING: May delete this user! */
-	int thisfd = this->GetFd();
-
-	try
-	{
-		switch (et)
-		{
-			case EVENT_READ:
-				ServerInstance->ProcessUser(this);
-			break;
-			case EVENT_WRITE:
-				this->FlushWriteBuf();
-			break;
-			case EVENT_ERROR:
-				/** This should be safe, but dont DARE do anything after it -- Brain */
-				this->SetWriteError(errornum ? strerror(errornum) : "EOF from client");
-			break;
-		}
-	}
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::HandleEvent intercepted");
-	}
-
-	/* If the user has raised an error whilst being processed, quit them now we're safe to */
-	if ((ServerInstance->SE->GetRef(thisfd) == this))
-	{
-		if (!WriteError.empty())
-		{
-			User::QuitUser(ServerInstance, this, GetWriteError());
-		}
-	}
-}
-
-void User::SetOperQuit(const std::string &oquit)
-{
-	operquitmsg = oquit;
-}
-
-const char* User::GetOperQuit()
-{
-	return operquitmsg.c_str();
-}
-
-void User::IncreasePenalty(int increase)
+const std::string& FakeUser::GetFullHost()
 {
-	this->Penalty += increase;
+	if (!ServerInstance->Config->HideWhoisServer.empty())
+		return ServerInstance->Config->HideWhoisServer;
+	return server;
 }
 
-void User::DecreasePenalty(int decrease)
+const std::string& FakeUser::GetFullRealHost()
 {
-	this->Penalty -= decrease;
+	if (!ServerInstance->Config->HideWhoisServer.empty())
+		return ServerInstance->Config->HideWhoisServer;
+	return server;
 }
 
-VisData::VisData()
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
+	: config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
+	pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0),
+	penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0), limit(0)
 {
 }
 
-VisData::~VisData()
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent)
+	: config(tag), type(t), fakelag(parent.fakelag), name("unnamed"),
+	registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime),
+	softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax),
+	penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate),
+	maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxconnwarn(parent.maxconnwarn), maxchans(parent.maxchans),
+	limit(parent.limit)
 {
 }
 
-bool VisData::VisibleTo(User* user)
+void ConnectClass::Update(const ConnectClass* src)
 {
-	return true;
+	config = src->config;
+	type = src->type;
+	fakelag = src->fakelag;
+	name = src->name;
+	registration_timeout = src->registration_timeout;
+	host = src->host;
+	pingtime = src->pingtime;
+	softsendqmax = src->softsendqmax;
+	hardsendqmax = src->hardsendqmax;
+	recvqmax = src->recvqmax;
+	penaltythreshold = src->penaltythreshold;
+	commandrate = src->commandrate;
+	maxlocal = src->maxlocal;
+	maxglobal = src->maxglobal;
+	maxconnwarn = src->maxconnwarn;
+	maxchans = src->maxchans;
+	limit = src->limit;
 }
-