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

diff --git a/src/users.cpp b/src/users.cpp
index 4b6686977..eea27f6f7 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -44,7 +44,7 @@ class sent
 	}
 	~sent()
 	{
-		delete array;
+		delete[] array;
 	}
 };
 
@@ -104,7 +104,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 			break;
 		}
 
-		*c++;
+		c++;
 	}
 
 	std::string s = this->FormatNoticeMasks();
@@ -116,7 +116,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 	return output;
 }
 
-void User::StartDNSLookup()
+void LocalUser::StartDNSLookup()
 {
 	try
 	{
@@ -203,44 +203,16 @@ const char* User::FormatModes(bool showparameters)
 	return data;
 }
 
-void User::DecrementModes()
+User::User(const std::string &uid, const std::string& sid, int type)
+	: uuid(uid), server(sid), usertype(type)
 {
-	ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
-	for (unsigned char n = 'A'; n <= 'z'; n++)
-	{
-		if (modes[n-65])
-		{
-			ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
-			ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
-			if (mh)
-			{
-				ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
-				mh->ChangeCount(-1);
-			}
-		}
-	}
-}
-
-User::User(const std::string &uid)
-{
-	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;
-	fd = -1;
-	server_sa.sa.sa_family = AF_UNSPEC;
+	signon = idle_lastmsg = 0;
+	registered = 0;
+	quietquit = quitting = exempt = dns_done = false;
 	client_sa.sa.sa_family = AF_UNSPEC;
-	MyClass = NULL;
-	AllowedPrivs = AllowedOperCommands = NULL;
-
-	if (uid.empty())
-		uuid.assign(ServerInstance->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 = ServerInstance->Users->uuidlist->find(uuid);
 	if (finduuid == ServerInstance->Users->uuidlist->end())
@@ -249,10 +221,22 @@ User::User(const std::string &uid)
 		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
+LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
+	: User(ServerInstance->GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this)
+{
+	bytes_in = bytes_out = cmds_in = cmds_out = 0;
+	server_sa.sa.sa_family = AF_UNSPEC;
+	CommandFloodPenalty = 0;
+	lastping = nping = 0;
+	eh.SetFd(myfd);
+	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
+	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
+}
+
 User::~User()
 {
-	if (uuid.length())
-		ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str());
+	if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end())
+		ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str());
 }
 
 const std::string& User::MakeHost()
@@ -295,7 +279,7 @@ const std::string& User::MakeHostIP()
 	return this->cached_hostip;
 }
 
-const std::string User::GetFullHost()
+const std::string& User::GetFullHost()
 {
 	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
@@ -329,7 +313,7 @@ char* User::MakeWildHost()
 	return nresult;
 }
 
-const std::string User::GetFullRealHost()
+const std::string& User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
@@ -351,7 +335,7 @@ const std::string User::GetFullRealHost()
 	return this->cached_fullrealhost;
 }
 
-bool User::IsInvited(const irc::string &channel)
+bool LocalUser::IsInvited(const irc::string &channel)
 {
 	time_t now = ServerInstance->Time();
 	InvitedList::iterator safei;
@@ -373,7 +357,7 @@ bool User::IsInvited(const irc::string &channel)
 	return false;
 }
 
-InvitedList* User::GetInviteList()
+InvitedList* LocalUser::GetInviteList()
 {
 	time_t now = ServerInstance->Time();
 	/* Weed out expired invites here. */
@@ -391,7 +375,7 @@ InvitedList* User::GetInviteList()
 	return &invites;
 }
 
-void User::InviteTo(const irc::string &channel, time_t invtimeout)
+void LocalUser::InviteTo(const irc::string &channel, time_t invtimeout)
 {
 	time_t now = ServerInstance->Time();
 	if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
@@ -410,7 +394,7 @@ void User::InviteTo(const irc::string &channel, time_t invtimeout)
 	invites.push_back(std::make_pair(channel, invtimeout));
 }
 
-void User::RemoveInvite(const irc::string &channel)
+void LocalUser::RemoveInvite(const irc::string &channel)
 {
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
@@ -422,58 +406,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)
@@ -481,43 +463,39 @@ 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;
 }
 
