X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=2458e156530eacd881d4df8a63523eaf6a7e893a;hb=48869b38e938de4d8dd4cdff486b10348e81f7b6;hp=9f4060968e61792847619598e76c1e586445db8f;hpb=e586aaab7c4f7b03514c83451d73b73f55dc6998;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 9f4060968..2458e1565 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -31,83 +31,6 @@
 
 already_sent_t LocalUser::already_sent_id = 0;
 
-std::string User::ProcessNoticeMasks(const char *sm)
-{
-	bool adding = true, oldadding = false;
-	const char *c = sm;
-	std::string output;
-
-	while (c && *c)
-	{
-		switch (*c)
-		{
-			case '+':
-				adding = true;
-			break;
-			case '-':
-				adding = false;
-			break;
-			case '*':
-				for (unsigned char d = 'a'; d <= 'z'; d++)
-				{
-					if (!ServerInstance->SNO->masks[d - 'a'].Description.empty())
-					{
-						if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
-						{
-							if ((oldadding != adding) || (!output.length()))
-								output += (adding ? '+' : '-');
-
-							this->SetNoticeMask(d, adding);
-
-							output += d;
-						}
-						oldadding = adding;
-						char u = toupper(d);
-						if ((!IsNoticeMaskSet(u) && adding) || (IsNoticeMaskSet(u) && !adding))
-						{
-							if ((oldadding != adding) || (!output.length()))
-								output += (adding ? '+' : '-');
-
-							this->SetNoticeMask(u, adding);
-
-							output += u;
-						}
-						oldadding = adding;
-					}
-				}
-			break;
-			default:
-				if (isalpha(*c))
-				{
-					if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
-					{
-						if ((oldadding != adding) || (!output.length()))
-							output += (adding ? '+' : '-');
-
-						this->SetNoticeMask(*c, adding);
-
-						output += *c;
-					}
-				}
-				else
-					this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
-
-				oldadding = adding;
-			break;
-		}
-
-		c++;
-	}
-
-	std::string s = this->FormatNoticeMasks();
-	if (s.length() == 0)
-	{
-		this->modes[UM_SNOMASK] = false;
-	}
-
-	return output;
-}
-
 bool User::IsNoticeMaskSet(unsigned char sm)
 {
 	if (!isalpha(sm))
@@ -115,28 +38,6 @@ bool User::IsNoticeMaskSet(unsigned char sm)
 	return (snomasks[sm-65]);
 }
 
-void User::SetNoticeMask(unsigned char sm, bool value)
-{
-	if (!isalpha(sm))
-		return;
-	snomasks[sm-65] = value;
-}
-
-const char* User::FormatNoticeMasks()
-{
-	static char data[MAXBUF];
-	int offset = 0;
-
-	for (int n = 0; n < 64; n++)
-	{
-		if (snomasks[n])
-			data[offset++] = n+65;
-	}
-
-	data[offset] = 0;
-	return data;
-}
-
 bool User::IsModeSet(unsigned char m)
 {
 	if (!isalpha(m))
@@ -144,24 +45,17 @@ bool User::IsModeSet(unsigned char m)
 	return (modes[m-65]);
 }
 
-void User::SetMode(unsigned char m, bool value)
-{
-	if (!isalpha(m))
-		return;
-	modes[m-65] = value;
-}
-
 const char* User::FormatModes(bool showparameters)
 {
-	static char data[MAXBUF];
+	static std::string data;
 	std::string params;
-	int offset = 0;
+	data.clear();
 
 	for (unsigned char n = 0; n < 64; n++)
 	{
 		if (modes[n])
 		{
-			data[offset++] = n + 65;
+			data.push_back(n + 65);
 			ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
 			if (showparameters && mh && mh->GetNumParams(true))
 			{
@@ -171,32 +65,27 @@ const char* User::FormatModes(bool showparameters)
 			}
 		}
 	}
-	data[offset] = 0;
-	strlcat(data, params.c_str(), MAXBUF);
-	return data;
+	data += params;
+	return data.c_str();
 }
 
