X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=aa5031b2b1632bdda7c885f0ad3b3d1935d6da83;hb=b76ff64daeeb1e1081cff93c611f730e5b1b051e;hp=4f9b6c945680327f928293e06073e9fd123fac93;hpb=4634151efc02ff016e19c5f123d75824d0d6c811;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 4f9b6c945..aa5031b2b 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -26,8 +26,6 @@
 #include "inspircd.h"
 #include "xline.h"
 
-already_sent_t LocalUser::already_sent_id = 0;
-
 bool User::IsNoticeMaskSet(unsigned char sm)
 {
 	if (!isalpha(sm))
@@ -35,64 +33,80 @@ bool User::IsNoticeMaskSet(unsigned char sm)
 	return (snomasks[sm-65]);
 }
 
-bool User::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m) const
 {
 	ModeHandler* mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
 	return (mh && modes[mh->GetId()]);
 }
 
-const char* User::FormatModes(bool showparameters)
+std::string User::GetModeLetters(bool includeparams) const
 {
-	static std::string data;
+	std::string ret(1, '+');
 	std::string params;
-	data.clear();
 
-	for (unsigned char n = 0; n < 64; n++)
+	for (unsigned char i = 'A'; i < 'z'; i++)
 	{
-		ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
-		if (mh && IsModeSet(mh))
+		const ModeHandler* const mh = ServerInstance->Modes.FindMode(i, MODETYPE_USER);
+		if ((!mh) || (!IsModeSet(mh)))
+			continue;
+
+		ret.push_back(mh->GetModeChar());
+		if ((includeparams) && (mh->NeedsParam(true)))
 		{
-			data.push_back(n + 65);
-			if (showparameters && mh->GetNumParams(true))
-			{
-				std::string p = mh->GetUserParameter(this);
-				if (p.length())
-					params.append(" ").append(p);
-			}
+			const std::string val = mh->GetUserParameter(this);
+			if (!val.empty())
+				params.append(1, ' ').append(val);
 		}
 	}
-	data += params;
-	return data.c_str();
+
+	ret += params;
+	return ret;
 }
 
 User::User(const std::string& uid, Server* srv, int type)
-	: uuid(uid), server(srv), usertype(type)
+	: age(ServerInstance->Time())
+	, signon(0)
+	, uuid(uid)
+	, server(srv)
+	, registered(REG_NONE)
+	, quitting(false)
+	, usertype(type)
 {
-	age = ServerInstance->Time();
-	signon = 0;
-	registered = 0;
-	quitting = false;
 	client_sa.sa.sa_family = AF_UNSPEC;
 
 	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str());
 
-	if (!ServerInstance->Users->uuidlist.insert(std::make_pair(uuid, this)).second)
-		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
+	// Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior
+	if (type != USERTYPE_SERVER)
+	{
+		if (!ServerInstance->Users.uuidlist.insert(std::make_pair(uuid, this)).second)
+			throw CoreException("Duplicate UUID in User constructor: " + uuid);
+	}
 }
 
 LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
-	: 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)
-{
-	exempt = quitting_sendq = false;
-	idle_lastmsg = 0;
+	: User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL)
+	, eh(this)
+	, bytes_in(0)
+	, bytes_out(0)
+	, cmds_in(0)
+	, cmds_out(0)
+	, quitting_sendq(false)
+	, lastping(true)
+	, exempt(false)
+	, nping(0)
+	, idle_lastmsg(0)
+	, CommandFloodPenalty(0)
+	, already_sent(0)
+{
+	signon = ServerInstance->Time();
+	// The user's default nick is their UUID
+	nick = uuid;
 	ident = "unknown";
-	lastping = 0;
 	eh.SetFd(myfd);
 	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
 	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
-	dhost = host = GetIPString();
+	ChangeRealHost(GetIPString(), true);
 }
 
 User::~User()
@@ -105,7 +119,7 @@ const std::string& User::MakeHost()
 		return this->cached_makehost;
 
 	// XXX: Is there really a need to cache this?
-	this->cached_makehost = ident + "@" + host;
+	this->cached_makehost = ident + "@" + GetRealHost();
 	return this->cached_makehost;
 }
 