-void User::OnDataReady()
+void UserIOHandler::OnDataReady()
 {
-	if (quitting)
+	if (user->quitting)
 		return;
 
-	if (MyClass && recvq.length() > MyClass->GetRecvqMax() && !HasPrivPermission("users/flood/increased-buffers"))
+	if (recvq.length() > user->MyClass->GetRecvqMax() && !user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
+		ServerInstance->Users->QuitUser(user, "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());
+			user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax());
 	}
 	unsigned long sendqmax = ULONG_MAX;
-	if (MyClass && !HasPrivPermission("users/flood/increased-buffers"))
-		sendqmax = MyClass->GetSendqSoftMax();
+	if (!user->HasPrivPermission("users/flood/increased-buffers"))
+		sendqmax = user->MyClass->GetSendqSoftMax();
+	unsigned long penaltymax = ULONG_MAX;
+	if (!user->HasPrivPermission("users/flood/no-fakelag"))
+		penaltymax = user->MyClass->GetPenaltyThreshold() * 1000;
 
-	while (Penalty < 10 && getSendQSize() < sendqmax)
+	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
 		std::string line;
 		line.reserve(MAXBUF);
@@ -546,30 +524,32 @@ eol_found:
 
 		// TODO should this be moved to when it was inserted in recvq?
 		ServerInstance->stats->statsRecv += qpos;
-		this->bytes_in += qpos;
-		this->cmds_in++;
+		user->bytes_in += qpos;
+		user->cmds_in++;
 
-		ServerInstance->Parser->ProcessBuffer(line, this);
+		ServerInstance->Parser->ProcessBuffer(line, user);
+		if (user->quitting)
+			return;
 	}
 	// Add pseudo-penalty so that we continue processing after sendq recedes
-	if (Penalty == 0 && getSendQSize() >= sendqmax)
-		Penalty++;
+	if (user->CommandFloodPenalty == 0 && getSendQSize() >= sendqmax)
+		user->CommandFloodPenalty++;
+	if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
+		ServerInstance->Users->QuitUser(user, "Excess Flood");
 }
 
-void User::AddWriteBuf(const std::string &data)
+void UserIOHandler::AddWriteBuf(const std::string &data)
 {
-	// Don't bother sending text to remote users!
-	if (IS_REMOTE(this))
-		return;
-	if (!quitting && MyClass && getSendQSize() + data.length() > MyClass->GetSendqHardMax() && !HasPrivPermission("users/flood/increased-buffers"))
+	if (!user->quitting && getSendQSize() + data.length() > user->MyClass->GetSendqHardMax() &&
+		!user->HasPrivPermission("users/flood/increased-buffers"))
 	{
 		/*
 		 * Quit the user FIRST, because otherwise we could recurse
 		 * here and hit the same limit.
 		 */
-		ServerInstance->Users->QuitUser(this, "SendQ exceeded");
+		ServerInstance->Users->QuitUser(user, "SendQ exceeded");
 		ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu",
-			nick.c_str(), MyClass->GetSendqHardMax());
+			user->nick.c_str(), user->MyClass->GetSendqHardMax());
 		return;
 	}
 
@@ -579,194 +559,171 @@ void User::AddWriteBuf(const std::string &data)
 	WriteData(data);
 }
 
-void User::OnError(BufferedSocketError)
+void UserIOHandler::OnError(BufferedSocketError)
 {
-	ServerInstance->Users->QuitUser(this, getError());
+	ServerInstance->Users->QuitUser(user, getError());
 }
 
-bool User::cull()
+CullResult User::cull()
 {
 	if (!quitting)
 		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
-	if (uuid.empty())
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty");
-		return true;
-	}
 	PurgeEmptyChannels();
-	if (IS_LOCAL(this))
-	{
-		if (fd != INT_MAX)
-			Close();
-
-		std::vector<User*>::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 (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);
 
-	ServerInstance->Users->uuidlist->erase(uuid);
-	uuid.clear();
-	return true;
+	return Extensible::cull();
+}
+
+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");
+
+	eh.cull();
+	return User::cull();
 }
 
-void User::Oper(const std::string &opertype, const std::string &opername)
+CullResult FakeUser::cull()
+{
+	// Fake users don't quit, they just get culled.
+	quitting = true;
+	return User::cull();
+}
+
+void User::Oper(OperInfo* info)
 {
 	if (this->IsModeSet('o'))
 		this->UnOper();
 
 	this->modes[UM_OPERATOR] = 1;
+	this->oper = info;
 	this->WriteServ("MODE %s :+o", this->nick.c_str());
-	FOREACH_MOD(I_OnOper, OnOper(this, opertype));
+	FOREACH_MOD(I_OnOper, OnOper(this, info->name));
 
-	ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), irc::Spacify(opertype.c_str()), opername.c_str());
-	this->WriteNumeric(381, "%s :You are now %s %s", this->nick.c_str(), strchr("aeiouAEIOU", *opertype.c_str()) ? "an" : "a", irc::Spacify(opertype.c_str()));
+	std::string opername;
+	if (info->oper_block)
+		opername = info->oper_block->getString("name");
 