-User::User(const std::string &uid, const std::string& sid, int type)
-	: uuid(uid), server(sid), usertype(type)
+User::User(const std::string& uid, Server* srv, int type)
+	: uuid(uid), server(srv), usertype(type)
 {
 	age = ServerInstance->Time();
 	signon = 0;
 	registered = 0;
-	quietquit = quitting = false;
+	quitting = false;
 	client_sa.sa.sa_family = AF_UNSPEC;
 
 	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str());
 
-	user_hash::iterator finduuid = ServerInstance->Users->uuidlist->find(uuid);
-	if (finduuid == ServerInstance->Users->uuidlist->end())
-		(*ServerInstance->Users->uuidlist)[uuid] = this;
-	else
+	if (!ServerInstance->Users->uuidlist->insert(std::make_pair(uuid, this)).second)
 		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
 LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
-	: User(ServerInstance->UIDGen.GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this),
-	localuseriter(ServerInstance->Users->local_users.end()),
+	: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL), eh(this),
 	bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0),
 	already_sent(0)
 {
@@ -221,18 +110,8 @@ const std::string& User::MakeHost()
 	if (!this->cached_makehost.empty())
 		return this->cached_makehost;
 
-	char nhost[MAXBUF];
-	/* This is much faster than snprintf */
-	char* t = nhost;
-	for(const char* n = ident.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '@';
-	for(const char* n = host.c_str(); *n; n++)
-		*t++ = *n;
-	*t = 0;
-
-	this->cached_makehost.assign(nhost);
-
+	// XXX: Is there really a need to cache this?
+	this->cached_makehost = ident + "@" + host;
 	return this->cached_makehost;
 }
 
@@ -241,18 +120,8 @@ const std::string& User::MakeHostIP()
 	if (!this->cached_hostip.empty())
 		return this->cached_hostip;
 
-	char ihost[MAXBUF];
-	/* This is much faster than snprintf */
-	char* t = ihost;
-	for(const char* n = ident.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '@';
-	for(const char* n = this->GetIPString().c_str(); *n; n++)
-		*t++ = *n;
-	*t = 0;
-
-	this->cached_hostip = ihost;
-
+	// XXX: Is there really a need to cache this?
+	this->cached_hostip = ident + "@" + this->GetIPString();
 	return this->cached_hostip;
 }
 
@@ -261,54 +130,18 @@ const std::string& User::GetFullHost()
 	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
 
-	char result[MAXBUF];
-	char* t = result;
-	for(const char* n = nick.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '!';
-	for(const char* n = ident.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '@';
-	for(const char* n = dhost.c_str(); *n; n++)
-		*t++ = *n;
-	*t = 0;
-
-	this->cached_fullhost = result;
-
+	// XXX: Is there really a need to cache this?
+	this->cached_fullhost = nick + "!" + ident + "@" + dhost;
 	return this->cached_fullhost;
 }
 
-char* User::MakeWildHost()
-{
-	static char nresult[MAXBUF];
-	char* t = nresult;
-	*t++ = '*';	*t++ = '!';
-	*t++ = '*';	*t++ = '@';
-	for(const char* n = dhost.c_str(); *n; n++)
-		*t++ = *n;
-	*t = 0;
-	return nresult;
-}
-
 const std::string& User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
 
-	char fresult[MAXBUF];
-	char* t = fresult;
-	for(const char* n = nick.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '!';
-	for(const char* n = ident.c_str(); *n; n++)
-		*t++ = *n;
-	*t++ = '@';
-	for(const char* n = host.c_str(); *n; n++)
-		*t++ = *n;
-	*t = 0;
-
-	this->cached_fullrealhost = fresult;
-
+	// XXX: Is there really a need to cache this?
+	this->cached_fullrealhost = nick + "!" + ident + "@" + host;
 	return this->cached_fullrealhost;
 }
 
@@ -323,7 +156,6 @@ bool LocalUser::RemoveInvite(Channel* chan)
 	Invitation* inv = Invitation::Find(chan, this);
 	if (inv)
 	{
-		inv->cull();
 		delete inv;
 		return true;
 	}
@@ -402,7 +234,7 @@ bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy)
 	}
 
 	if (noisy)
