X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=d108a314ef3428f330be36f4e42e2bbd46255af9;hb=93f7ee5268d7c953108355597d4a888c8a245671;hp=608d5f728b8e8ff16b6765bffada46ade4e49eda;hpb=1fc43c1cab6a02df61955dc48dbf6bef3c586c4f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 608d5f728..d108a314e 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDusers */
+/* $Core */
 
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 #include "commands/cmd_whowas.h"
@@ -82,7 +81,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 					}
 				}
 				else
-					this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick, *c);
+					this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
 
 				oldadding = adding;
 			break;
@@ -91,6 +90,12 @@ std::string User::ProcessNoticeMasks(const char *sm)
 		*c++;
 	}
 
+	std::string s = this->FormatNoticeMasks();
+	if (s.length() == 0)
+	{
+		this->modes[UM_SNOMASK] = false;
+	}
+
 	return output;
 }
 
@@ -98,14 +103,14 @@ void User::StartDNSLookup()
 {
 	try
 	{
-		bool cached;
-		const char* sip = this->GetIPString(false);
+		bool cached = false;
+		const char* sip = this->GetIPString();
+		UserResolver *res_reverse;
 
-		/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
-		if (!strncmp(sip, "0::ffff:", 8))
-			res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
-		else
-			res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+		QueryType resolvtype = 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);
 
 		this->ServerInstance->AddResolver(res_reverse, cached);
 	}
@@ -117,11 +122,15 @@ void User::StartDNSLookup()
 
 bool User::IsNoticeMaskSet(unsigned char sm)
 {
+	if (!isalpha(sm))
+		return false;
 	return (snomasks[sm-65]);
 }
 
 void User::SetNoticeMask(unsigned char sm, bool value)
 {
+	if (!isalpha(sm))
+		return;
 	snomasks[sm-65] = value;
 }
 
@@ -140,28 +149,42 @@ const char* User::FormatNoticeMasks()
 	return data;
 }
 
-
-
 bool User::IsModeSet(unsigned char m)
 {
+	if (!isalpha(m))
+		return false;
 	return (modes[m-65]);
 }
 
 void User::SetMode(unsigned char m, bool value)
 {
+	if (!isalpha(m))
+		return;
 	modes[m-65] = value;
 }
 
-const char* User::FormatModes()
+const char* User::FormatModes(bool showparameters)
 {
 	static char data[MAXBUF];
+	std::string params;
 	int offset = 0;
-	for (int n = 0; n < 64; n++)
+
+	for (unsigned char n = 0; n < 64; n++)
 	{
 		if (modes[n])
-			data[offset++] = n+65;
+		{
+			data[offset++] = n + 65;
+			ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+			if (showparameters && mh && mh->GetNumParams(true))
+			{
+				std::string p = mh->GetUserParameter(this);
+				if (p.length())
+					params.append(" ").append(p);
+			}
+		}
 	}
 	data[offset] = 0;
+	strlcat(data, params.c_str(), MAXBUF);
 	return data;
 }
 
@@ -185,39 +208,28 @@ void User::DecrementModes()
 
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
-	*password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
 	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-	reset_due = ServerInstance->Time();
 	age = ServerInstance->Time();
 	Penalty = 0;
-	lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
-	ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-	quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+	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();
-	WriteError.clear();
-	res_forward = res_reverse = NULL;
 	Visibility = NULL;
 	ip = NULL;
 	MyClass = NULL;
-	io = NULL;
-	AllowedUserModes = NULL;
-	AllowedChanModes = NULL;
-	AllowedOperCommands = NULL;
+	AllowedPrivs = AllowedOperCommands = NULL;
 	chans.clear();
 	invites.clear();
-	memset(modes,0,sizeof(modes));
-	memset(snomasks,0,sizeof(snomasks));
-	/* Invalidate cache */
-	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
 
 	if (uid.empty())
-		strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
+		uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
 	else
-		strlcpy(uuid, uid.c_str(), UUID_LENGTH);
+		uuid.assign(uid, 0, UUID_LENGTH - 1);
 