@@ -125,7 +139,7 @@ const std::string& User::GetFullHost()
 		return this->cached_fullhost;
 
 	// XXX: Is there really a need to cache this?
-	this->cached_fullhost = nick + "!" + ident + "@" + dhost;
+	this->cached_fullhost = nick + "!" + ident + "@" + GetDisplayedHost();
 	return this->cached_fullhost;
 }
 
@@ -135,45 +149,24 @@ const std::string& User::GetFullRealHost()
 		return this->cached_fullrealhost;
 
 	// XXX: Is there really a need to cache this?
-	this->cached_fullrealhost = nick + "!" + ident + "@" + host;
+	this->cached_fullrealhost = nick + "!" + ident + "@" + GetRealHost();
 	return this->cached_fullrealhost;
 }
 
-InviteList& LocalUser::GetInviteList()
-{
-	RemoveExpiredInvites();
-	return invites;
-}
-
-bool LocalUser::RemoveInvite(Channel* chan)
-{
-	Invitation* inv = Invitation::Find(chan, this);
-	if (inv)
-	{
-		delete inv;
-		return true;
-	}
-	return false;
-}
-
-void LocalUser::RemoveExpiredInvites()
-{
-	Invitation::Find(NULL, this);
-}
-
-bool User::HasModePermission(unsigned char, ModeType)
+bool User::HasModePermission(const ModeHandler* mh) const
 {
 	return true;
 }
 
-bool LocalUser::HasModePermission(unsigned char mode, ModeType type)
+bool LocalUser::HasModePermission(const ModeHandler* mh) const
 {
 	if (!this->IsOper())
 		return false;
 
+	const unsigned char mode = mh->GetModeChar();
 	if (mode < 'A' || mode > ('A' + 64)) return false;
 
-	return ((type == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
+	return ((mh->GetModeType() == MODETYPE_USER ? oper->AllowedUserModes : oper->AllowedChanModes))[(mode - 'A')];
 
 }
 /*
@@ -277,7 +270,7 @@ void UserIOHandler::OnDataReady()
 		return;
 eol_found:
 		// just found a newline. Terminate the string, and pull it out of recvq
-		recvq = recvq.substr(qpos);
+		recvq.erase(0, qpos);
 
 		// TODO should this be moved to when it was inserted in recvq?
 		ServerInstance->stats.Recv += qpos;
@@ -328,7 +321,6 @@ CullResult User::cull()
 
 CullResult LocalUser::cull()
 {
-	ClearInvites();
 	eh.cull();
 	return User::cull();
 }
@@ -337,8 +329,7 @@ CullResult FakeUser::cull()
 {
 	// Fake users don't quit, they just get culled.
 	quitting = true;
-	// Fake users are not inserted into UserManager::clientlist, they're only in the uuidlist
-	// and they are removed from there by the linking mod when the server splits
+	// Fake users are not inserted into UserManager::clientlist or uuidlist, so we don't need to modify those here
 	return User::cull();
 }
 
@@ -362,15 +353,15 @@ void User::Oper(OperInfo* info)
 		LocalUser* l = IS_LOCAL(this);
 		std::string vhost = oper->getConfig("vhost");
 		if (!vhost.empty())
-			l->ChangeDisplayedHost(vhost.c_str());
+			l->ChangeDisplayedHost(vhost);
 		std::string opClass = oper->getConfig("class");
 		if (!opClass.empty())
 			l->SetClass(opClass);
 	}
 
 	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->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());
+		nick.c_str(), ident.c_str(), GetRealHost().c_str(), oper->name.c_str(), opername.c_str());
+	this->WriteNumeric(RPL_YOUAREOPER, InspIRCd::Format("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->name.c_str());
 	ServerInstance->Users->all_opers.push_back(this);
@@ -450,10 +441,11 @@ void User::UnOper()
 
 	/* Remove all oper only modes from the user when the deoper - Bug #466*/
 	Modes::ChangeList changelist;
-	for (unsigned char letter = 'A'; letter <= 'z'; letter++)
+	const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
+	for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); ++i)
 	{
-		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER);
-		if (mh && mh->NeedsOper())
+		ModeHandler* mh = i->second;
+		if (mh->NeedsOper())
 			changelist.push_remove(mh);
 	}
 