-		this->WriteNotice("Oper type " + std::string(oper->NameStr()) + " does not have access to priv " + privstr);
+		this->WriteNotice("Oper type " + oper->name + " does not have access to priv " + privstr);
 
 	return false;
 }
@@ -429,7 +261,7 @@ void UserIOHandler::OnDataReady()
 	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
 		std::string line;
-		line.reserve(MAXBUF);
+		line.reserve(ServerInstance->Config->Limits.MaxLine);
 		std::string::size_type qpos = 0;
 		while (qpos < recvq.length())
 		{
@@ -444,7 +276,7 @@ void UserIOHandler::OnDataReady()
 			case '\n':
 				goto eol_found;
 			}
-			if (line.length() < MAXBUF - 2)
+			if (line.length() < ServerInstance->Config->Limits.MaxLine - 2)
 				line.push_back(c);
 		}
 		// if we got here, the recvq ran out before we found a newline
@@ -493,7 +325,6 @@ CullResult User::cull()
 {
 	if (!quitting)
 		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
-	PurgeEmptyChannels();
 
 	if (client_sa.sa.sa_family != AF_UNSPEC)
 		ServerInstance->Users->RemoveCloneCounts(this);
@@ -503,14 +334,7 @@ CullResult User::cull()
 
 CullResult LocalUser::cull()
 {
-	// The iterator is initialized to local_users.end() in the constructor. It is
-	// overwritten in UserManager::AddUser() with the real iterator so this check
-	// is only a precaution currently.
-	if (localuseriter != ServerInstance->Users->local_users.end())
-		ServerInstance->Users->local_users.erase(localuseriter);
-	else
-		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick);
-
+	ServerInstance->Users->local_users.erase(this);
 	ClearInvites();
 	eh.cull();
 	return User::cull();
@@ -520,20 +344,21 @@ CullResult FakeUser::cull()
 {
 	// Fake users don't quit, they just get culled.
 	quitting = true;
-	ServerInstance->Users->clientlist->erase(nick);
+	// Fake users are not inserted into UserManager::clientlist, they're only in the uuidlist
 	ServerInstance->Users->uuidlist->erase(uuid);
 	return User::cull();
 }
 
 void User::Oper(OperInfo* info)
 {
-	if (this->IsModeSet('o'))
+	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
+	if (this->IsModeSet(opermh))
 		this->UnOper();
 
-	this->modes[UM_OPERATOR] = 1;
+	this->SetMode(opermh, true);
 	this->oper = info;
 	this->WriteServ("MODE %s :+o", this->nick.c_str());
-	FOREACH_MOD(I_OnOper, OnOper(this, info->name));
+	FOREACH_MOD(OnOper, (this, info->name));
 
 	std::string opername;
 	if (info->oper_block)
@@ -551,17 +376,17 @@ void User::Oper(OperInfo* info)
 	}
 
 	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());
+		nick.c_str(), ident.c_str(), host.c_str(), oper->name.c_str(), opername.c_str());
+	this->WriteNumeric(RPL_YOUAREOPER, ":You are now %s %s", strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->name.c_str());
 
-	ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->NameStr());
+	ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->name.c_str());
 	ServerInstance->Users->all_opers.push_back(this);
 
 	// Expand permissions from config for faster lookup
 	if (IS_LOCAL(this))
 		oper->init();
 
-	FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername));
+	FOREACH_MOD(OnPostOper, (this, oper->name, opername));
 }
 
 void OperInfo::init()
@@ -645,18 +470,19 @@ void User::UnOper()
 	parameters.push_back(this->nick);
 	parameters.push_back(moderemove);
 
-	ServerInstance->Parser->CallHandler("MODE", parameters, this);
+	ServerInstance->Modes->Process(parameters, this);
 
 	/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
 	ServerInstance->Users->all_opers.remove(this);
 
-	this->modes[UM_OPERATOR] = 0;
+	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
+	this->SetMode(opermh, false);
 }
 
 /*
  * Check class restrictions
  */
-void LocalUser::CheckClass()
+void LocalUser::CheckClass(bool clone_count)
 {
 	ConnectClass* a = this->MyClass;
 
@@ -670,19 +496,22 @@ void LocalUser::CheckClass()
 		ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection"));
 		return;
 	}
