X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=b3e6ef58f32b3efa082b4c8c0bc3f120b250e4b0;hb=36cb60f872712e8e5a59df74b5b36177addc4248;hp=de608508400d7ecbb3102005a8406e9f9ebac134;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index de6085084..b3e6ef58f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -16,7 +16,6 @@
 #include "inspircd.h"
 #include <stdarg.h>
 #include "socketengine.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 #include "commands/cmd_whowas.h"
@@ -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;
 }
 
@@ -186,23 +209,18 @@ void User::DecrementModes()
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
 	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;
+	lastping = signon = idle_lastmsg = nping = registered = 0;
 	bytes_in = bytes_out = cmds_in = cmds_out = 0;
-	quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+	quietquit = quitting = exempt = haspassed = dns_done = false;
 	fd = -1;
 	recvq.clear();
 	sendq.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();
 
@@ -227,23 +245,20 @@ User::~User()
 	{
 		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->AllowedUserModes)
-	{
-		delete[] AllowedUserModes;
-		AllowedUserModes = NULL;
-	}
-
-	if (this->AllowedChanModes)
+	if (this->AllowedPrivs)
 	{
-		delete[] AllowedChanModes;
-		AllowedChanModes = NULL;
+		delete AllowedPrivs;
+		AllowedPrivs = NULL;
 	}
 
 	this->InvalidateCache();
@@ -317,7 +332,7 @@ void User::CloseSocket()
 	}
 }
 
-const std::string& User::GetFullHost()
+const std::string User::GetFullHost()
 {
 	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
@@ -366,7 +381,7 @@ int User::ReadData(void* buffer, size_t size)
 }
 
 
-const std::string& User::GetFullRealHost()
+const std::string User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
@@ -390,7 +405,7 @@ const std::string& User::GetFullRealHost()
 
 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)
 	{
@@ -412,7 +427,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)
@@ -430,7 +445,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)
 	{
@@ -440,6 +455,8 @@ void User::InviteTo(const irc::string &channel, time_t invtimeout)
 			{
 				i->second = invtimeout;
 			}
+
+			return;
 		}
 	}
 	invites.push_back(std::make_pair(channel, invtimeout));
@@ -465,11 +482,10 @@ 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')];
-	
+
 }
 
 bool User::HasPermission(const std::string &command)
@@ -501,6 +517,43 @@ bool User::HasPermission(const std::string &command)
 	return false;
 }
 
+
+bool User::HasPrivPermission(const std::string &privstr, bool noisy)
+{
+	if (!IS_LOCAL(this))
+	{
+		ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
+		return true;
+	}
+
+	if (!IS_OPER(this))
+	{
+		if (noisy)
+			this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
+		return false;
+	}
+
+	if (!AllowedPrivs)
+	{
+		if (noisy)
+			this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
+		return false;
+	}
+
+	if (AllowedPrivs->find(privstr) != AllowedPrivs->end())
+	{
+		return true;
+	}
+	else if (AllowedPrivs->find("*") != AllowedPrivs->end())
+	{
+		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;
@@ -555,10 +608,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())
 	{
 		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());
+		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;
 	}
 
@@ -617,10 +670,7 @@ std::string User::GetBuffer()
 
 void User::AddWriteBuf(const std::string &data)
 {
-	if (this->quitting)
-		return;
-
-	if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+	if (!this->quitting && this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
 	{
 		/*
 		 * Fix by brain - Set the error text BEFORE calling, because
@@ -628,10 +678,13 @@ void User::AddWriteBuf(const std::string &data)
 		 * to repeatedly add the text to the sendq!
 		 */
 		ServerInstance->Users->QuitUser(this, "SendQ exceeded");
-		ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax());
+		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;
 	}
 
+	// 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
@@ -690,117 +743,123 @@ void User::FlushWriteBuf()
 
 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.c_str());
-		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
-		this->oper.assign(opertype, 0, 512);
-		ServerInstance->Users->all_opers.push_back(this);
+	this->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.c_str());
-		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];
+	/*
+	 * 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>;
 
-			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.c_str());
+		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))
 				{
-					char* CommandList = strdup(iter_operclass->second.commandlist);
-					mycmd = strtok_r(CommandList," ",&savept2);
-					while (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)
+				{
+					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)
+				}
+
+				for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c)
+				{
+					if (*c == '*')
 					{
-						if (*c == '*')
-						{
-							memset(this->AllowedChanModes, (int)(true), 64);
-						}
-						else
-						{
-							this->AllowedChanModes[*c - 'A'] = true;
-						}
+						this->AllowedChanModes.set();
+					}
+					else
+					{
+						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.clear();
-		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);
 
@@ -809,17 +868,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;
 	}
 }
 
@@ -842,7 +900,7 @@ void User::CheckClass()
 {
 	ConnectClass* a = this->MyClass;
 
-	if ((!a) || (a->GetType() == CC_DENY))
+	if ((!a) || (a->type == CC_DENY))
 	{
 		ServerInstance->Users->QuitUser(this, "Unauthorised connection");
 		return;
@@ -850,22 +908,22 @@ void User::CheckClass()
 	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
 		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
-		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
+		ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
 		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
-		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+		ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
 
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
 }
 
-bool 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)
 	{
@@ -896,7 +954,7 @@ void User::FullConnect()
 	 * Don't remove this! -- w00t
 	 */
 	this->SetClass();
-	
+
 	/* Check the password, if one is required by the user's connect class.
 	 * This CANNOT be in CheckClass(), because that is called prior to PASS as well!
 	 */
