X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=eea27f6f713f300fd27ab791616a90778540a99b;hb=a14cf3eed86b9ce638a0465e0c4dbb817710fb79;hp=851e0a1d66e8b891b520064553e28c1525819ea8;hpb=be2a677ddd01859a61f484aa8f1e5d916a8f3ca5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 851e0a1d6..eea27f6f7 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
@@ -20,18 +18,37 @@
 #include "bancache.h"
 #include "commands/cmd_whowas.h"
 
-/* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 1;
-
-static unsigned long* already_sent = NULL;
-
-
-void InitializeAlreadySent(SocketEngine* SE)
+typedef unsigned int uniq_id_t;
+class sent
 {
-	already_sent = new unsigned long[SE->GetMaxFds()];
-	memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
-}
+	uniq_id_t uniq_id;
+	uniq_id_t* array;
+	void init()
+	{
+		if (!array)
+			array = new uniq_id_t[ServerInstance->SE->GetMaxFds()];
+		memset(array, 0, ServerInstance->SE->GetMaxFds() * sizeof(uniq_id_t));
+		uniq_id++;
+	}
+ public:
+	sent() : uniq_id(static_cast<uniq_id_t>(-1)), array(NULL) {}
+	inline uniq_id_t operator++()
+	{
+		if (++uniq_id == 0)
+			init();
+		return uniq_id;
+	}
+	inline uniq_id_t& operator[](int i)
+	{
+		return array[i];
+	}
+	~sent()
+	{
+		delete[] array;
+	}
+};
 
+static sent already_sent;
 
 std::string User::ProcessNoticeMasks(const char *sm)
 {
@@ -87,7 +104,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 			break;
 		}
 
-		*c++;
+		c++;
 	}
 
 	std::string s = this->FormatNoticeMasks();
@@ -99,7 +116,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 	return output;
 }
 
-void User::StartDNSLookup()
+void LocalUser::StartDNSLookup()
 {
 	try
 	{
@@ -107,12 +124,10 @@ void User::StartDNSLookup()
 		const char* sip = this->GetIPString();
 		UserResolver *res_reverse;
 
-		QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
-		// when GetProtocolFamily() works correctly with 4in6, this can be replaced by
-		// this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6;
-		res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, 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)
 	{
@@ -188,97 +203,40 @@ const char* User::FormatModes(bool showparameters)
 	return data;
 }
 
-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)
+User::User(const std::string &uid, const std::string& sid, int type)
+	: uuid(uid), server(sid), usertype(type)
 {
-	server = (char*)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.clear();
-	sendq.clear();
-	Visibility = NULL;
-	ip = NULL;
-	MyClass = NULL;
-	AllowedPrivs = AllowedOperCommands = NULL;
-	chans.clear();
-	invites.clear();
-
-	if (uid.empty())
-		uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
-	else
-		uuid.assign(uid, 0, UUID_LENGTH - 1);
+	signon = idle_lastmsg = 0;
+	registered = 0;
+	quietquit = quitting = exempt = dns_done = false;
+	client_sa.sa.sa_family = AF_UNSPEC;
 
-	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), 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)
 {
-	/* NULL for remote users :) */
-	if (this->MyClass)
-	{
-		this->MyClass->RefCount--;
-		ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount);
-	}
-
-	if (this->AllowedOperCommands)
-	{
-		delete AllowedOperCommands;
-		AllowedOperCommands = NULL;
-	}
-
-	if (this->AllowedPrivs)
-	{
-		delete AllowedPrivs;
-		AllowedPrivs = 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
-	}
+	bytes_in = bytes_out = cmds_in = cmds_out = 0;
+	server_sa.sa.sa_family = AF_UNSPEC;
+	CommandFloodPenalty = 0;
+	lastping = nping = 0;
+	eh.SetFd(myfd);
+	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
+	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
+}
 
-	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());
 }
 
 const std::string& User::MakeHost()