-	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), uid.empty() ? "allocated new" : "used remote");
 
 	user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
 	if (finduuid == Instance->Users->uuidlist->end())
@@ -234,22 +246,17 @@ User::~User()
 		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->AllowedUserModes)
-	{
-		delete[] AllowedUserModes;
-		AllowedUserModes = NULL;
-	}
-
-	if (this->AllowedChanModes)
+	if (this->AllowedPrivs)
 	{
-		delete[] AllowedChanModes;
-		AllowedChanModes = NULL;
+		delete AllowedPrivs;
+		AllowedPrivs = NULL;
 	}
 
 	this->InvalidateCache();
@@ -274,42 +281,42 @@ User::~User()
 	ServerInstance->Users->uuidlist->erase(uuid);
 }
 
-char* User::MakeHost()
+const std::string& User::MakeHost()
 {
-	if (this->cached_makehost)
+	if (!this->cached_makehost.empty())
 		return this->cached_makehost;
 
 	char nhost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = nhost;
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
-	this->cached_makehost = strdup(nhost);
+	this->cached_makehost.assign(nhost);
 
 	return this->cached_makehost;
 }
 
-char* User::MakeHostIP()
+const std::string& User::MakeHostIP()
 {
-	if (this->cached_hostip)
+	if (!this->cached_hostip.empty())
 		return this->cached_hostip;
 
 	char ihost[MAXBUF];
 	/* This is much faster than snprintf */
 	char* t = ihost;
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
 	for(const char* n = this->GetIPString(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
-	this->cached_hostip = strdup(ihost);
+	this->cached_hostip = ihost;
 
 	return this->cached_hostip;
 }
@@ -323,24 +330,24 @@ void User::CloseSocket()
 	}
 }
 
