X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=e8e4a482533fedc14c1661e90f8d34319b5fd735;hb=984cc96a1f832abf9b5fcfddcd8260c5b12bd2a9;hp=fd0c168d94c317f5d937bddf28852ec21d50640c;hpb=a068c47d71e9a922b145b7552b3a64d638c92171;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index fd0c168d9..e8e4a4825 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
@@ -20,19 +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;
-
-LocalIntExt User::NICKForced("NICKForced", NULL);
-LocalStringExt User::OperQuit("OperQuit", 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)
 {
@@ -100,7 +116,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 	return output;
 }
 
-void User::StartDNSLookup()
+void LocalUser::StartDNSLookup()
 {
 	try
 	{
@@ -109,7 +125,7 @@ void User::StartDNSLookup()
 		UserResolver *res_reverse;
 
 		QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
-		res_reverse = new UserResolver(ServerInstance, this, sip, resolvtype, cached);
+		res_reverse = new UserResolver(this, sip, resolvtype, cached);
 
 		ServerInstance->AddResolver(res_reverse, cached);
 	}
@@ -205,68 +221,37 @@ void User::DecrementModes()
 	}
 }
 
-User::User(InspIRCd* Instance, const std::string &uid)
+User::User(const std::string &uid)
 {
-	server = Instance->FindServerNamePtr(Instance->Config->ServerName);
+	server = ServerInstance->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;
+	signon = idle_lastmsg = registered = 0;
+	quietquit = quitting = exempt = dns_done = false;
 	fd = -1;
-	server_sa.sa.sa_family = AF_UNSPEC;
+	uuid = uid;
 	client_sa.sa.sa_family = AF_UNSPEC;
-	recvq.clear();
-	sendq.clear();
-	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);
 
-	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() : User(ServerInstance->GetUID())
 {
-	/* 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 (MyClass->RefCount == 0)
-			delete MyClass;
-	}
-
-	if (this->AllowedOperCommands)
-	{
-		delete AllowedOperCommands;
-		AllowedOperCommands = NULL;
-	}
-
-	if (this->AllowedPrivs)
-	{
-		delete AllowedPrivs;
-		AllowedPrivs = NULL;
-	}
-
-	this->InvalidateCache();
-	this->DecrementModes();
-
-	if (client_sa.sa.sa_family != AF_UNSPEC)
-		ServerInstance->Users->RemoveCloneCounts(this);
+	bytes_in = bytes_out = cmds_in = cmds_out = 0;
+	server_sa.sa.sa_family = AF_UNSPEC;
+	Penalty = 0;
+	lastping = nping = 0;
+}
 
-	ServerInstance->Users->uuidlist->erase(uuid);
+User::~User()
+{
+	if (uuid.length())
+		ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str());
 }
 
 const std::string& User::MakeHost()
@@ -309,15 +294,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())
@@ -352,21 +328,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())
@@ -389,7 +350,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;
@@ -411,7 +372,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. */
@@ -429,7 +390,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. */
@@ -448,7 +409,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++)
 	{
@@ -460,58 +421,56 @@ 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)
 {
-	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)
@@ -519,352 +478,255 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 		return false;
 	}
 
-	if (!AllowedPrivs)
-	{
-		if (noisy)
-			this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
-		return false;
-	}
-
-	if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
+	if (oper->AllowedPrivs.find(privstr) != oper->AllowedPrivs.end())
 	{
 		return true;
 	}
-	else if (AllowedPrivs->find("*") != AllowedPrivs->end())
+	else if (oper->AllowedPrivs.find("*") != oper->AllowedPrivs.end())
 	{
 		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());