@@ -321,15 +279,6 @@ const std::string& User::MakeHostIP()
 	return this->cached_hostip;
 }
 
-void User::CloseSocket()
-{
-	if (this->fd > -1)
-	{
-		ServerInstance->SE->Shutdown(this, 2);
-		ServerInstance->SE->Close(this);
-	}
-}
-
 const std::string& User::GetFullHost()
 {
 	if (!this->cached_fullhost.empty())
@@ -364,21 +313,6 @@ char* User::MakeWildHost()
 	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;
-}
-
-
 const std::string& User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
@@ -401,7 +335,7 @@ const std::string& User::GetFullRealHost()
 	return this->cached_fullrealhost;
 }
 
-bool User::IsInvited(const irc::string &channel)
+bool LocalUser::IsInvited(const irc::string &channel)
 {
 	time_t now = ServerInstance->Time();
 	InvitedList::iterator safei;
@@ -423,7 +357,7 @@ bool User::IsInvited(const irc::string &channel)
 	return false;
 }
 
-InvitedList* User::GetInviteList()
+InvitedList* LocalUser::GetInviteList()
 {
 	time_t now = ServerInstance->Time();
 	/* Weed out expired invites here. */
@@ -441,7 +375,7 @@ InvitedList* User::GetInviteList()
 	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 = ServerInstance->Time();
 	if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
@@ -460,7 +394,7 @@ void User::InviteTo(const irc::string &channel, time_t invtimeout)
 	invites.push_back(std::make_pair(channel, invtimeout));
 }
 
-void User::RemoveInvite(const irc::string &channel)
+void LocalUser::RemoveInvite(const irc::string &channel)
 {
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
@@ -472,429 +406,350 @@ void User::RemoveInvite(const irc::string &channel)
 	}
 }
 
-bool User::HasModePermission(unsigned char mode, ModeType type)
+bool User::HasModePermission(unsigned char, ModeType)
 {
-	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 ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
-	
-}
+	return ((type == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
 
-bool User::HasPermission(const std::string &command)
+}
+/*
+ * 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&)
 {
-	/*
-	 * 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::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;
 }
 
-
 bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 {
-	ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr);
-	if (!IS_LOCAL(this))
-	{
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
-		return true;
-	}
+	return true;
+}
 
+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());
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)");
-		return false;
-	}
-
-	if (!AllowedPrivs)
-	{
-		if (noisy)
-			this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)");
 		return false;
 	}
 
-	if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
+	if (oper->AllowedPrivs.find(privstr) != oper->AllowedPrivs.end())
 	{
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "I do have it.");		
 		return true;
 	}
-	else if (AllowedPrivs->find("*") != AllowedPrivs->end())
+	else if (oper->AllowedPrivs.find("*") != oper->AllowedPrivs.end())
 	{
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "I allow all.");
 		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());
-	ServerInstance->Logs->Log("PRIVS", DEBUG, "I don't have it...");
+		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;
 }
 
-bool User::AddBuffer(const std::string &a)
+void UserIOHandler::OnDataReady()
 {
-	std::string::size_type start = 0;
-	std::string::size_type i = a.find('\r');
+	if (user->quitting)
+		return;
 
-	/*
-	 * 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)
+	if (recvq.length() > user->MyClass->GetRecvqMax() && !user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		// no \r that we need to dance around, just add to buffer
-		recvq.append(a);
+		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());
 	}
-	else
+	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;
+
+	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
-		// While we can find the end of a chunk to add
-		while (i != std::string::npos)
+		std::string line;
+		line.reserve(MAXBUF);
+		std::string::size_type qpos = 0;
+		while (qpos < recvq.length())
 		{
-			// 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);
+			char c = recvq[qpos++];
+			switch (c)
+			{
+			case '\0':
+				c = ' ';
+				break;
+			case '\r':
+				continue;
+			case '\n':
+				goto eol_found;
+			}
+			if (line.length() < MAXBUF - 2)
+				line.push_back(c);
 		}
+		// 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);
 
-		if (start != a.length())
-		{
-			/*
-			 * 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));
-		}
+		// 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;
 	}
+	// Add pseudo-penalty so that we continue processing after sendq recedes
+	if (user->CommandFloodPenalty == 0 && getSendQSize() >= sendqmax)
+		user->CommandFloodPenalty++;
+	if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
+		ServerInstance->Users->QuitUser(user, "Excess Flood");
+}
 
-	if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
+void UserIOHandler::AddWriteBuf(const std::string &data)
+{
+	if (!user->quitting && getSendQSize() + data.length() > user->MyClass->GetSendqHardMax() &&
+		!user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		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;
+		/*
+		 * Quit the user FIRST, because otherwise we could recurse
+		 * here and hit the same limit.
+		 */
+		ServerInstance->Users->QuitUser(user, "SendQ exceeded");
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu",
+			user->nick.c_str(), user->MyClass->GetSendqHardMax());
+		return;
 	}
 