-char* User::GetFullHost()
+const std::string& User::GetFullHost()
 {
-	if (this->cached_fullhost)
+	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
 
 	char result[MAXBUF];
 	char* t = result;
-	for(char* n = nick; *n; n++)
+	for(const char* n = nick.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '!';
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = dhost; *n; n++)
+	for(const char* n = dhost.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
-	this->cached_fullhost = strdup(result);
+	this->cached_fullhost = result;
 
 	return this->cached_fullhost;
 }
@@ -351,7 +358,7 @@ char* User::MakeWildHost()
 	char* t = nresult;
 	*t++ = '*';	*t++ = '!';
 	*t++ = '*';	*t++ = '@';
-	for(char* n = dhost; *n; n++)
+	for(const char* n = dhost.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 	return nresult;
@@ -372,31 +379,31 @@ int User::ReadData(void* buffer, size_t size)
 }
 
 
-char* User::GetFullRealHost()
+const std::string& User::GetFullRealHost()
 {
-	if (this->cached_fullrealhost)
+	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
 
 	char fresult[MAXBUF];
 	char* t = fresult;
-	for(char* n = nick; *n; n++)
+	for(const char* n = nick.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '!';
-	for(char* n = ident; *n; n++)
+	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
-	this->cached_fullrealhost = strdup(fresult);
+	this->cached_fullrealhost = fresult;
 
 	return this->cached_fullrealhost;
 }
 
 bool User::IsInvited(const irc::string &channel)
 {
-	time_t now = time(NULL);
+	time_t now = ServerInstance->Time();
 	InvitedList::iterator safei;
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
 	{
@@ -418,7 +425,7 @@ bool User::IsInvited(const irc::string &channel)
 
 InvitedList* User::GetInviteList()
 {
-	time_t now = time(NULL);
+	time_t now = ServerInstance->Time();
 	/* Weed out expired invites here. */
 	InvitedList::iterator safei;
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
@@ -436,7 +443,7 @@ InvitedList* User::GetInviteList()
 
 void User::InviteTo(const irc::string &channel, time_t invtimeout)
 {
-	time_t now = time(NULL);
+	time_t now = ServerInstance->Time();
 	if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
 	{
@@ -446,6 +453,8 @@ void User::InviteTo(const irc::string &channel, time_t invtimeout)
 			{
 				i->second = invtimeout;
 			}
+
+			return;
 		}
 	}
 	invites.push_back(std::make_pair(channel, invtimeout));
@@ -471,8 +480,7 @@ bool User::HasModePermission(unsigned char mode, ModeType type)
 	if (!IS_OPER(this))
 		return false;
 
-	if (!AllowedUserModes || !AllowedChanModes)
-		return false;
+	if (mode < 'A' || mode > ('A' + 64)) return false;
 
 	return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
 	
@@ -507,6 +515,46 @@ bool User::HasPermission(const std::string &command)
 	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;
+	}
+
+	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())
+	{
+		return true;
+	}
+	else if (AllowedPrivs->find("*") != 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());
+	return false;
+}
+
 bool User::AddBuffer(const std::string &a)
 {
 	std::string::size_type start = 0;
@@ -561,10 +609,10 @@ bool User::AddBuffer(const std::string &a)
 		}
 	}
 
-	if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+	if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
 	{
-		this->SetWriteError("RecvQ exceeded");
-		ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick,(unsigned long int)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;
 	}
 
@@ -623,18 +671,18 @@ std::string User::GetBuffer()
 
 void User::AddWriteBuf(const std::string &data)
 {
-	if (*this->GetWriteError())
+	if (this->quitting)
 		return;
 
-	if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+	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!
 		 */
-		this->SetWriteError("SendQ exceeded");
-		ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick,(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax());
+		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;
 	}
 
@@ -647,184 +695,165 @@ void User::AddWriteBuf(const std::string &data)
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
 void User::FlushWriteBuf()
 {
-	try
+	if (this->fd == FD_MAGIC_NUMBER)
 	{
-		if ((this->fd == FD_MAGIC_NUMBER) || (*this->GetWriteError()))
-		{
-			sendq.clear();
-		}
-		if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
-		{
-			int old_sendq_length = sendq.length();
-			int n_sent = ServerInstance->SE->Send(this, this->sendq.data(), this->sendq.length(), 0);
+		sendq.clear();
+		return;
+	}
 
-			if (n_sent == -1)
+	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)
 			{
-				if (errno == EAGAIN)
-				{
-					/* The socket buffer is full. This isnt fatal,
-					 * try again later.
-					 */
-					this->ServerInstance->SE->WantWrite(this);
-				}
-				else
-				{
-					/* Fatal error, set write error and bail
-					 */
-					this->SetWriteError(errno ? strerror(errno) : "EOF from client");
-					return;
-				}
+				/* The socket buffer is full. This isnt fatal,
+				 * try again later.
+				 */
+				ServerInstance->SE->WantWrite(this);
 			}
 			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);
+				/* 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);
+		}
 	}
 
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()");
-	}
-
+	/* note: NOT else if! */
 	if (this->sendq.empty())
 	{
 		FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(this));
 	}
 }
 