+		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)
-{
-	std::string::size_type start = 0;
-	std::string::size_type i = a.find('\r');
-
-	/*
-	 * The old implementation here took a copy, and rfind() on \r, removing as it found them, before
-	 * copying a second time onto the recvq. That's ok, but involves three copies minimum (recv() to buffer,
-	 * buffer to here, here to recvq) - The new method now copies twice (recv() to buffer, buffer to recvq).
-	 *
-	 * We use find() instead of rfind() for clarity, however unlike the old code, our scanning of the string is
-	 * contiguous: as we specify a startpoint, we never see characters we have scanned previously, making this
-	 * marginally faster in cases with a number of \r hidden early on in the buffer.
-	 *
-	 * How it works:
-	 * Start at first pos of string, find first \r, append everything in the chunk (excluding \r) to recvq. Set
-	 * i ahead of the \r, search for next \r, add next chunk to buffer... repeat.
-	 *		-- w00t (7 may, 2008)
-	 */
-	if (i == std::string::npos)
-	{
-		// no \r that we need to dance around, just add to buffer
-		recvq.append(a);
-	}
-	else
-	{
-		// While we can find the end of a chunk to add
-		while (i != std::string::npos)
-		{
-			// Append the chunk that we have
-			recvq.append(a, start, (i - start));
-
-			// Start looking for the next one
-			start = i + 1;
-			i = a.find('\r', start);
-		}
-
-		if (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));
-		}
-	}
-
-	if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
-	{
-		ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
-		ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
-		return false;
-	}
-
-	return true;
-}
-
-bool User::BufferIsReady()
+void User::OnDataReady()
 {
-	return (recvq.find('\n') != std::string::npos);
 }
 
-void User::ClearBuffer()
+void LocalUser::OnDataReady()
 {
-	recvq.clear();
-}
+	if (quitting)
+		return;
 
-std::string User::GetBuffer()
-{
-	try
+	if (recvq.length() > MyClass->GetRecvqMax() && !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();
-		}
-
-		for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+		ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",
+			nick.c_str(), (unsigned long)recvq.length(), MyClass->GetRecvqMax());
+	}
+	unsigned long sendqmax = ULONG_MAX;
+	if (!HasPrivPermission("users/flood/increased-buffers"))
+		sendqmax = MyClass->GetSendqSoftMax();
+	int penaltymax = MyClass->GetPenaltyThreshold();
+	if (penaltymax == 0 || HasPrivPermission("users/flood/no-fakelag"))
+		penaltymax = INT_MAX;
+
+	while (Penalty < 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;
+		this->bytes_in += qpos;
+		this->cmds_in++;
+
+		ServerInstance->Parser->ProcessBuffer(line, this);
+		if (quitting)
+			return;
 	}
+	// Add pseudo-penalty so that we continue processing after sendq recedes
+	if (Penalty == 0 && getSendQSize() >= sendqmax)
+		Penalty++;
 }
 
-void User::AddWriteBuf(const std::string &data)
+void LocalUser::AddWriteBuf(const std::string &data)
 {
-	if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
+	if (!quitting && getSendQSize() + data.length() > MyClass->GetSendqHardMax() && !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!
+		 * Quit the user FIRST, because otherwise we could recurse
+		 * here and hit the same limit.
 		 */
 		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());
+		ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu",
+			nick.c_str(), MyClass->GetSendqHardMax());
 		return;
 	}
 
 	// We still want to append data to the sendq of a quitting user,
 	// e.g. their ERROR message that says 'closing link'
 
-	if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
-		sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
-	else
-		sendq.append(data);
+	WriteData(data);
+}
+
+void User::OnError(BufferedSocketError)
+{
+	ServerInstance->Users->QuitUser(this, getError());
 }
 
-// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void User::FlushWriteBuf()
+CullResult User::cull()
 {
-	if (this->fd == FD_MAGIC_NUMBER)
+	if (!quitting)
+		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
+	if (uuid.empty())
 	{
-		sendq.clear();
-		return;
+		ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty");
+		return Extensible::cull();
 	}
+	PurgeEmptyChannels();
+	if (IS_LOCAL(this) && fd != INT_MAX)
+		Close();
 
-	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);
+	this->InvalidateCache();
+	this->DecrementModes();
 
-		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)
-				ServerInstance->SE->WantWrite(this);
-		}
-	}
+	ServerInstance->Users->uuidlist->erase(uuid);
+	uuid.clear();
+	return Extensible::cull();
+}
 
-	/* note: NOT else if! */
-	if (this->sendq.empty())
-	{
-		FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
-	}
+CullResult LocalUser::cull()
+{
+	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
+		ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
+
+	if (client_sa.sa.sa_family != AF_UNSPEC)
+		ServerInstance->Users->RemoveCloneCounts(this);
+	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));
+
+	std::string opername;
+	if (info->oper_block)
+		opername = info->oper_block->getString("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()));
+	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(), info->NameStr(), opername.c_str());
+	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", info->name[0]) ? "an" : "a", info->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(), opertype.c_str());
-	this->oper.assign(opertype, 0, 512);
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), info->NameStr());
 	ServerInstance->Users->all_opers.push_back(this);
 