-	return true;
-}
+	// We still want to append data to the sendq of a quitting user,
+	// e.g. their ERROR message that says 'closing link'
 
-bool User::BufferIsReady()
-{
-	return (recvq.find('\n') != std::string::npos);
+	WriteData(data);
 }
 
-void User::ClearBuffer()
+void UserIOHandler::OnError(BufferedSocketError)
 {
-	recvq.clear();
+	ServerInstance->Users->QuitUser(user, getError());
 }
 
-std::string User::GetBuffer()
+CullResult User::cull()
 {
-	try
-	{
-		if (recvq.empty())
-			return "";
+	if (!quitting)
+		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
+	PurgeEmptyChannels();
 
-		/* 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();
-		}
+	this->InvalidateCache();
 
-		for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
-		{
-			/* Find the first complete line, return it as the
-			 * result, and leave the recvq as whats left
-			 */
-			if (*x == '\n')
-			{
-				std::string ret = std::string(recvq.begin(), x);
-				recvq.erase(recvq.begin(), x + 1);
-				return ret;
-			}
-		}
-		return "";
-	}
+	if (client_sa.sa.sa_family != AF_UNSPEC)
+		ServerInstance->Users->RemoveCloneCounts(this);
 
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
-		return "";
-	}
+	return Extensible::cull();
 }
 
-void User::AddWriteBuf(const std::string &data)
+CullResult LocalUser::cull()
 {
-	if (this->quitting)
-		return;
-
-	if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
-	{
-		/*
-		 * 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!
-		 */
-		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;
-	}
-
-	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 */
+	std::vector<LocalUser*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),this);
+	if (x != ServerInstance->Users->local_users.end())
+		ServerInstance->Users->local_users.erase(x);
 	else
-		sendq.append(data);
+		ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
+
+	eh.cull();
+	return User::cull();
 }
 
-// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void User::FlushWriteBuf()
+CullResult FakeUser::cull()
 {
-	if (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)
-		{
-			if (errno == EAGAIN)
-			{
-				/* The socket buffer is full. This isnt fatal,
-				 * try again later.
-				 */
-				ServerInstance->SE->WantWrite(this);
-			}
-			else
-			{
-				/* Fatal error, set write error and bail */
-				ServerInstance->Users->QuitUser(this, errno ? strerror(errno) : "Write error");
-				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);
-		}
-	}
-
-	/* note: NOT else if! */
-	if (this->sendq.empty())
-	{
-		FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
-	}
+	// Fake users don't quit, they just get culled.
+	quitting = true;
+	return User::cull();
 }
 
-void User::Oper(const std::string &opertype, const std::string &opername)
+void User::Oper(OperInfo* info)
 {
 	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, opertype));
+	FOREACH_MOD(I_OnOper, OnOper(this, info->name));
 
-	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()));
+	std::string opername;
+	if (info->oper_block)
+		opername = info->oper_block->getString("name");
 
-	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);
+	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);
+			l->CheckClass();
+		}
+	}
+
+	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!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), oper->NameStr());
 	ServerInstance->Users->all_opers.push_back(this);
 