-void User::SetWriteError(const std::string &error)
-{
-	// don't try to set the error twice, its already set take the first string.
-	if (this->WriteError.empty())
-		this->WriteError = error;
-}
-
-const char* User::GetWriteError()
-{
-	return this->WriteError.c_str();
-}
-
 void User::Oper(const std::string &opertype, const std::string &opername)
 {
-	char* mycmd;
-	char* savept;
-	char* savept2;
+	if (this->IsModeSet('o'))
+		this->UnOper();
 
-	try
-	{
-		this->modes[UM_OPERATOR] = 1;
-		this->WriteServ("MODE %s :+o", this->nick);
-		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
-		strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
-		ServerInstance->Users->all_opers.push_back(this);
+	this->modes[UM_OPERATOR] = 1;
+	this->WriteServ("MODE %s :+o", this->nick.c_str());
+	FOREACH_MOD(I_OnOper, OnOper(this, opertype));
 
-		opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
-		if (iter_opertype != ServerInstance->Config->opertypes.end())
-		{
+	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()));
 
-			if (AllowedOperCommands)
-				AllowedOperCommands->clear();
-			else
-				AllowedOperCommands = new std::map<std::string, bool>;
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
+	this->oper.assign(opertype, 0, 512);
+	ServerInstance->Users->all_opers.push_back(this);
 
-			if (!AllowedChanModes)
-				AllowedChanModes = new bool[64];
+	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>;
 
-			if (!AllowedUserModes)
-				AllowedUserModes = new bool[64];
+		if (AllowedPrivs)
+			AllowedPrivs->clear();
+		else
+			AllowedPrivs = new std::set<std::string>;
 
-			memset(AllowedUserModes, 0, 64);
-			memset(AllowedChanModes, 0, 64);
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
+		this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
-			char* Classes = strdup(iter_opertype->second);
-			char* myclass = strtok_r(Classes," ",&savept);
-			while (myclass)
+		std::string myclass, mycmd, mypriv;
+		irc::spacesepstream Classes(iter_opertype->second);
+		while (Classes.GetToken(myclass))
+		{
+			operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
+			if (iter_operclass != ServerInstance->Config->operclass.end())
 			{
-				operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
-				if (iter_operclass != ServerInstance->Config->operclass.end())
+				/* Process commands */
+				irc::spacesepstream CommandList(iter_operclass->second.commandlist);
+				while (CommandList.GetToken(mycmd))
+				{
+					this->AllowedOperCommands->insert(mycmd);
+				}
+
+				irc::spacesepstream PrivList(iter_operclass->second.privs);
+				while (PrivList.GetToken(mypriv))
+				{
+					this->AllowedPrivs->insert(mypriv);
+				}
+
+				for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
 				{
-					char* CommandList = strdup(iter_operclass->second.commandlist);
-					mycmd = strtok_r(CommandList," ",&savept2);
-					while (mycmd)
+					if (*c == '*')
 					{
-						this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
-						mycmd = strtok_r(NULL," ",&savept2);
+						this->AllowedUserModes.set();
 					}
-					free(CommandList);
-					this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
-					for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
+					else
 					{
-						if (*c == '*')
-						{
-							memset(this->AllowedUserModes, (int)(true), 64);
-						}
-						else
-						{
-							this->AllowedUserModes[*c - 'A'] = true;
-						}
+						this->AllowedUserModes[*c - 'A'] = true;
+					}
+				}
+
+				for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+				{
+					if (*c == '*')
+					{
+						this->AllowedChanModes.set();
 					}
-					for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+					else
 					{
-						if (*c == '*')
-						{
-							memset(this->AllowedChanModes, (int)(true), 64);
-						}
-						else
-						{
-							this->AllowedChanModes[*c - 'A'] = true;
-						}
+						this->AllowedChanModes[*c - 'A'] = true;
 					}
 				}
-				myclass = strtok_r(NULL," ",&savept);
 			}
-			free(Classes);
 		}
-
-		FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
 	}
 
-	catch (...)
-	{
-		ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()");
-	}
+	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();
+
+
 		/* Remove all oper only modes from the user when the deoper - Bug #466*/
 		std::string moderemove("-");
 
 		for (unsigned char letter = 'A'; letter <= 'z'; letter++)
 		{
-			if (letter != 'o')
-			{
-				ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
-				if (mh && mh->NeedsOper())
-					moderemove += 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);
 
 		ServerInstance->Parser->CallHandler("MODE", parameters, this);
 
-		/* unset their oper type (what IS_OPER checks), and remove +o */
-		*this->oper = 0;
-		this->modes[UM_OPERATOR] = 0;
-			
 		/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
 		ServerInstance->Users->all_opers.remove(this);
 
@@ -833,17 +862,16 @@ void User::UnOper()
 			delete AllowedOperCommands;
 			AllowedOperCommands = NULL;
 		}