-	/*
-	 * This might look like it's in the wrong place.
-	 * It is *not*!
-	 *
-	 * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type.
-	 * -- w00t
-	 */
-	opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
-	if (iter_opertype != ServerInstance->Config->opertypes.end())
-	{
-		if (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, info->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.c_str());
-		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_str(); *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_str(); *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;
-		}
 
+	/* Remove all oper only modes from the user when the deoper - Bug #466*/
+	std::string moderemove("-");
 
-		std::vector<std::string> parameters;
-		parameters.push_back(this->nick);
-		parameters.push_back(moderemove);
+	for (unsigned char letter = 'A'; letter <= 'z'; letter++)
+	{
+		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
+		if (mh && mh->NeedsOper())
+			moderemove += letter;
+	}
 
-		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);
+	std::vector<std::string> parameters;
+	parameters.push_back(this->nick);
+	parameters.push_back(moderemove);
 
-		if (AllowedOperCommands)
-		{
-			delete AllowedOperCommands;
-			AllowedOperCommands = NULL;
-		}
+	ServerInstance->Parser->CallHandler("MODE", parameters, this);
 
-		if (AllowedPrivs)
-		{
-			delete AllowedPrivs;
-			AllowedPrivs = NULL;
-		}
+	/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
+	ServerInstance->Users->all_opers.remove(this);
 
-		AllowedUserModes.reset();
-		AllowedChanModes.reset();
-		this->modes[UM_OPERATOR] = 0;
-	}
+	this->modes[UM_OPERATOR] = 0;
 }
 
 /* adds or updates an entry in the whowas list */
@@ -882,11 +744,15 @@ void User::AddToWhoWas()
 /*
  * Check class restrictions
  */