-	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
+	else if (clone_count)
 	{
-		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
-		if (a->maxconnwarn)
-			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString().c_str());
-		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)");
-		if (a->maxconnwarn)
-			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString().c_str());
-		return;
+		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)");
+			if (a->maxconnwarn)
+				ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString().c_str());
+			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)");
+			if (a->maxconnwarn)
+				ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString().c_str());
+			return;
+		}
 	}
 
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
@@ -728,17 +557,14 @@ void LocalUser::FullConnect()
 	if (quitting)
 		return;
 
-	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
-	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
-	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
+	this->WriteNumeric(RPL_WELCOME, ":Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, ":Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), BRANCH);
+	this->WriteNumeric(RPL_SERVERCREATED, ":This server was created %s %s", __TIME__, __DATE__);
 
-	std::string umlist = ServerInstance->Modes->UserModeList();
-	std::string cmlist = ServerInstance->Modes->ChannelModeList();
-	std::string pmlist = ServerInstance->Modes->ParaModeList();
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str());
+	const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str());
 
 	ServerInstance->ISupport.SendTo(this);
-	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
 	/* Now registered */
 	if (ServerInstance->Users->unregistered_count)
@@ -765,11 +591,11 @@ void LocalUser::FullConnect()
 	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
 	 * for a user that doesn't exist yet.
 	 */
-	FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
+	FOREACH_MOD(OnUserConnect, (this));
 
 	this->registered = REG_ALL;
 
-	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+	FOREACH_MOD(OnPostConnect, (this));
 
 	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
 		this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->fullname.c_str());
@@ -796,17 +622,16 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 		return false;
 	}
 
-	ModResult MOD_RESULT;
-
-	if (force)
-		ServerInstance->NICKForced.set(this, 1);
-	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
-	ServerInstance->NICKForced.set(this, 0);
-
-	if (MOD_RESULT == MOD_RES_DENY)
+	if (!force)
 	{
-		ServerInstance->stats->statsCollisions++;
-		return false;
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+
+		if (MOD_RESULT == MOD_RES_DENY)
+		{
+			ServerInstance->stats->statsCollisions++;
+			return false;
+		}
 	}
 
 	if (assign(newnick) == assign(nick))
@@ -836,7 +661,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
 						newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str());
 				}
-				this->WriteNumeric(432, "%s %s :Invalid nickname: %s",this->nick.c_str(), newnick.c_str(), mq->reason.c_str());
+				this->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Invalid nickname: %s", newnick.c_str(), mq->reason.c_str());
 				return false;
 			}
 
@@ -844,10 +669,10 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 			{
 				for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 				{
-					Channel *chan = *i;
+					Channel* chan = (*i)->chan;
 					if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this))
 					{
-						this->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", this->nick.c_str(), chan->name.c_str());
+						this->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str());
 						return false;
 					}
 				}
@@ -870,7 +695,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 			{
 				/* force the camper to their UUID, and ask them to re-send a NICK. */
 				InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str());
-				InUse->WriteNumeric(433, "%s %s :Nickname overruled.", InUse->nick.c_str(), InUse->nick.c_str());
+				InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str());
 
 				ServerInstance->Users->clientlist->erase(InUse->nick);
 				(*(ServerInstance->Users->clientlist))[InUse->uuid] = InUse;
@@ -882,7 +707,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 			else
 			{
 				/* No camping, tell the incoming user  to stop trying to change nick ;p */
-				this->WriteNumeric(433, "%s %s :Nickname is already in use.", this->registered >= REG_NICK ? this->nick.c_str() : "*", newnick.c_str());
+				this->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname is already in use.", newnick.c_str());
 				return false;
 			}
 		}
@@ -898,7 +723,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 	(*(ServerInstance->Users->clientlist))[newnick] = this;
 
 	if (registered == REG_ALL)
-		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(this,oldnick));
+		FOREACH_MOD(OnUserPostNick, (this,oldnick));
 
 	return true;
 }