-		if (AllowedUserModes)
-		{
-			delete[] AllowedUserModes;
-			AllowedUserModes = NULL;
-		}
-		if (AllowedChanModes)
+
+		if (AllowedPrivs)
 		{
-			delete[] AllowedChanModes;
-			AllowedChanModes = NULL;
+			delete AllowedPrivs;
+			AllowedPrivs = NULL;
 		}
 
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
+		this->modes[UM_OPERATOR] = 0;
 	}
 }
 
@@ -885,14 +913,12 @@ void User::CheckClass()
 	}
 
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
-	this->timeout = ServerInstance->Time() + a->GetRegTimeout();
-	this->MaxChans = a->GetMaxChans();
 }
 
-void User::CheckLines()
+bool User::CheckLines(bool doZline)
 {
-	const char* check[] = { "G" , "K", NULL };
-
+	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
+	
 	if (!this->exempt)
 	{
 		for (int n = 0; check[n]; ++n)
@@ -902,10 +928,12 @@ void User::CheckLines()
 			if (r)
 			{
 				r->Apply(this);
-				return;
+				return true;
 			}
 		}
 	}
+
+	return false;
 }
 
 void User::FullConnect()
@@ -930,16 +958,17 @@ void User::FullConnect()
 		return;
 	}
 
-	CheckLines();
+	if (this->CheckLines())
+		return;
 
 	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
-	this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
-	this->WriteNumeric(002, "%s :Your host is %s, running version InspIRCd-1.2",this->nick,ServerInstance->Config->ServerName);
-	this->WriteNumeric(003, "%s :This server was created %s %s", this->nick, __TIME__, __DATE__);
-	this->WriteNumeric(004, "%s %s InspIRCd-1.2 %s %s %s", this->nick, ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-1.2 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
 	ServerInstance->Config->Send005(this);
-	this->WriteNumeric(42, "%s %s :your unique ID", this->nick, this->uuid);
+	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
 
 	this->ShowMOTD();
@@ -950,9 +979,11 @@ void User::FullConnect()
 
 	/* Trigger LUSERS output, give modules a chance too */
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnPreCommand, OnPreCommand("LUSERS", std::vector<std::string>(), this, true, "LUSERS"));
+	std::string command("LUSERS");
+	std::vector<std::string> parameters;
+	FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS"));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler("LUSERS", std::vector<std::string>(), this);
+		ServerInstance->CallCommandHandler(command, parameters, this);
 
 	/*
 	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
@@ -962,9 +993,11 @@ 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, this->ident, this->host, this->GetIPString(), this->fullname);
+	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->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
 	ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 }
@@ -978,30 +1011,25 @@ User* User::UpdateNickHash(const char* New)
 	//user_hash::iterator newnick;
 	user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
 
-	if (!strcasecmp(this->nick,New))
+	if (!irc::string(this->nick.c_str()).compare(New))
 		return oldnick->second;
 
 	if (oldnick == ServerInstance->Users->clientlist->end())
 		return NULL; /* doesnt exist */
 
 	User* olduser = oldnick->second;
-	(*(ServerInstance->Users->clientlist))[New] = olduser;
 	ServerInstance->Users->clientlist->erase(oldnick);
+	(*(ServerInstance->Users->clientlist))[New] = olduser;
 	return olduser;
 }
 
 void User::InvalidateCache()
 {
 	/* Invalidate cache */
-	if (cached_fullhost)
-		free(cached_fullhost);
-	if (cached_hostip)
-		free(cached_hostip);
-	if (cached_makehost)
-		free(cached_makehost);
-	if (cached_fullrealhost)
-		free(cached_fullrealhost);
-	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+	cached_fullhost.clear();
+	cached_hostip.clear();
+	cached_makehost.clear();
+	cached_fullrealhost.clear();
 }
 
 bool User::ForceNickChange(const char* newnick)
@@ -1061,7 +1089,7 @@ void User::SetSockAddr(int protocol_family, const char* sip, int port)
 		}
 		break;
 		default:
-			ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick);
+			ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
 		break;
 	}
 }
@@ -1102,13 +1130,116 @@ int User::GetProtocolFamily()
 	return sin->sin_family;
 }
 