-	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
-	this->oper.assign(opertype, 0, 512);
+	if (IS_LOCAL(this))
+	{
+		LocalUser* l = IS_LOCAL(this);
+		std::string vhost = oper->getConfig("vhost");
+		if (!vhost.empty())
+			l->ChangeDisplayedHost(vhost.c_str());
+		std::string opClass = oper->getConfig("class");
+		if (!opClass.empty())
+		{
+			l->SetClass(opClass);
+			l->CheckClass();
+		}
+	}
+
+	ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",
+		nick.c_str(), ident.c_str(), host.c_str(), oper->NameStr(), opername.c_str());
+	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->NameStr());
+
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), oper->NameStr());
 	ServerInstance->Users->all_opers.push_back(this);
 
-	/*
-	 * 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
-	 */
-	TagIndex::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
-	if (iter_opertype != ServerInstance->Config->opertypes.end())
-	{
-		if (AllowedOperCommands)
-			AllowedOperCommands->clear();
-		else
-			AllowedOperCommands = new std::set<std::string>;
+	// Expand permissions from config for faster lookup
+	if (IS_LOCAL(this))
+		oper->init();
 
-		if (AllowedPrivs)
-			AllowedPrivs->clear();
-		else
-			AllowedPrivs = new std::set<std::string>;
+	FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername));
+}
 
-		AllowedUserModes.reset();
-		AllowedChanModes.reset();
-		this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
+void OperInfo::init()
+{
+	AllowedOperCommands.clear();
+	AllowedPrivs.clear();
+	AllowedUserModes.reset();
+	AllowedChanModes.reset();
+	AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
-		std::string myclass, mycmd, mypriv;
-		irc::spacesepstream Classes(iter_opertype->second->getString("classes"));
-		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))
 		{
-			TagIndex::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->getString("commands"));
-				while (CommandList.GetToken(mycmd))
-				{
-					this->AllowedOperCommands->insert(mycmd);
-				}
+			AllowedOperCommands.insert(mycmd);
+		}
 
-				irc::spacesepstream PrivList(iter_operclass->second->getString("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->getString("usermodes").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->getString("chanmodes").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 */
@@ -784,11 +741,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;
@@ -830,7 +791,7 @@ bool User::CheckLines(bool doZline)
 	return false;
 }
 
-void User::FullConnect()
+void LocalUser::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
@@ -846,10 +807,13 @@ 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())
@@ -864,18 +828,21 @@ void User::FullConnect()
 	ServerInstance->Config->Send005(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
-
-	this->ShowMOTD();
-
 	/* Now registered */
 	if (ServerInstance->Users->unregistered_count)
 		ServerInstance->Users->unregistered_count--;
 
-	/* Trigger LUSERS output, give modules a chance too */
+	/* Trigger MOTD and LUSERS output, give modules a chance too */
 	ModResult MOD_RESULT;
-	std::string command("LUSERS");
+	std::string command("MOTD");
 	std::vector<std::string> parameters;
-	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
+	if (!MOD_RESULT)
+		ServerInstance->CallCommandHandler(command, parameters, this);
+
+	MOD_RESULT = MOD_RES_PASSTHRU;
+	command = "LUSERS";
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
 		ServerInstance->CallCommandHandler(command, parameters, this);
 
@@ -957,7 +924,7 @@ bool User::ForceNickChange(const char* newnick)
 	return false;
 }
 