-	opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
-	if (iter_opertype != ServerInstance->Config->opertypes.end())
-	{
-		if (AllowedOperCommands)
-			AllowedOperCommands->clear();
-		else
-			AllowedOperCommands = new std::set<std::string>;
+	// Expand permissions from config for faster lookup
+	if (IS_LOCAL(this))
+		oper->init();
 
-		if (AllowedPrivs)
-			AllowedPrivs->clear();
-		else
-			AllowedPrivs = new std::set<std::string>;
+	FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername));
+}
 
-		AllowedUserModes.reset();
-		AllowedChanModes.reset();
-		this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+void OperInfo::init()
+{
+	AllowedOperCommands.clear();
+	AllowedPrivs.clear();
+	AllowedUserModes.reset();
+	AllowedChanModes.reset();
+	AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
-		std::string myclass, mycmd, mypriv;
-		irc::spacesepstream Classes(iter_opertype->second);
-		while (Classes.GetToken(myclass))
+	for(std::vector<reference<ConfigTag> >::iterator iter = class_blocks.begin(); iter != class_blocks.end(); ++iter)
+	{
+		ConfigTag* tag = *iter;
+		std::string mycmd, mypriv;
+		/* Process commands */
+		irc::spacesepstream CommandList(tag->getString("commands"));
+		while (CommandList.GetToken(mycmd))
 		{
-			operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
-			if (iter_operclass != ServerInstance->Config->operclass.end())
-			{
-				/* Process commands */
-				irc::spacesepstream CommandList(iter_operclass->second.commandlist);
-				while (CommandList.GetToken(mycmd))
-				{
-					this->AllowedOperCommands->insert(mycmd);
-				}
+			AllowedOperCommands.insert(mycmd);
+		}
 
-				irc::spacesepstream PrivList(iter_operclass->second.privs);
-				while (PrivList.GetToken(mypriv))
-				{
-					this->AllowedPrivs->insert(mypriv);
-				}
+		irc::spacesepstream PrivList(tag->getString("privs"));
+		while (PrivList.GetToken(mypriv))
+		{
+			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*)tag->getString("usermodes").c_str(); *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;
-					}
-				}
+		for (unsigned char* c = (unsigned char*)tag->getString("chanmodes").c_str(); *c; ++c)
+		{
+			if (*c == '*')
+			{
+				this->AllowedChanModes.set();
+			}
+			else
+			{
+				this->AllowedChanModes[*c - 'A'] = true;
 			}
 		}
 	}
-
-	FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
 }
 
 void User::UnOper()
 {
-	if (IS_OPER(this))
-	{
-		/*
-		 * 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_OPER(this))
+		return;
 
-		/* Remove all oper only modes from the user when the deoper - Bug #466*/
-		std::string moderemove("-");
+	/*
+	 * 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;
 
-		for (unsigned char letter = 'A'; letter <= 'z'; letter++)
-		{
-			ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
-			if (mh && mh->NeedsOper())
-				moderemove += letter;
-		}
 
-		std::vector<std::string> parameters;
-		parameters.push_back(this->nick);
-		parameters.push_back(moderemove);
+	/* Remove all oper only modes from the user when the deoper - Bug #466*/
+	std::string 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);
+	for (unsigned char letter = 'A'; letter <= 'z'; letter++)
+	{
+		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+		if (mh && mh->NeedsOper())
+			moderemove += letter;
+	}
 
-		if (AllowedOperCommands)
-		{
-			delete AllowedOperCommands;
-			AllowedOperCommands = NULL;
-		}
 
-		if (AllowedPrivs)
-		{
-			delete AllowedPrivs;
-			AllowedPrivs = NULL;
-		}
+	std::vector<std::string> parameters;
+	parameters.push_back(this->nick);
+	parameters.push_back(moderemove);
 
-		AllowedUserModes.reset();
-		AllowedChanModes.reset();
-	}
+	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);
+
+	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)
+	{
+		ServerInstance->Users->QuitUser(this, "Access denied by configuration");
+	}
+	else if (a->type == CC_DENY)
 	{
 		ServerInstance->Users->QuitUser(this, "Unauthorised connection");
 		return;
@@ -902,13 +757,13 @@ void User::CheckClass()
 	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
 		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());