-/*
- * XXX the duplication here is horrid..
- * do we really need two methods doing essentially the same thing?
- */
-const char* User::GetIPString(bool translate4in6)
+const char* User::GetCIDRMask(int range)
 {
-	static char buf[1024];
+	static char buf[44];
+
+	if (this->ip == NULL)
+		return "";
+
+	if (range < 0)
+		throw "Negative range, sorry, no.";
+
+	/*
+	 * Original code written by Oliver Lupton (Om).
+	 * Integrated by me. Thanks. :) -- w00t
+	 */
+	switch (this->GetProtocolFamily())
+	{
+#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
+		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;
+	}
+
+	return ""; // unused, but oh well
+}
+
+const char* User::GetIPString()
+{
+	static char buf[40];
 
 	if (this->ip == NULL)
 		return "";
@@ -1130,12 +1261,6 @@ const char* User::GetIPString(bool translate4in6)
 			{
 				strlcpy(&temp[1], buf, sizeof(temp) - 1);
 				*temp = '0';
-				if (translate4in6 && !strncmp(temp, "0::ffff:", 8))
-				{
-					this->cachedip = temp + 8;
-					return temp + 8;
-				}
-
 				this->cachedip = temp;
 				return temp;
 			}
@@ -1183,14 +1308,14 @@ void User::Write(std::string text)
 		return;
 	}
 
-	if (this->io)
+	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->io->OnRawSocketWrite(this->fd, text.data(), text.length());
+			this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
 		catch (CoreException& modexcept)
 		{
@@ -1273,7 +1398,7 @@ void User::WriteFrom(User *user, const std::string &text)
 {
 	char tb[MAXBUF];
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(),text.c_str());
 
 	this->Write(std::string(tb));
 }
@@ -1343,7 +1468,7 @@ void User::WriteCommon(const std::string &text)
 		InitializeAlreadySent(ServerInstance->SE);
 
 	/* We dont want to be doing this n times, just once */
-	snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+	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++)
@@ -1400,8 +1525,8 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 	if (!already_sent)
 		InitializeAlreadySent(ServerInstance->SE);
 
-	snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost(),normal_text.c_str());
-	snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost(),oper_text.c_str());
+	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;
 
@@ -1435,7 +1560,7 @@ void User::WriteCommonExcept(const std::string &text)
 	if (!already_sent)
 		InitializeAlreadySent(ServerInstance->SE);
 
-	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost().c_str(),text.c_str());
 	out1 = tb1;
 
 	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
@@ -1518,7 +1643,7 @@ bool User::SharesChannelWith(User *other)
 
 bool User::ChangeName(const char* gecos)
 {
-	if (!strcmp(gecos, this->fullname))
+	if (!this->fullname.compare(gecos))
 		return true;
 
 	if (IS_LOCAL(this))
@@ -1529,14 +1654,14 @@ bool User::ChangeName(const char* gecos)
 			return false;
 		FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
 	}
-	strlcpy(this->fullname,gecos,MAXGECOS+1);
+	this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
 
 	return true;
 }
 
 bool User::ChangeDisplayedHost(const char* shost)
 {
-	if (!strcmp(shost, this->dhost))
+	if (dhost == shost)
 		return true;
 
 	if (IS_LOCAL(this))
@@ -1545,54 +1670,61 @@ bool User::ChangeDisplayedHost(const char* shost)
 		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
 		if (MOD_RESULT)
 			return false;
-		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
 	}
 
-	if (this->ServerInstance->Config->CycleHosts)
+	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");
 
 	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
-	strlcpy(this->dhost,shost,64);
+	this->dhost.assign(shost, 0, 64);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
+	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);
+			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, n.c_str());
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
 	if (IS_LOCAL(this))
-		this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick,this->dhost);
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
 
 	return true;
 }
 
 bool User::ChangeIdent(const char* newident)
 {
-	if (!strcmp(newident, this->ident))
+	if (this->ident == newident)
 		return true;
 
-	if (this->ServerInstance->Config->CycleHosts)
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");
 
-	strlcpy(this->ident, newident, IDENTMAX+1);
+	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 	{
 		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
-			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+			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, n.c_str());
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
@@ -1609,7 +1741,7 @@ void User::SendAll(const char* command, const char* text, ...)
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
+	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost().c_str(), command, textbuffer);
 	std::string fmt = formatbuffer;
 
 	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