@@ -923,7 +748,7 @@ const std::string& User::GetIPString()
 		irc::sockets::satoap(client_sa, cachedip, port);
 		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
 		if (cachedip[0] == ':')
-			cachedip.insert(0,1,'0');
+			cachedip.insert(cachedip.begin(),1,'0');
 	}
 
 	return cachedip;
@@ -977,7 +802,7 @@ void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_elin
 		if (recheck_eline)
 			this->exempt = (ServerInstance->XLines->MatchesLine("E", this) != NULL);
 
-		FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this));
+		FOREACH_MOD(OnSetUserIP, (this));
 	}
 }
 
@@ -996,10 +821,10 @@ void LocalUser::Write(const std::string& text)
 	if (!ServerInstance->SE->BoundsCheckFd(&eh))
 		return;
 
-	if (text.length() > MAXBUF - 2)
+	if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
 	{
 		// this should happen rarely or never. Crop the string at 512 and try again.
-		std::string try_again = text.substr(0, MAXBUF - 2);
+		std::string try_again = text.substr(0, ServerInstance->Config->Limits.MaxLine - 2);
 		Write(try_again);
 		return;
 	}
@@ -1018,14 +843,9 @@ void LocalUser::Write(const std::string& text)
  */
 void LocalUser::Write(const char *text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->Write(std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->Write(textbuffer);
 }
 
 void User::WriteServ(const std::string& text)
@@ -1038,14 +858,9 @@ void User::WriteServ(const std::string& text)
  */
 void User::WriteServ(const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteServ(std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteServ(textbuffer);
 }
 
 void User::WriteNotice(const std::string& text)
@@ -1055,19 +870,13 @@ void User::WriteNotice(const std::string& text)
 
 void User::WriteNumeric(unsigned int numeric, const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteNumeric(numeric, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteNumeric(numeric, textbuffer);
 }
 
 void User::WriteNumeric(unsigned int numeric, const std::string &text)
 {
-	char textbuffer[MAXBUF];
 	ModResult MOD_RESULT;
 
 	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
@@ -1075,8 +884,9 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text)
 	if (MOD_RESULT == MOD_RES_DENY)
 		return;
 
-	snprintf(textbuffer,MAXBUF,":%s %03u %s",ServerInstance->Config->ServerName.c_str(), numeric, text.c_str());
-	this->Write(std::string(textbuffer));
+	const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(),
+		numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str());
+	this->Write(message);
 }
 
 void User::WriteFrom(User *user, const std::string &text)
@@ -1090,14 +900,9 @@ void User::WriteFrom(User *user, const std::string &text)
 
 void User::WriteFrom(User *user, const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteFrom(user, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteFrom(user, textbuffer);
 }
 
 
@@ -1105,14 +910,9 @@ void User::WriteFrom(User *user, const char* text, ...)
 
 void User::WriteTo(User *dest, const char *data, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, data);
-	vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteTo(dest, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, data, data);
+	this->WriteTo(dest, textbuffer);
 }
 
 void User::WriteTo(User *dest, const std::string &data)
@@ -1122,36 +922,24 @@ void User::WriteTo(User *dest, const std::string &data)
 
 void User::WriteCommon(const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
 	if (this->registered != REG_ALL || quitting)
 		return;
 
-	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteCommonRaw(std::string(textbuffer), true);
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
+	this->WriteCommonRaw(textbuffer, true);
 }
 
 void User::WriteCommonExcept(const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
 	if (this->registered != REG_ALL || quitting)
 		return;
 
-	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteCommonRaw(std::string(textbuffer), false);
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
+	this->WriteCommonRaw(textbuffer, false);
 }
 
 void User::WriteCommonRaw(const std::string &line, bool include_self)
@@ -1161,12 +949,12 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 
 	LocalUser::already_sent_id++;
 
-	UserChanList include_c(chans);
+	IncludeChanList include_c(chans.begin(), chans.end());
 	std::map<User*,bool> exceptions;
 
 	exceptions[this] = include_self;
 
-	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+	FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions));
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
@@ -1178,14 +966,14 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 				u->Write(line);
 		}
 	}