+		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()))
 	{
 		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());
+		ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
 
@@ -918,7 +773,7 @@ void User::CheckClass()
 bool User::CheckLines(bool doZline)
 {
 	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
-	
+
 	if (!this->exempt)
 	{
 		for (int n = 0; check[n]; ++n)
@@ -936,7 +791,7 @@ bool User::CheckLines(bool doZline)
 	return false;
 }
 
-void User::FullConnect()
+void LocalUser::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
@@ -948,40 +803,46 @@ void User::FullConnect()
 	 * 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)
+	if (!MyClass->pass.empty())
 	{
-		ServerInstance->Users->QuitUser(this, "Invalid password");
-		return;
+		if (ServerInstance->PassCompare(this, MyClass->pass.c_str(), password.c_str(), MyClass->hash.c_str()))
+		{
+			ServerInstance->Users->QuitUser(this, "Invalid password");
+			return;
+		}
 	}
 
 	if (this->CheckLines())
 		return;
 
-	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->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!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
 	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());
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
 	ServerInstance->Config->Send005(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
-
-	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");
+	/* Trigger MOTD and LUSERS output, give modules a chance too */
+	ModResult MOD_RESULT;
+	std::string command("MOTD");
 	std::vector<std::string> parameters;
-	FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS"));
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
+	if (!MOD_RESULT)
+		ServerInstance->CallCommandHandler(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->CallCommandHandler(command, parameters, this);
 
@@ -993,11 +854,10 @@ void User::FullConnect()
 
 	this->registered = REG_ALL;
 
-	ServerInstance->PI->Introduce(this);
-
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
+	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(), "", "");
 }
@@ -1034,13 +894,15 @@ void User::InvalidateCache()
 
 bool User::ForceNickChange(const char* newnick)
 {
-	int MOD_RESULT = 0;
+	ModResult MOD_RESULT;
 
 	this->InvalidateCache();
 
-	FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+	ServerInstance->NICKForced.set(this, 1);
+	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+	ServerInstance->NICKForced.set(this, 0);
 
-	if (MOD_RESULT)
+	if (MOD_RESULT == MOD_RES_DENY)
 	{
 		ServerInstance->stats->statsCollisions++;
 		return false;
@@ -1051,10 +913,10 @@ bool User::ForceNickChange(const char* newnick)
 	if (nickhandler) // wtfbbq, when would this not be here
 	{
 		std::vector<std::string> parameters;
-		nickhandler->HandleInternal(1, dummy);
 		parameters.push_back(newnick);
+		ServerInstance->NICKForced.set(this, 1);
 		bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
-		nickhandler->HandleInternal(0, dummy);
+		ServerInstance->NICKForced.set(this, 0);
 		return result;
 	}
 
@@ -1062,277 +924,89 @@ bool User::ForceNickChange(const char* newnick)
 	return false;
 }
 
-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.c_str());
-		break;
+			return htons(this->server_sa.in4.sin_port);
 	}
+	return 0;
 }
 
-int User::GetPort()
+const char* User::GetIPString()
 {
-	if (this->ip == NULL)
-		return 0;
-
-	switch (this->GetProtocolFamily())
+	int port;
+	if (cachedip.empty())
 	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			return sin->sin6_port;
-		}
-		break;
-#endif
-		case AF_INET:
-		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			return sin->sin_port;
-		}
-		break;
-		default:
-		break;
+		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 0;
-}
 
-int User::GetProtocolFamily()
-{
-	if (this->ip == NULL)
-		return 0;
-
-	sockaddr_in* sin = (sockaddr_in*)this->ip;
-	return sin->sin_family;
+	return cachedip.c_str();
 }
 