@@ -502,7 +494,7 @@ void LocalUser::CheckClass(bool clone_count)
 		}
 	}
 
-	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
+	this->nping = ServerInstance->Time() + a->GetPingTime();
 }
 
 bool LocalUser::CheckLines(bool doZline)
@@ -545,12 +537,12 @@ void LocalUser::FullConnect()
 	if (quitting)
 		return;
 
-	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(), INSPIRCD_BRANCH);
-	this->WriteNumeric(RPL_SERVERCREATED, ":This server was created %s %s", __TIME__, __DATE__);
+	this->WriteNumeric(RPL_WELCOME, InspIRCd::Format("Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str()));
+	this->WriteNumeric(RPL_YOURHOSTIS, InspIRCd::Format("Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH));
+	this->WriteNumeric(RPL_SERVERCREATED, InspIRCd::TimeString(ServerInstance->startup_time, "This server was created %H:%M:%S %b %d %Y"));
 
-	const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH, modelist.c_str());
+	const TR1NS::array<std::string, 3>& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
+	this->WriteNumeric(RPL_SERVERVERSION, ServerInstance->Config->ServerName, INSPIRCD_BRANCH, modelist[0], modelist[1], modelist[2]);
 
 	ServerInstance->ISupport.SendTo(this);
 
@@ -596,6 +588,7 @@ void LocalUser::FullConnect()
 void User::InvalidateCache()
 {
 	/* Invalidate cache */
+	cachedip.clear();
 	cached_fullhost.clear();
 	cached_hostip.clear();
 	cached_makehost.clear();
@@ -635,16 +628,13 @@ bool User::ChangeNick(const std::string& newnick, time_t newts)
 			if (InUse->registered != REG_ALL)
 			{
 				/* force the camper to their UUID, and ask them to re-send a NICK. */
-				InUse->WriteFrom(InUse, "NICK %s", InUse->uuid.c_str());
-				InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str());
-
-				InUse->registered &= ~REG_NICK;
-				InUse->ChangeNick(InUse->uuid);
+				LocalUser* const localuser = static_cast<LocalUser*>(InUse);
+				localuser->OverruleNick();
 			}
 			else
 			{
 				/* No camping, tell the incoming user  to stop trying to change nick ;p */
-				this->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname is already in use.", newnick.c_str());
+				this->WriteNumeric(ERR_NICKNAMEINUSE, newnick, "Nickname is already in use.");
 				return false;
 			}
 		}
@@ -667,6 +657,16 @@ bool User::ChangeNick(const std::string& newnick, time_t newts)
 	return true;
 }
 
+void LocalUser::OverruleNick()
+{
+	this->WriteFrom(this, "NICK %s", this->uuid.c_str());
+	this->WriteNumeric(ERR_NICKNAMEINUSE, this->nick, "Nickname overruled.");
+
+	// Clear the bit before calling ChangeNick() to make it NOT run the OnUserPostNick() hook
+	this->registered &= ~REG_NICK;
+	this->ChangeNick(this->uuid);
+}
+
 int LocalUser::GetServerPort()
 {
 	switch (this->server_sa.sa.sa_family)
@@ -681,10 +681,9 @@ int LocalUser::GetServerPort()
 
 const std::string& User::GetIPString()
 {
-	int port;
 	if (cachedip.empty())
 	{
-		irc::sockets::satoap(client_sa, cachedip, port);
+		cachedip = client_sa.addr();
 		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
 		if (cachedip[0] == ':')
 			cachedip.insert(cachedip.begin(),1,'0');
@@ -693,6 +692,21 @@ const std::string& User::GetIPString()
 	return cachedip;
 }
 
+const std::string& User::GetHost(bool uncloak) const
+{
+	return uncloak ? GetRealHost() : GetDisplayedHost();
+}
+
+const std::string& User::GetDisplayedHost() const
+{
+	return displayhost.empty() ? realhost : displayhost;
+}
+
+const std::string& User::GetRealHost() const
+{
+	return realhost;
+}
+
 irc::sockets::cidr_mask User::GetCIDRMask()
 {
 	int range = 0;
@@ -708,11 +722,10 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-bool User::SetClientIP(const char* sip, bool recheck_eline)
+bool User::SetClientIP(const std::string& address, bool recheck_eline)
 {
-	cachedip.clear();
-	cached_hostip.clear();
-	return irc::sockets::aptosa(sip, 0, client_sa);
+	this->InvalidateCache();
+	return irc::sockets::aptosa(address, 0, client_sa);
 }
 
 void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
@@ -722,10 +735,10 @@ void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
 	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
 }
 
-bool LocalUser::SetClientIP(const char* sip, bool recheck_eline)
+bool LocalUser::SetClientIP(const std::string& address, bool recheck_eline)
 {
 	irc::sockets::sockaddrs sa;
-	if (!irc::sockets::aptosa(sip, 0, sa))
+	if (!irc::sockets::aptosa(address, 0, sa))
 		// Invalid
 		return false;
 
@@ -763,7 +776,7 @@ void LocalUser::Write(const std::string& text)
 	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, ServerInstance->Config->Limits.MaxLine - 2);
+		std::string try_again(text, 0, ServerInstance->Config->Limits.MaxLine - 2);
 		Write(try_again);
 		return;
 	}
@@ -807,25 +820,33 @@ void User::WriteCommand(const char* command, const std::string& text)
 	this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text);
 }
 