@@ -1675,12 +1807,6 @@ void User::SplitChanList(User* dest, const std::string &cl)
 	}
 }
 
-unsigned int User::GetMaxChans()
-{
-	return this->MaxChans;
-}
-
-
 /*
  * Sets a user's connection class.
  * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc.
@@ -1695,7 +1821,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 	if (!IS_LOCAL(this))
 		return NULL;
 
-	ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid);
+	ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid.c_str());
 
 	if (!explicit_name.empty())
 	{
@@ -1728,8 +1854,16 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				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 (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost()))))
+			if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && 
+			    !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
 				continue;
@@ -1745,13 +1879,6 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				continue;
 			}
 
-			/* if it's disabled, we can't match this one. */
-			if (c->GetDisabled())
-			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
-				continue;
-			}
-
 			/* if it requires a port ... */
 			if (c->GetPort())
 			{
@@ -1765,8 +1892,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				}
 			}
 
-			/* we match this class, BUT! we must keep checking in case a further class is type deny and also matches us. */
+			/* we stop at the first class that meets ALL critera. */
 			found = c;
+			break;
 		}
 	}
 
@@ -1844,31 +1972,31 @@ void User::ShowMOTD()
 {
 	if (!ServerInstance->Config->MOTD.size())
 	{
-		this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick);
+		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
 		return;
 	}
-	this->WriteNumeric(375, "%s :%s message of the day", this->nick, ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
 
 	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-		this->WriteNumeric(372, "%s :- %s",this->nick,i->c_str());
+		this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
 
-	this->WriteNumeric(376, "%s :End of message of the day.", this->nick);
+	this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
 }
 
 void User::ShowRULES()
 {
 	if (!ServerInstance->Config->RULES.size())
 	{
-		this->WriteNumeric(434, "%s :RULES File is missing",this->nick);
+		this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
 		return;
 	}
 
-	this->WriteNumeric(308, "%s :- %s Server Rules -",this->nick,ServerInstance->Config->ServerName);
+	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(232, "%s :- %s",this->nick,i->c_str());
+		this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
 
-	this->WriteNumeric(309, "%s :End of RULES command.",this->nick);
+	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
 }
 
 void User::HandleEvent(EventType et, int errornum)
@@ -1876,37 +2004,17 @@ void User::HandleEvent(EventType et, int errornum)
 	if (this->quitting) // drop everything, user is due to be quit
 		return;
 
-	/* WARNING: May delete this user! */
-	int thisfd = this->GetFd();
-
-	try
-	{
-		switch (et)
-		{
-			case EVENT_READ:
-				ServerInstance->ProcessUser(this);
-			break;
-			case EVENT_WRITE:
-				this->FlushWriteBuf();
-			break;
-			case EVENT_ERROR:
-				/** This should be safe, but dont DARE do anything after it -- Brain */
-				this->SetWriteError(errornum ? strerror(errornum) : "EOF from client");
-			break;
-		}
-	}
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::HandleEvent intercepted");
-	}
-
-	/* If the user has raised an error whilst being processed, quit them now we're safe to */
-	if ((ServerInstance->SE->GetRef(thisfd) == this))
+	switch (et)
 	{
-		if (!WriteError.empty())
-		{
-			ServerInstance->Users->QuitUser(this, GetWriteError());
-		}
+		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;
 	}
 }
 
@@ -1915,9 +2023,9 @@ void User::SetOperQuit(const std::string &oquit)
 	operquitmsg = oquit;
 }
 
-const char* User::GetOperQuit()
+const std::string& User::GetOperQuit()
 {
-	return operquitmsg.c_str();
+	return operquitmsg;
 }
 
 void User::IncreasePenalty(int increase)