@@ -966,8 +1024,8 @@ User* User::UpdateNickHash(const char* New)
 		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;
 }
 
@@ -986,8 +1044,12 @@ bool User::ForceNickChange(const char* newnick)
 
 	this->InvalidateCache();
 
+	this->Extend("NICKForced", "Enabled");
+
 	FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
+	this->Shrink("NICKForced");
+
 	if (MOD_RESULT)
 	{
 		ServerInstance->stats->statsCollisions++;
@@ -1001,7 +1063,9 @@ bool User::ForceNickChange(const char* newnick)
 		std::vector<std::string> parameters;
 		nickhandler->HandleInternal(1, dummy);
 		parameters.push_back(newnick);
+		this->Extend("NICKForced", "Enabled");
 		bool result = (ServerInstance->Parser->CallHandler("NICK", parameters, this) == CMD_SUCCESS);
+		this->Shrink("NICKForced");
 		nickhandler->HandleInternal(0, dummy);
 		return result;
 	}
@@ -1102,7 +1166,7 @@ const char* User::GetCIDRMask(int range)
 			sockaddr_in6* sin;
 			int i, bytestozero, extrabits;
 			char buffer[40];
-			
+
 			if(range > 128)
 				throw "CIDR mask width greater than address width (IPv6, 128 bit)";
 
@@ -1115,12 +1179,12 @@ const char* User::GetCIDRMask(int range)
 			 * 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.
@@ -1129,13 +1193,13 @@ const char* User::GetCIDRMask(int range)
 			{
 				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;
 
@@ -1185,7 +1249,7 @@ const char* User::GetCIDRMask(int range)
 	return ""; // unused, but oh well
 }
 
-const char* User::GetIPString(bool translate4in6)
+const char* User::GetIPString()
 {
 	static char buf[40];
 
@@ -1209,16 +1273,10 @@ 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;
 			}
-			
+
 			this->cachedip = buf;
 			return buf;
 		}
@@ -1235,7 +1293,7 @@ const char* User::GetIPString(bool translate4in6)
 		default:
 		break;
 	}
-	
+
 	// Unreachable, probably
 	return "";
 }
@@ -1262,14 +1320,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)
 		{
@@ -1537,9 +1595,6 @@ void User::WriteCommonExcept(const std::string &text)
 
 void User::WriteWallOps(const std::string &text)
 {
-	if (!IS_LOCAL(this))
-		return;
-
 	std::string wallop("WALLOPS :");
 	wallop.append(text);
 
@@ -1624,10 +1679,14 @@ 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 */
@@ -1635,7 +1694,7 @@ bool User::ChangeDisplayedHost(const char* shost)
 
 	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++)
 		{
@@ -1654,17 +1713,20 @@ bool User::ChangeDisplayedHost(const char* shost)
 
 bool User::ChangeIdent(const char* newident)
 {
-	if (!this->ident.compare(newident))
+	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");
 
 	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++)
 		{
@@ -1776,10 +1838,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetDisabled())
-				continue; // can't possibly match, removed from conf
-
-			if (explicit_name == c->GetName())
+			if (explicit_name == c->name)
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
 				found = c;
@@ -1792,24 +1851,18 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetType() == CC_ALLOW)
+			if (c->type == CC_ALLOW)
 			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str());
 			}
 			else
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
 			}
 
-			/* if it's disabled, we can't match this one. */
-			if (c->GetDisabled())
-			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
-				continue;
-			}
-
 			/* check if host matches.. */
-			if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost()))))
+			if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
+			    !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
 				continue;
@@ -1819,7 +1872,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 			 * deny change if change will take class over the limit check it HERE, not after we found a matching class,
 			 * because we should attempt to find another class if this one doesn't match us. -- w00t
 			 */
-			if (c->limit && (c->RefCount + 1 >= c->limit))
+			if (c->limit && (c->RefCount >= c->limit))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
 				continue;
@@ -1856,6 +1909,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				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;
@@ -1904,6 +1959,10 @@ void User::PurgeEmptyChannels()
 		chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
 		if (i2 != ServerInstance->chanlist->end())
 		{
+			int MOD_RESULT = 0;
+			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(i2->second));
+			if (MOD_RESULT == 1)
+				continue; // delete halted by module
 			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
 			delete i2->second;
 			ServerInstance->chanlist->erase(i2);
@@ -1984,6 +2043,26 @@ void User::DecreasePenalty(int decrease)
 	this->Penalty -= decrease;
 }
 
+void FakeUser::SetFakeServer(std::string name)
+{
+	this->nick = name;
+	this->server = nick.c_str();
+}
+
+const std::string FakeUser::GetFullHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
+const std::string FakeUser::GetFullRealHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
 VisData::VisData()
 {
 }
@@ -1997,3 +2076,28 @@ bool VisData::VisibleTo(User* user)
 	return true;
 }
 
+
+ConnectClass::ConnectClass(char t, const std::string& mask)
+	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
+{
+}
+
+ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
+	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
+{
+}
+
+void ConnectClass::Update(const ConnectClass* src)
+{
+	name = src->name;
+	registration_timeout = src->registration_timeout;
+	host = src->host;
+	pingtime = src->pingtime;
+	pass = src->pass;
+	hash = src->hash;
+	sendqmax = src->sendqmax;
+	recvqmax = src->recvqmax;
+	maxlocal = src->maxlocal;
+	maxglobal = src->maxglobal;
+	limit = src->limit;
+}