-const char* User::GetCIDRMask(int range)
+irc::sockets::cidr_mask User::GetCIDRMask()
 {
-	static char buf[44];
-
-	if (this->ip == NULL)
-		return "";
-
-	if (range < 0)
-		throw "Negative range, sorry, no.";
-
-	/*
-	 * Original code written by Oliver Lupton (Om).
-	 * Integrated by me. Thanks. :) -- w00t
-	 */
-	switch (this->GetProtocolFamily())
+	int range = 0;
+	switch (client_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
-		{
-			/* unsigned char s6_addr[16]; */
-			struct in6_addr v6;
-			sockaddr_in6* sin;
-			int i, bytestozero, extrabits;
-			char buffer[40];
-			
-			if(range > 128)
-				throw "CIDR mask width greater than address width (IPv6, 128 bit)";
-
-			/* Access the user's IP structure directly */
-			sin = (sockaddr_in6*)this->ip;
-
-			/* 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++)
-			{
-				v6.s6_addr[i] = sin->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
+			range = ServerInstance->Config->c_ipv6_range;
+			break;
 		case AF_INET:
-		{
-			struct in_addr v4;
-			sockaddr_in* sin;
-			char buffer[16];
-
-			if (range > 32)
-				throw "CIDR mask width greater than address width (IPv4, 32 bit)";
-
-			/* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */
-			sin = (sockaddr_in*)this->ip;
-			v4.s_addr = sin->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)
-			{
-				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;
+			range = ServerInstance->Config->c_ipv4_range;
+			break;
 	}
-
-	return ""; // unused, but oh well
+	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-const char* User::GetIPString()
+bool User::SetClientIP(const char* sip)
 {
-	static char buf[40];
-
-	if (this->ip == NULL)
-		return "";
+	this->cachedip = "";
+	return irc::sockets::aptosa(sip, 0, client_sa);
+}
 
-	if (!this->cachedip.empty())
-		return this->cachedip.c_str();
+static std::string wide_newline("\r\n");
 
-	switch (this->GetProtocolFamily())
-	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			static char temp[1024];
+void User::Write(const std::string& text)
+{
+}
 
-			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;
-	}
-	
-	// Unreachable, probably
-	return "";
+void User::Write(const char *text, ...)
+{
 }
 
-/** 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)
+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 (this->GetIOHook())
-	{
-		/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
-		 * implement their own buffering mechanisms
-		 */
-		try
-		{
-			this->GetIOHook()->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", DEBUG,"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];
@@ -1346,10 +1020,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()
@@ -1383,14 +1054,14 @@ void User::WriteNumeric(unsigned int numeric, const char* text, ...)
 void User::WriteNumeric(unsigned int numeric, const std::string &text)
 {
 	char textbuffer[MAXBUF];
-	int MOD_RESULT = 0;
+	ModResult MOD_RESULT;
 
-	FOREACH_RESULT(I_OnNumeric, OnNumeric(this, numeric, text));
+	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
 
-	if (MOD_RESULT)
+	if (MOD_RESULT == MOD_RES_DENY)
 		return;
 
-	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName, numeric, text.c_str());
+	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName.c_str(), numeric, text.c_str());
 	this->Write(std::string(textbuffer));
 }
 
@@ -1438,178 +1109,173 @@ 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));
+	this->WriteCommonRaw(std::string(textbuffer), true);
 }
 