-void User::WriteNumeric(unsigned int numeric, const char* text, ...)
+namespace
 {
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	this->WriteNumeric(numeric, textbuffer);
+	std::string BuildNumeric(const std::string& source, User* targetuser, unsigned int num, const std::vector<std::string>& params)
+	{
+		const char* const target = (targetuser->registered & REG_NICK ? targetuser->nick.c_str() : "*");
+		std::string raw = InspIRCd::Format(":%s %03u %s", source.c_str(), num, target);
+		if (!params.empty())
+		{
+			for (std::vector<std::string>::const_iterator i = params.begin(); i != params.end()-1; ++i)
+				raw.append(1, ' ').append(*i);
+			raw.append(" :").append(params.back());
+		}
+		return raw;
+	}
 }
 
-void User::WriteNumeric(unsigned int numeric, const std::string &text)
+void User::WriteNumeric(const Numeric::Numeric& numeric)
 {
 	ModResult MOD_RESULT;
 
-	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric, text));
+	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric));
 
 	if (MOD_RESULT == MOD_RES_DENY)
 		return;
 
-	const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(),
-		numeric, this->registered & REG_NICK ? this->nick.c_str() : "*", text.c_str());
-	this->Write(message);
+	const std::string& servername = (numeric.GetServer() ? numeric.GetServer()->GetName() : ServerInstance->Config->ServerName);
+	this->Write(BuildNumeric(servername, this, numeric.GetNumeric(), numeric.GetParams()));
 }
 
 void User::WriteFrom(User *user, const std::string &text)
@@ -844,133 +865,105 @@ void User::WriteFrom(User *user, const char* text, ...)
 	this->WriteFrom(user, textbuffer);
 }
 
-void User::WriteCommon(const char* text, ...)
+void User::WriteRemoteNotice(const std::string& text)
 {
-	if (this->registered != REG_ALL || quitting)
-		return;
-
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
-	this->WriteCommonRaw(textbuffer, true);
+	ServerInstance->PI->SendUserNotice(this, text);
 }
 
-void User::WriteCommonRaw(const std::string &line, bool include_self)
+void LocalUser::WriteRemoteNotice(const std::string& text)
 {
-	if (this->registered != REG_ALL || quitting)
-		return;
-
-	LocalUser::already_sent_id++;
-
-	IncludeChanList include_c(chans.begin(), chans.end());
-	std::map<User*,bool> exceptions;
-
-	exceptions[this] = include_self;
-
-	FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions));
+	WriteNotice(text);
+}
 