-	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+	for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
 	{
-		Channel* c = *v;
+		Channel* c = (*v)->chan;
 		const UserMembList* ulist = c->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
 			LocalUser* u = IS_LOCAL(i->first);
-			if (u && !u->quitting && u->already_sent != LocalUser::already_sent_id)
+			if (u && u->already_sent != LocalUser::already_sent_id)
 			{
 				u->already_sent = LocalUser::already_sent_id;
 				u->Write(line);
@@ -1204,10 +992,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 	const std::string normalMessage = ":" + this->GetFullHost() + " QUIT :" + normal_text;
 	const std::string operMessage = ":" + this->GetFullHost() + " QUIT :" + oper_text;
 
-	UserChanList include_c(chans);
+	IncludeChanList include_c(chans.begin(), chans.end());
 	std::map<User*,bool> exceptions;
 
-	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
+	FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions));
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
@@ -1219,13 +1007,13 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 				u->Write(u->IsOper() ? operMessage : normalMessage);
 		}
 	}
-	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+	for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
 	{
-		const UserMembList* ulist = (*v)->GetUsers();
+		const UserMembList* ulist = (*v)->chan->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
 			LocalUser* u = IS_LOCAL(i->first);
-			if (u && !u->quitting && (u->already_sent != uniq_id))
+			if (u && (u->already_sent != uniq_id))
 			{
 				u->already_sent = uniq_id;
 				u->Write(u->IsOper() ? operMessage : normalMessage);
@@ -1250,38 +1038,26 @@ void FakeUser::SendText(const std::string& line)
 
 void User::SendText(const char *text, ...)
 {
-	va_list argsPtr;
-	char line[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(line, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	SendText(std::string(line));
+	std::string line;
+	VAFORMAT(line, text, text);
+	SendText(line);
 }
 
-void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
+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)
+	std::string line;
+	std::string word;
+	while (textStream >> word)
 	{
-		int len = Word.length();
-		if (pos + len + 12 > MAXBUF)
+		size_t lineLength = linePrefix.length() + line.length() + word.length() + 3; // "\s\n\r"
+		if (lineLength > ServerInstance->Config->Limits.MaxLine)
 		{
-			line[pos] = '\0';
-			SendText(std::string(line));
-			pos = start_pos;
+			SendText(linePrefix + line);
+			line.clear();
 		}
-		line[pos] = ' ';
-		memcpy(line + pos + 1, Word.data(), len);
-		pos += len + 1;
+		line += " " + word;
 	}
-	line[pos] = '\0';
-	SendText(std::string(line));
+	SendText(linePrefix + line);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1298,7 +1074,7 @@ void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream
  */
 bool User::SharesChannelWith(User *other)
 {
-	if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
+	if ((this->registered != REG_ALL) || (other->registered != REG_ALL))
 		return false;
 
 	/* Outer loop */
@@ -1307,13 +1083,13 @@ bool User::SharesChannelWith(User *other)
 		/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
 		 * by replacing it with a map::find which *should* be more efficient
 		 */
-		if ((*i)->HasUser(other))
+		if ((*i)->chan->HasUser(other))
 			return true;
 	}
 	return false;
 }
 
-bool User::ChangeName(const char* gecos)
+bool User::ChangeName(const std::string& gecos)
 {
 	if (!this->fullname.compare(gecos))
 		return true;
@@ -1324,80 +1100,14 @@ bool User::ChangeName(const char* 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));
+		FOREACH_MOD(OnChangeName, (this,gecos));
 	}
 	this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
 
 	return true;
 }
 