-int User::GetServerPort()
+int LocalUser::GetServerPort()
 {
 	switch (this->server_sa.sa.sa_family)
 	{
@@ -969,108 +936,12 @@ int User::GetServerPort()
 	return 0;
 }
 
-const char* User::GetCIDRMask(int range)
-{
-	static char buf[44];
-
-	if (range < 0)
-		throw "Negative range, sorry, no.";
-
-	/*
-	 * Original code written by Oliver Lupton (Om).
-	 * Integrated by me. Thanks. :) -- w00t
-	 */
-	switch (this->client_sa.sa.sa_family)
-	{
-		case AF_INET6:
-		{
-			/* unsigned char s6_addr[16]; */
-			struct in6_addr v6;
-			int i, bytestozero, extrabits;
-			char buffer[40];
-
-			if(range > 128)
-				throw "CIDR mask width greater than address width (IPv6, 128 bit)";
-
-			/* 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] = client_sa.in6.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;
-		case AF_INET:
-		{
-			struct in_addr v4;
-			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 */
-			v4.s_addr = client_sa.in4.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()
 {
 	int port;
 	if (cachedip.empty())
 	{
-		irc::sockets::satoap(&client_sa, cachedip, port);
+		irc::sockets::satoap(client_sa, cachedip, port);
 		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
 		if (cachedip.c_str()[0] == ':')
 			cachedip.insert(0,1,'0');
@@ -1079,17 +950,40 @@ const char* User::GetIPString()
 	return cachedip.c_str();
 }
 
+irc::sockets::cidr_mask User::GetCIDRMask()
+{
+	int range = 0;
+	switch (client_sa.sa.sa_family)
+	{
+		case AF_INET6:
+			range = ServerInstance->Config->c_ipv6_range;
+			break;
+		case AF_INET:
+			range = ServerInstance->Config->c_ipv4_range;
+			break;
+	}
+	return irc::sockets::cidr_mask(client_sa, range);
+}
+
 bool User::SetClientIP(const char* sip)
 {
 	this->cachedip = "";
-	return irc::sockets::aptosa(sip, 0, &client_sa);
+	return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
 static std::string wide_newline("\r\n");
 
 void User::Write(const std::string& text)
 {
-	if (!ServerInstance->SE->BoundsCheckFd(this))
+}
+
+void User::Write(const char *text, ...)
+{
+}
+
+void LocalUser::Write(const std::string& text)
+{
+	if (!ServerInstance->SE->BoundsCheckFd(&eh))
 		return;
 
 	if (text.length() > MAXBUF - 2)
@@ -1100,10 +994,10 @@ void User::Write(const std::string& text)
 		return;
 	}
 
-	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%s] O %s", uuid.c_str(), text.c_str());
 
-	this->AddWriteBuf(text);
-	this->AddWriteBuf(wide_newline);
+	eh.AddWriteBuf(text);
+	eh.AddWriteBuf(wide_newline);
 
 	ServerInstance->stats->statsSent += text.length() + 2;
 	this->bytes_out += text.length() + 2;
@@ -1112,7 +1006,7 @@ void User::Write(const std::string& text)
 
 /** Write()
  */
-void User::Write(const char *text, ...)
+void LocalUser::Write(const char *text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1265,10 +1159,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
-			already_sent[u->fd] = uniq_id;
+			already_sent[u->GetFd()] = uniq_id;
 			if (i->second)
 				u->Write(line);
 		}
@@ -1279,10 +1173,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 		const UserMembList* ulist = c->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (IS_LOCAL(u) && !u->quitting && already_sent[u->fd] != uniq_id)
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && already_sent[u->GetFd()] != uniq_id)
 			{
-				already_sent[u->fd] = uniq_id;
+				already_sent[u->GetFd()] = uniq_id;
 				u->Write(line);
 			}
 		}
@@ -1311,10 +1205,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
-			already_sent[u->fd] = uniq_id;
+			already_sent[u->GetFd()] = uniq_id;
 			if (i->second)
 				u->Write(IS_OPER(u) ? out2 : out1);
 		}
@@ -1324,42 +1218,64 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 		const UserMembList* ulist = (*v)->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (IS_LOCAL(u) && !u->quitting && (already_sent[u->fd] != uniq_id))
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && (already_sent[u->GetFd()] != uniq_id))
 			{
-				already_sent[u->fd] = uniq_id;
+				already_sent[u->GetFd()] = uniq_id;
 				u->Write(IS_OPER(u) ? out2 : out1);
 			}
 		}
 	}
 }
 
-void User::WriteWallOps(const std::string &text)
+void LocalUser::SendText(const std::string& line)
 {
-	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
@@ -1399,7 +1315,7 @@ bool User::ChangeName(const char* gecos)
 	if (IS_LOCAL(this))
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(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));
@@ -1426,17 +1342,17 @@ void User::DoHostCycle(const std::string &quitline)
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
 			if (i->second)
 			{
-				already_sent[u->fd] = seen_id;
+				already_sent[u->GetFd()] = seen_id;
 				u->Write(quitline);
 			}
 			else
 			{
-				already_sent[u->fd] = silent_id;
+				already_sent[u->GetFd()] = silent_id;
 			}
 		}
 	}