-void User::CheckClass()
+void LocalUser::CheckClass()
 {
 	ConnectClass* a = this->MyClass;
 
-	if ((!a) || (a->type == 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;
@@ -928,7 +794,7 @@ bool User::CheckLines(bool doZline)
 	return false;
 }
 
-void User::FullConnect()
+void LocalUser::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
@@ -944,20 +810,23 @@ void User::FullConnect()
 	/* 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-2.0",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-2.0 %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());
@@ -973,7 +842,7 @@ void User::FullConnect()
 	ModResult MOD_RESULT;
 	std::string command("LUSERS");
 	std::vector<std::string> parameters;
-	FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
 	if (!MOD_RESULT)
 		ServerInstance->CallCommandHandler(command, parameters, this);
 
@@ -1029,9 +898,9 @@ bool User::ForceNickChange(const char* newnick)
 
 	this->InvalidateCache();
 
-	NICKForced.set(this, 1);
-	FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (this, newnick));
-	NICKForced.set(this, 0);
+	ServerInstance->NICKForced.set(this, 1);
+	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+	ServerInstance->NICKForced.set(this, 0);
 
 	if (MOD_RESULT == MOD_RES_DENY)
 	{
@@ -1045,9 +914,9 @@ bool User::ForceNickChange(const char* newnick)
 	{
 		std::vector<std::string> parameters;
 		parameters.push_back(newnick);
-		NICKForced.set(this, 1);
+		ServerInstance->NICKForced.set(this, 1);
 		bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
-		NICKForced.set(this, 0);
+		ServerInstance->NICKForced.set(this, 0);
 		return result;
 	}
 
@@ -1055,7 +924,7 @@ bool User::ForceNickChange(const char* newnick)
 	return false;
 }
 
-int User::GetServerPort()
+int LocalUser::GetServerPort()
 {
 	switch (this->server_sa.sa.sa_family)
 	{
@@ -1163,14 +1032,6 @@ const char* User::GetCIDRMask(int range)
 	return ""; // unused, but oh well
 }
 
-std::string User::GetServerIP()
-{
-	int port;
-	std::string ip;
-	irc::sockets::satoap(&server_sa, ip, port);
-	return ip;
-}
-
 const char* User::GetIPString()
 {
 	int port;
@@ -1191,40 +1052,42 @@ bool User::SetClientIP(const char* sip)
 	return irc::sockets::aptosa(sip, 0, &client_sa);
 }
 
+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))
 		return;
 
-	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
-
-	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());
-			this->GetIOHook()->OnRawSocketWrite(this->fd, "\r\n", 2);
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("USEROUTPUT", DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-		}
-	}
-	else
+	if (text.length() > MAXBUF - 2)
 	{
-		this->AddWriteBuf(text);
-		this->AddWriteBuf("\r\n");
+		// 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;
 	}
+
+	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+
+	this->AddWriteBuf(text);
+	this->AddWriteBuf(wide_newline);
+
 	ServerInstance->stats->statsSent += text.length() + 2;
-	ServerInstance->SE->WantWrite(this);
+	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];
@@ -1238,7 +1101,7 @@ void User::Write(const char *text, ...)
 
 void User::WriteServ(const std::string& text)
 {
-	this->Write(":%s %s",ServerInstance->Config->ServerName,text.c_str());
+	this->Write(":%s %s",ServerInstance->Config->ServerName.c_str(),text.c_str());
 }
 
 /** WriteServ()
@@ -1274,12 +1137,12 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text)
 	char textbuffer[MAXBUF];
 	ModResult MOD_RESULT;
 
-	FIRST_MOD_RESULT(ServerInstance, OnNumeric, MOD_RESULT, (this, numeric, text));
+	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, numeric, text.c_str());
+	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName.c_str(), numeric, text.c_str());
 	this->Write(std::string(textbuffer));
 }
 
@@ -1327,175 +1190,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));
-}
-
-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++)
-	{
-		const UserMembList* ulist = (*v)->GetUsers();
-		for (UserMembList::const_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++;
+	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;
+
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
 
-	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		const UserMembList* ulist = (*v)->GetUsers();
+		User* u = i->first;
+		if (IS_LOCAL(u) && !u->quitting)
+		{
+			already_sent[u->fd] = 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++)
 		{
-			if (this != i->first)
+			User* u = i->first;
+			if (IS_LOCAL(u) && !u->quitting && already_sent[u->fd] != 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->fd] = 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;
+
+	snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),normal_text.c_str());
+	snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),oper_text.c_str());
+	std::string out1 = tb1;
+	std::string out2 = tb2;
 
-	if (!already_sent)
-		InitializeAlreadySent(ServerInstance->SE);
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
 
-	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
-	out1 = tb1;
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
 
-	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	{
+		User* u = i->first;
+		if (IS_LOCAL(u) && !u->quitting)
+		{
+			already_sent[u->fd] = uniq_id;
+			if (i->second)
+				u->Write(IS_OPER(u) ? out2 : out1);
+		}
+	}
+	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
 	{
 		const UserMembList* ulist = (*v)->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			if (this != i->first)
+			User* u = i->first;
+			if (IS_LOCAL(u) && !u->quitting && (already_sent[u->fd] != 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->fd] = uniq_id;
+				u->Write(IS_OPER(u) ? out2 : out1);
 			}
 		}
 	}
-
 }
 
-void User::WriteWallOps(const std::string &text)
+void LocalUser::SendText(const std::string& line)
 {
-	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
@@ -1535,7 +1396,7 @@ bool User::ChangeName(const char* gecos)
 	if (IS_LOCAL(this))
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserGECOS, MOD_RESULT, (this,gecos));
+		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));
@@ -1549,20 +1410,34 @@ void User::DoHostCycle(const std::string &quitline)
 {
 	char buffer[MAXBUF];
 
-	ModResult result = MOD_RES_PASSTHRU;
-	FIRST_MOD_RESULT(ServerInstance, OnHostCycle, result, (this));
-
-	if (result == MOD_RES_DENY)
-		return;
-	if (result == MOD_RES_PASSTHRU && !ServerInstance->Config->CycleHosts)
+	if (!ServerInstance->Config->CycleHosts)
 		return;
 
-	uniq_id++;
+	uniq_id_t silent_id = ++already_sent;
+	uniq_id_t seen_id = ++already_sent;
+
+	UserChanList include_c(chans);
+	std::map<User*,bool> exceptions;
 
-	if (!already_sent)
-		InitializeAlreadySent(ServerInstance->SE);
+	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
 
-	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	{
+		User* u = i->first;
+		if (IS_LOCAL(u) && !u->quitting)
+		{
+			if (i->second)
+			{
+				already_sent[u->fd] = seen_id;
+				u->Write(quitline);
+			}
+			else
+			{
+				already_sent[u->fd] = 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());
@@ -1580,11 +1455,13 @@ void User::DoHostCycle(const std::string &quitline)
 			User* u = i->first;
 			if (u == this || !IS_LOCAL(u))
 				continue;
+			if (already_sent[u->fd] == silent_id)
+				continue;
 
-			if (already_sent[i->first->fd] != uniq_id)
+			if (already_sent[u->fd] != seen_id)
 			{
 				u->Write(quitline);
-				already_sent[i->first->fd] = uniq_id;
+				already_sent[i->first->fd] = seen_id;
 			}
 			u->Write(joinline);
 			if (modeline.length() > 0)
@@ -1601,7 +1478,7 @@ bool User::ChangeDisplayedHost(const char* shost)
 	if (IS_LOCAL(this))
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(ServerInstance, OnChangeLocalUserHost, MOD_RESULT, (this,shost));
+		FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (IS_LOCAL(this),shost));
 		if (MOD_RESULT == MOD_RES_DENY)
 			return false;
 	}
@@ -1654,7 +1531,7 @@ 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);
 	}
@@ -1686,7 +1563,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)
 	{
@@ -1722,13 +1599,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())
@@ -1771,7 +1645,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 >= c->limit))
+			if (c->limit && (c->GetReferenceCount() >= c->limit))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
 				continue;
@@ -1801,23 +1675,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);
-			if (MyClass->RefCount == 0)
-				delete MyClass;
-		}
-
-		this->MyClass = found;
-		this->MyClass->RefCount++;
-		ServerInstance->Logs->Log("USERS", DEBUG, "User tied to new class -- connect refcount now: %lu", this->MyClass->RefCount);
+		MyClass = found;
 	}
-
-	return this->MyClass;
 }
 
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
@@ -1825,49 +1684,23 @@ 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++)
 	{
 		Channel* c = *f;
-		c->RemoveAllPrefixes(this);
-		if (c->DelUser(this) == 0)
-		{
-			/* No users left in here, mark it for deletion */
-			try
-			{
-				to_delete.push_back(c);
-			}
-			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())
-		{
-			ModResult MOD_RESULT;
-			FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, MOD_RESULT, (i2->second));
-			if (MOD_RESULT == MOD_RES_DENY)
-				continue; // delete halted by module
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-			delete i2->second;
-			ServerInstance->chanlist->erase(i2);
-			this->chans.erase(*n);
-		}
+		c->DelUser(this);
 	}
 
 	this->UnOper();