-	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+namespace
+{
+	class WriteCommonRawHandler : public User::ForEachNeighborHandler
 	{
-		LocalUser* u = IS_LOCAL(i->first);
-		if (u && !u->quitting)
+		const std::string& msg;
+
+		void Execute(LocalUser* user) CXX11_OVERRIDE
 		{
-			u->already_sent = LocalUser::already_sent_id;
-			if (i->second)
-				u->Write(line);
+			user->Write(msg);
 		}
-	}
-	for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
-	{
-		Channel* c = (*v)->chan;
-		const Channel::MemberMap& ulist = c->GetUsers();
-		for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
+
+	 public:
+		WriteCommonRawHandler(const std::string& message)
+			: msg(message)
 		{
-			LocalUser* u = IS_LOCAL(i->first);
-			if (u && u->already_sent != LocalUser::already_sent_id)
-			{
-				u->already_sent = LocalUser::already_sent_id;
-				u->Write(line);
-			}
 		}
-	}
+	};
 }
 
-void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
+void User::WriteCommon(const char* text, ...)
 {
-	if (this->registered != REG_ALL)
-		return;
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
+	this->WriteCommonRaw(textbuffer, true);
+}
 
-	already_sent_t uniq_id = ++LocalUser::already_sent_id;
+void User::WriteCommonRaw(const std::string &line, bool include_self)
+{
+	WriteCommonRawHandler handler(line);
+	ForEachNeighbor(handler, include_self);
+}
 
-	const std::string normalMessage = ":" + this->GetFullHost() + " QUIT :" + normal_text;
-	const std::string operMessage = ":" + this->GetFullHost() + " QUIT :" + oper_text;
+void User::ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self)
+{
+	// The basic logic for visiting the neighbors of a user is to iterate the channel list of the user
+	// and visit all users on those channels. Because two users may share more than one common channel,
+	// we must skip users that we have already visited.
+	// To do this, we make use of a global counter and an integral 'already_sent' field in LocalUser.
+	// The global counter is incremented every time we do something for each neighbor of a user. Then,
+	// before visiting a member we examine user->already_sent. If it's equal to the current counter, we
+	// skip the member. Otherwise, we set it to the current counter and visit the member.
 
-	IncludeChanList include_c(chans.begin(), chans.end());
-	std::map<User*,bool> exceptions;
+	// Ask modules to build a list of exceptions.
+	// Mods may also exclude entire channels by erasing them from include_chans.
+	IncludeChanList include_chans(chans.begin(), chans.end());
+	std::map<User*, bool> exceptions;
+	exceptions[this] = include_self;
+	FOREACH_MOD(OnBuildNeighborList, (this, include_chans, exceptions));
 
-	FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions));
+	// Get next id, guaranteed to differ from the already_sent field of all users
+	const already_sent_t newid = ServerInstance->Users.NextAlreadySentId();
 
-	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
+	// Handle exceptions first
+	for (std::map<User*, bool>::const_iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		LocalUser* u = IS_LOCAL(i->first);
-		if (u && !u->quitting)
+		LocalUser* curr = IS_LOCAL(i->first);
+		if (curr)
 		{
-			u->already_sent = uniq_id;
-			if (i->second)
-				u->Write(u->IsOper() ? operMessage : normalMessage);
+			// Mark as visited to ensure we won't visit again if there is a common channel
+			curr->already_sent = newid;
+			// Always treat quitting users as excluded
+			if ((i->second) && (!curr->quitting))
+				handler.Execute(curr);
 		}
 	}
-	for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
+
+	// Now consider the real neighbors
+	for (IncludeChanList::const_iterator i = include_chans.begin(); i != include_chans.end(); ++i)
 	{
-		const Channel::MemberMap& ulist = (*v)->chan->GetUsers();
-		for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); i++)
+		Channel* chan = (*i)->chan;
+		const Channel::MemberMap& userlist = chan->GetUsers();
+		for (Channel::MemberMap::const_iterator j = userlist.begin(); j != userlist.end(); ++j)
 		{
-			LocalUser* u = IS_LOCAL(i->first);
-			if (u && (u->already_sent != uniq_id))
+			LocalUser* curr = IS_LOCAL(j->first);
+			// User not yet visited?
+			if ((curr) && (curr->already_sent != newid))
 			{
-				u->already_sent = uniq_id;
-				u->Write(u->IsOper() ? operMessage : normalMessage);
+				// Mark as visited and execute function
+				curr->already_sent = newid;
+				handler.Execute(curr);
 			}
 		}
 	}
 }
 