-void User::DoHostCycle(const std::string &quitline)
-{
-	if (!ServerInstance->Config->CycleHosts)
-		return;
-
-	already_sent_t silent_id = ++LocalUser::already_sent_id;
-	already_sent_t seen_id = ++LocalUser::already_sent_id;
-
-	UserChanList include_c(chans);
-	std::map<User*,bool> exceptions;
-
-	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
-
-	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
-	{
-		LocalUser* u = IS_LOCAL(i->first);
-		if (u && !u->quitting)
-		{
-			if (i->second)
-			{
-				u->already_sent = seen_id;
-				u->Write(quitline);
-			}
-			else
-			{
-				u->already_sent = silent_id;
-			}
-		}
-	}
-	for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
-	{
-		Channel* c = *v;
-		Membership* memb = c->GetUser(this);
-		const std::string joinline = ":" + GetFullHost() + " JOIN " + c->name;
-		std::string modeline;
-
-		if (!memb->modes.empty())
-		{
-			modeline = ":" + (ServerInstance->Config->CycleHostsFromUser ? GetFullHost() : ServerInstance->Config->ServerName)
-				+ " MODE " + c->name + " +" + memb->modes;
-
-			for (size_t i = 0; i < memb->modes.length(); i++)
-				modeline.append(" ").append(nick);
-		}
-
-		const UserMembList *ulist = c->GetUsers();
-		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
-		{
-			LocalUser* u = IS_LOCAL(i->first);
-			if (u == NULL || u == this)
-				continue;
-			if (u->already_sent == silent_id)
-				continue;
-
-			if (u->already_sent != seen_id)
-			{
-				u->Write(quitline);
-				u->already_sent = seen_id;
-			}
-			u->Write(joinline);
-			if (!memb->modes.empty())
-				u->Write(modeline);
-		}
-	}
-}
-
-bool User::ChangeDisplayedHost(const char* shost)
+bool User::ChangeDisplayedHost(const std::string& shost)
 {
 	if (dhost == shost)
 		return true;
@@ -1410,50 +1120,34 @@ bool User::ChangeDisplayedHost(const char* shost)
 			return false;
 	}
 
-	FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost));
-
-	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host";
+	FOREACH_MOD(OnChangeHost, (this,shost));
 
-	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
 	this->dhost.assign(shost, 0, 64);
-
 	this->InvalidateCache();
 
-	this->DoHostCycle(quitstr);
-
 	if (IS_LOCAL(this))
-		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s :is now your displayed host", this->dhost.c_str());
 
 	return true;
 }
 
-bool User::ChangeIdent(const char* newident)
+bool User::ChangeIdent(const std::string& newident)
 {
 	if (this->ident == newident)
 		return true;
 
-	FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident));
-
-	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
+	FOREACH_MOD(OnChangeIdent, (this,newident));
 
 	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax);
-
 	this->InvalidateCache();
 
-	this->DoHostCycle(quitstr);
-
 	return true;
 }
 
 void User::SendAll(const char* command, const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
 	const std::string message = ":" + this->GetFullHost() + " " + command + " $* :" + textbuffer;
 
 	for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
@@ -1567,27 +1261,13 @@ void LocalUser::SetClass(const std::string &explicit_name)
 	}
 }
 
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
- * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
- * 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 NULL;
-}
-
 void User::PurgeEmptyChannels()
 {
 	// firstly decrement the count on each channel
-	for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
+	for (UCListIter i = this->chans.begin(); i != this->chans.end(); )
 	{
-		Channel* c = *f;
+		Channel* c = (*i)->chan;
+		++i;
 		c->DelUser(this);
 	}
 
@@ -1598,21 +1278,21 @@ const std::string& FakeUser::GetFullHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return server;
+	return server->GetName();
 }
 
 const std::string& FakeUser::GetFullRealHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return server;
+	return server->GetName();
 }
 
 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), softsendqmax(0), hardsendqmax(0), recvqmax(0),
 	penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0),
-	limit(0), nouserdns(false)
+	limit(0), resolvehostnames(true)
 {
 }
 
@@ -1622,7 +1302,7 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, cons
 	softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax),
 	penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate),
 	maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxconnwarn(parent.maxconnwarn), maxchans(parent.maxchans),
-	limit(parent.limit), nouserdns(parent.nouserdns)
+	limit(parent.limit), resolvehostnames(parent.resolvehostnames)
 {
 }
 
@@ -1645,5 +1325,5 @@ void ConnectClass::Update(const ConnectClass* src)
 	maxconnwarn = src->maxconnwarn;
 	maxchans = src->maxchans;
 	limit = src->limit;
-	nouserdns = src->nouserdns;
+	resolvehostnames = src->resolvehostnames;
 }