-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++;
-
-	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++)
-	{
-		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));
-	}
-}
-
-
-/* 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++;
+	uniq_id_t uniq_id = ++already_sent;
 
-	if (!already_sent)
-		InitializeAlreadySent(ServerInstance->SE);
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
 
-	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;
+	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)
 	{
-		CUList *ulist = v->first->GetUsers();
-		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
-			if (this != i->first)
+			already_sent[u->GetFd()] = uniq_id;
+			if (i->second)
+				u->Write(line);
+		}
+	}
+	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+	{
+		Channel* c = *v;
+		const UserMembList* ulist = c->GetUsers();
+		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && already_sent[u->GetFd()] != uniq_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);
-				}
+				already_sent[u->GetFd()] = uniq_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++;
+	uniq_id_t uniq_id = ++already_sent;
 
-	if (!already_sent)
-		InitializeAlreadySent(ServerInstance->SE);
+	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;
 
-	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
-	out1 = tb1;
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
 
-	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)
+		{
+			already_sent[u->GetFd()] = 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 && (already_sent[u->GetFd()] != 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);
-				}
+				already_sent[u->GetFd()] = 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_LOCAL(this))
-		return;
-
-	std::string wallop("WALLOPS :");
-	wallop.append(text);
+	Write(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 RemoteUser::SendText(const std::string& line)
+{
+	ServerInstance->PI->PushToClient(this, line);
 }
 
-void User::WriteWallOps(const char* text, ...)
+void FakeUser::SendText(const std::string& line)
 {
-	if (!IS_LOCAL(this))
-		return;
+}
 
-	char textbuffer[MAXBUF];
+void User::SendText(const char *text, ...)
+{
 	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)
+{
+	char line[MAXBUF];
+	int start_pos = LinePrefix.length();
+	int pos = start_pos;
+	memcpy(line, LinePrefix.data(), pos);
+	std::string Word;
+	while (TextStream >> Word)
+	{
+		int len = Word.length();
+		if (pos + len + 12 > MAXBUF)
+		{
+			line[pos] = '\0';
+			SendText(std::string(line));
+			pos = start_pos;
+		}
+		line[pos] = ' ';
+		memcpy(line + pos + 1, Word.data(), len);
+		pos += len + 1;
+	}
+	line[pos] = '\0';
+	SendText(std::string(line));
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1635,7 +1301,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;
@@ -1648,9 +1314,9 @@ bool User::ChangeName(const char* gecos)
 
 	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));
 	}
@@ -1659,6 +1325,73 @@ bool User::ChangeName(const char* gecos)
 	return true;
 }
 
+void User::DoHostCycle(const std::string &quitline)
+{
+	char buffer[MAXBUF];
+
+	if (!ServerInstance->Config->CycleHosts)
+		return;
+
+	uniq_id_t silent_id = ++already_sent;
+	uniq_id_t seen_id = ++already_sent;
+
+	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)
+			{
+				already_sent[u->GetFd()] = seen_id;
+				u->Write(quitline);
+			}
+			else
+			{
+				already_sent[u->GetFd()] = 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", GetFullHost().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 (already_sent[u->GetFd()] == silent_id)
+				continue;
+
+			if (already_sent[u->GetFd()] != seen_id)
+			{
+				u->Write(quitline);
+				already_sent[u->GetFd()] = seen_id;
+			}
+			u->Write(joinline);
+			if (modeline.length() > 0)
+				u->Write(modeline);
+		}
+	}
+}
+
 bool User::ChangeDisplayedHost(const char* shost)
 {
 	if (dhost == shost)
@@ -1666,35 +1399,22 @@ bool User::ChangeDisplayedHost(const char* shost)
 
 	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));
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
-
-	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
-		this->WriteCommonExcept("QUIT :Changing hosts");
+	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host";
 
 	/* 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 (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
-		{
-			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());
-		}
-	}
+	this->DoHostCycle(quitstr);
 
 	if (IS_LOCAL(this))
 		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
@@ -1707,26 +1427,15 @@ bool User::ChangeIdent(const char* newident)
 	if (this->ident == newident)
 		return true;
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+	FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident));
 
-	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
-		this->WriteCommonExcept("%s","QUIT :Changing ident");
+	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
 
 	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
-	{
-		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
-		{
-			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());
-		}
-	}
+	this->DoHostCycle(quitstr);
 
 	return true;
 }
@@ -1744,27 +1453,25 @@ void User::SendAll(const char* command, const char* text, ...)
 	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 (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
 		(*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;
@@ -1778,7 +1485,7 @@ void User::SplitChanList(User* dest, const std::string &cl)
 
 	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)
 	{
@@ -1814,13 +1521,10 @@ void User::SplitChanList(User* dest, const std::string &cl)
  * 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())
@@ -1829,10 +1533,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetDisabled())
-				continue; // can't possibly match, removed from conf
-
-			if (explicit_name == c->GetName())
+			if (explicit_name == c->name)
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
 				found = c;
@@ -1845,24 +1546,17 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetType() == CC_ALLOW)
+			if (c->type == CC_ALLOW)
 			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str());
 			}
 			else
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
 			}
 
-			/* if it's disabled, we can't match this one. */
-			if (c->GetDisabled())
-			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
-				continue;
-			}
-
 			/* check if host matches.. */