-void LocalUser::SendText(const std::string& line)
+void User::WriteRemoteNumeric(const Numeric::Numeric& numeric)
 {
-	Write(line);
-}
-
-void RemoteUser::SendText(const std::string& line)
-{
-	ServerInstance->PI->PushToClient(this, line);
-}
-
-void FakeUser::SendText(const std::string& line)
-{
-}
-
-void User::SendText(const char *text, ...)
-{
-	std::string line;
-	VAFORMAT(line, text, text);
-	SendText(line);
-}
-
-void User::SendText(const std::string& linePrefix, std::stringstream& textStream)
-{
-	std::string line;
-	std::string word;
-	while (textStream >> word)
-	{
-		size_t lineLength = linePrefix.length() + line.length() + word.length() + 3; // "\s\n\r"
-		if (lineLength > ServerInstance->Config->Limits.MaxLine)
-		{
-			SendText(linePrefix + line);
-			line.clear();
-		}
-		line += " " + word;
-	}
-	SendText(linePrefix + line);
+	WriteNumeric(numeric);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1019,7 +1012,7 @@ bool User::ChangeName(const std::string& gecos)
 
 bool User::ChangeDisplayedHost(const std::string& shost)
 {
-	if (dhost == shost)
+	if (GetDisplayedHost() == shost)
 		return true;
 
 	if (IS_LOCAL(this))
@@ -1032,15 +1025,34 @@ bool User::ChangeDisplayedHost(const std::string& shost)
 
 	FOREACH_MOD(OnChangeHost, (this,shost));
 
-	this->dhost.assign(shost, 0, ServerInstance->Config->Limits.MaxHost);
+	if (realhost == shost)
+		this->displayhost.clear();
+	else
+		this->displayhost.assign(shost, 0, ServerInstance->Config->Limits.MaxHost);
+
 	this->InvalidateCache();
 
 	if (IS_LOCAL(this))
-		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s :is now your displayed host", this->dhost.c_str());
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host");
 
 	return true;
 }
 
+void User::ChangeRealHost(const std::string& host, bool resetdisplay)
+{
+	if (displayhost == host)
+		return;
+	
+	if (displayhost.empty() && !resetdisplay)
+		displayhost = realhost;
+
+	else if (displayhost == host || resetdisplay)
+		displayhost.clear();
+
+	realhost = host;
+	this->InvalidateCache();
+}
+
 bool User::ChangeIdent(const std::string& newident)
 {
 	if (this->ident == newident)
@@ -1107,7 +1119,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 
 			/* check if host matches.. */
 			if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
-			    !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
+			    !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "No host match (for %s)", c->GetHost().c_str());
 				continue;
@@ -1124,14 +1136,14 @@ void LocalUser::SetClass(const std::string &explicit_name)
 			}
 
 			/* if it requires a port ... */
-			int port = c->config->getInt("port");
-			if (port)
+			if (!c->ports.empty())
 			{
-				ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Requires port (%d)", port);
-
 				/* and our port doesn't match, fail. */
-				if (this->GetServerPort() != port)
+				if (!c->ports.count(this->GetServerPort()))
+				{
+					ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Requires a different port, skipping");
 					continue;
+				}
 			}
 
 			if (regdone && !c->config->getString("password").empty())
@@ -1194,13 +1206,11 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
 }
 
 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),
-	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), resolvehostnames(parent.resolvehostnames)
 {
+	Update(&parent);
+	name = "unnamed";
+	type = t;
+	config = tag;
 }
 
 void ConnectClass::Update(const ConnectClass* src)
@@ -1223,4 +1233,5 @@ void ConnectClass::Update(const ConnectClass* src)
 	maxchans = src->maxchans;
 	limit = src->limit;
 	resolvehostnames = src->resolvehostnames;
+	ports = src->ports;
 }