@@ -1880,7 +1713,7 @@ void User::ShowMOTD()
 		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);
+	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.c_str());
 
 	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
 		this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
@@ -1896,7 +1729,7 @@ void User::ShowRULES()
 		return;
 	}
 
-	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
 
 	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());
@@ -1904,62 +1737,41 @@ void User::ShowRULES()
 	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
 }
 
-void User::HandleEvent(EventType et, int errornum)
-{
-	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::IncreasePenalty(int increase)
-{
-	this->Penalty += increase;
-}
-
-void User::DecreasePenalty(int decrease)
-{
-	this->Penalty -= decrease;
-}
-
 void FakeUser::SetFakeServer(std::string name)
 {
 	this->nick = name;
-	this->server = nick.c_str();
+	this->server = name;
 }
 
 const std::string FakeUser::GetFullHost()
 {
-	if (*ServerInstance->Config->HideWhoisServer)
+	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
 	return nick;
 }
 
 const std::string FakeUser::GetFullRealHost()
 {
-	if (*ServerInstance->Config->HideWhoisServer)
+	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
 	return nick;
 }
 
-ConnectClass::ConnectClass(char t, const std::string& mask)
-	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
+	: config(tag), type(t), name("unnamed"), registration_timeout(0), host(mask),
+	pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0),
+	recvqmax(0), penaltythreshold(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
 {
 }
 
-ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
-	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent)
+	: config(tag), type(t), 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), maxlocal(parent.maxlocal),
+	maxglobal(parent.maxglobal), maxchans(parent.maxchans),
+	port(parent.port), limit(parent.limit)
 {
 }
 
@@ -1971,8 +1783,10 @@ void ConnectClass::Update(const ConnectClass* src)
 	pingtime = src->pingtime;
 	pass = src->pass;
 	hash = src->hash;
-	sendqmax = src->sendqmax;
+	softsendqmax = src->softsendqmax;
+	hardsendqmax = src->hardsendqmax;
 	recvqmax = src->recvqmax;
+	penaltythreshold = src->penaltythreshold;
 	maxlocal = src->maxlocal;
 	maxglobal = src->maxglobal;
 	limit = src->limit;