@@ -1445,9 +1361,12 @@ void User::DoHostCycle(const std::string &quitline)
 		Channel* c = *v;
 		snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
 		std::string joinline(buffer);
-		std::string modeline = ServerInstance->Modes->ModeString(this, c);
+		Membership* memb = c->GetUser(this);
+		std::string modeline = memb->modes;
 		if (modeline.length() > 0)
 		{
+			for(unsigned int i=0; i < memb->modes.length(); i++)
+				modeline.append(" ").append(nick);
 			snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str());
 			modeline = buffer;
 		}
@@ -1455,16 +1374,16 @@ void User::DoHostCycle(const std::string &quitline)
 		const UserMembList *ulist = c->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (u == this || !IS_LOCAL(u))
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u == NULL || u == this)
 				continue;
-			if (already_sent[u->fd] == silent_id)
+			if (already_sent[u->GetFd()] == silent_id)
 				continue;
 
-			if (already_sent[u->fd] != seen_id)
+			if (already_sent[u->GetFd()] != seen_id)
 			{
 				u->Write(quitline);
-				already_sent[i->first->fd] = seen_id;
+				already_sent[u->GetFd()] = seen_id;
 			}
 			u->Write(joinline);
 			if (modeline.length() > 0)
@@ -1481,7 +1400,7 @@ bool User::ChangeDisplayedHost(const char* shost)
 	if (IS_LOCAL(this))
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (this,shost));
+		FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (IS_LOCAL(this),shost));
 		if (MOD_RESULT == MOD_RES_DENY)
 			return false;
 	}
@@ -1534,7 +1453,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);
 	}
@@ -1602,13 +1521,10 @@ void User::SplitChanList(User* dest, const std::string &cl)
  * then their ip will be taken as 'priority' anyway, so for example,
  * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
  */
-ConnectClass* User::SetClass(const std::string &explicit_name)
+void LocalUser::SetClass(const std::string &explicit_name)
 {
 	ConnectClass *found = NULL;
 
-	if (!IS_LOCAL(this))
-		return NULL;
-
 	ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Setting connect class for UID %s", this->uuid.c_str());
 
 	if (!explicit_name.empty())
@@ -1683,8 +1599,6 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 	{
 		MyClass = found;
 	}
-
-	return this->MyClass;
 }
 
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
@@ -1692,129 +1606,56 @@ 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(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();
 }
 
-void User::ShowMOTD()
-{
-	if (!ServerInstance->Config->MOTD.size())
-	{
-		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
-		return;
-	}
-	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.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());
-
-	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(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
-		return;
-	}
-
-	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.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());
-
-	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
-}
-
-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 = name;
-}
-
-const std::string FakeUser::GetFullHost()
+const std::string& FakeUser::GetFullHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return nick;
+	return server;
 }
 
-const std::string FakeUser::GetFullRealHost()
+const std::string& FakeUser::GetFullRealHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return nick;
+	return server;
 }
 
-ConnectClass::ConnectClass(char t, const std::string& mask)
-	: type(t), name("unnamed"), registration_timeout(0), host(mask),
-	pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0),
-	recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
+	: config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
+	pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0), recvqmax(0),
+	penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
 {
 }
 
-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),
-	softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax),
-	recvqmax(parent.recvqmax), maxlocal(parent.maxlocal),
-	maxglobal(parent.maxglobal), maxchans(parent.maxchans),
+ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent)
+	: config(tag), type(t), fakelag(parent.fakelag), name("unnamed"),
+	registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime),
+	pass(parent.pass), hash(parent.hash), softsendqmax(parent.softsendqmax),
+	hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax),
+	penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate),
+	maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans),
 	port(parent.port), limit(parent.limit)
 {
 }
@@ -1830,6 +1671,7 @@ void ConnectClass::Update(const ConnectClass* src)
 	softsendqmax = src->softsendqmax;
 	hardsendqmax = src->hardsendqmax;
 	recvqmax = src->recvqmax;
+	penaltythreshold = src->penaltythreshold;
 	maxlocal = src->maxlocal;
 	maxglobal = src->maxglobal;
 	limit = src->limit;