-			if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && 
+			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());
@@ -1873,7 +1567,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 			 * 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 + 1 >= c->limit))
+			if (c->limit && (c->GetReferenceCount() >= c->limit))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
 				continue;
@@ -1885,9 +1579,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
 
 				/* and our port doesn't match, fail. */
-				if (this->GetPort() != c->GetPort())
+				if (this->GetServerPort() != c->GetPort())
 				{
-					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort());
 					continue;
 				}
 			}
@@ -1903,21 +1597,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 	 */
 	if (found)
 	{
-		/* 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);
-		}
-
-		this->MyClass = found;
-		this->MyClass->RefCount++;
-		ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %lu", this->MyClass->RefCount);
+		MyClass = found;
 	}
-
-	return this->MyClass;
 }
 
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
@@ -1925,129 +1606,73 @@ 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()
+const std::string& FakeUser::GetFullHost()
 {
-	if (!ServerInstance->Config->MOTD.size())
-	{
-		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
-		return;
-	}
-	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
-
-	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->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
+	if (!ServerInstance->Config->HideWhoisServer.empty())
+		return ServerInstance->Config->HideWhoisServer;
+	return server;
 }
 
-void User::ShowRULES()
+const std::string& FakeUser::GetFullRealHost()
 {
-	if (!ServerInstance->Config->RULES.size())
-	{
-		this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
-		return;
-	}
-
-	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),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());
+	if (!ServerInstance->Config->HideWhoisServer.empty())
+		return ServerInstance->Config->HideWhoisServer;
+	return server;
 }
 
-void User::HandleEvent(EventType et, int errornum)
+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), pass(""), hash(""), softsendqmax(0), hardsendqmax(0), recvqmax(0),
+	penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
 {
-	if (this->quitting) // drop everything, user is due to be quit
-		return;
-
-	switch (et)
-	{
-		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)
+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),
+	pass(parent.pass), hash(parent.hash), softsendqmax(parent.softsendqmax),
+	hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax),
+	penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate),
+	maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans),
+	port(parent.port), limit(parent.limit)
 {
-	operquitmsg = oquit;
 }
 
-const std::string& User::GetOperQuit()
+void ConnectClass::Update(const ConnectClass* src)
 {
-	return operquitmsg;
+	name = src->name;
+	registration_timeout = src->registration_timeout;
+	host = src->host;
+	pingtime = src->pingtime;
+	pass = src->pass;
+	hash = src->hash;
+	softsendqmax = src->softsendqmax;
+	hardsendqmax = src->hardsendqmax;
+	recvqmax = src->recvqmax;
+	penaltythreshold = src->penaltythreshold;
+	maxlocal = src->maxlocal;
+	maxglobal = src->maxglobal;
+	limit = src->limit;
 }
-
-void User::IncreasePenalty(int increase)
-{
-	this->Penalty += increase;
-}
-
-void User::DecreasePenalty(int decrease)
-{
-	this->Penalty -= decrease;
-}
-
-VisData::VisData()
-{
-}
-
-VisData::~VisData()
-{
-}
-
-bool VisData::VisibleTo(User* user)
-{
-	return true;
-}
-