X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=f11a7a38079e43d3fba28c9fc914f1ce0fcc3deb;hb=51891f10f2a05e16e45651a669db6680a433bf9b;hp=7437e8a209f83baea1e3345608785616883e1732;hpb=5fbb5a0b2c5c08f76f99bd03b51bce2164feade3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 7437e8a20..f11a7a380 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -26,6 +26,8 @@
 #include "inspircd.h"
 #include "xline.h"
 
+ClientProtocol::MessageList LocalUser::sendmsglist;
+
 bool User::IsNoticeMaskSet(unsigned char sm)
 {
 	if (!isalpha(sm))
@@ -33,43 +35,45 @@ 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)
+User::User(const std::string& 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());
@@ -83,18 +87,29 @@ User::User(const std::string& uid, Server* srv, int type)
 }
 
 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)
+	, serializer(NULL)
+	, 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()
@@ -107,7 +122,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;
 }
 
@@ -127,7 +142,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;
 }
 
@@ -137,23 +152,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;
 }
 
-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')];
 
 }
 /*
@@ -176,12 +192,7 @@ bool LocalUser::HasPermission(const std::string &command)
 		return false;
 	}
 
-	if (oper->AllowedOperCommands.find(command) != oper->AllowedOperCommands.end())
-		return true;
-	else if (oper->AllowedOperCommands.find("*") != oper->AllowedOperCommands.end())
-		return true;
-
-	return false;
+	return oper->AllowedOperCommands.Contains(command);
 }
 
 bool User::HasPrivPermission(const std::string &privstr, bool noisy)
@@ -198,14 +209,8 @@ bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy)
 		return false;
 	}
 
-	if (oper->AllowedPrivs.find(privstr) != oper->AllowedPrivs.end())
-	{
+	if (oper->AllowedPrivs.Contains(privstr))
 		return true;
-	}
-	else if (oper->AllowedPrivs.find("*") != oper->AllowedPrivs.end())
-	{
-		return true;
-	}
 
 	if (noisy)
 		this->WriteNotice("Oper type " + oper->name + " does not have access to priv " + privstr);
@@ -225,37 +230,56 @@ void UserIOHandler::OnDataReady()
 			user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax());
 		return;
 	}
+
 	unsigned long sendqmax = ULONG_MAX;
 	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;
 
+	// The maximum size of an IRC message minus the terminating CR+LF.
+	const size_t maxmessage = ServerInstance->Config->Limits.MaxLine - 2;
+	std::string line;
+	line.reserve(maxmessage);
+
+	bool eol_found;
+	std::string::size_type qpos;
+
 	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
-		std::string line;
-		line.reserve(ServerInstance->Config->Limits.MaxLine);
-		std::string::size_type qpos = 0;
-		while (qpos < recvq.length())
+		qpos = 0;
+		eol_found = false;
+
+		const size_t qlen = recvq.length();
+		while (qpos < qlen)
 		{
 			char c = recvq[qpos++];
 			switch (c)
 			{
-			case '\0':
-				c = ' ';
-				break;
-			case '\r':
-				continue;
-			case '\n':
-				goto eol_found;
+				case '\0':
+					c = ' ';
+					break;
+				case '\r':
+					continue;
+				case '\n':
+					eol_found = true;
+					break;
 			}
-			if (line.length() < ServerInstance->Config->Limits.MaxLine - 2)
+
+			if (eol_found)
+				break;
+
+			if (line.length() < maxmessage)
 				line.push_back(c);
 		}
-		// if we got here, the recvq ran out before we found a newline
-		return;
-eol_found:
+
+		// if we return here, we haven't found a newline and make no modifications to recvq
+		// so we can wait for more data
+		if (!eol_found)
+			return;
+
 		// just found a newline. Terminate the string, and pull it out of recvq
 		recvq.erase(0, qpos);
 
@@ -264,10 +288,14 @@ eol_found:
 		user->bytes_in += qpos;
 		user->cmds_in++;
 
-		ServerInstance->Parser.ProcessBuffer(line, user);
+		ServerInstance->Parser.ProcessBuffer(user, line);
 		if (user->quitting)
 			return;
+
+		// clear() does not reclaim memory associated with the string, so our .reserve() call is safe
+		line.clear();
 	}
+
 	if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
 		ServerInstance->Users->QuitUser(user, "Excess Flood");
 }
@@ -290,6 +318,12 @@ void UserIOHandler::AddWriteBuf(const std::string &data)
 	WriteData(data);
 }
 
+void UserIOHandler::OnSetEndPoint(const irc::sockets::sockaddrs& server, const irc::sockets::sockaddrs& client)
+{
+	memcpy(&user->server_sa, &server, sizeof(irc::sockets::sockaddrs));
+	user->SetClientIP(client);
+}
+
 void UserIOHandler::OnError(BufferedSocketError)
 {
 	ServerInstance->Users->QuitUser(user, getError());
@@ -300,7 +334,7 @@ CullResult User::cull()
 	if (!quitting)
 		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
 
-	if (client_sa.sa.sa_family != AF_UNSPEC)
+	if (client_sa.family() != AF_UNSPEC)
 		ServerInstance->Users->RemoveCloneCounts(this);
 
 	return Extensible::cull();
@@ -323,12 +357,23 @@ CullResult FakeUser::cull()
 void User::Oper(OperInfo* info)
 {
 	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
-	if (this->IsModeSet(opermh))
-		this->UnOper();
-
-	this->SetMode(opermh, true);
+	if (opermh)
+	{
+		if (this->IsModeSet(opermh))
+			this->UnOper();
+		this->SetMode(opermh, true);
+	}
 	this->oper = info;
-	this->WriteCommand("MODE", "+o");
+
+	LocalUser* localuser = IS_LOCAL(this);
+	if (localuser)
+	{
+		Modes::ChangeList changelist;
+		changelist.push_add(opermh);
+		ClientProtocol::Events::Mode modemsg(ServerInstance->FakeClient, NULL, localuser, changelist);
+		localuser->Send(modemsg);
+	}
+
 	FOREACH_MOD(OnOper, (this, info->name));
 
 	std::string opername;
@@ -347,14 +392,13 @@ 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->name.c_str(), opername.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);
 
 	// Expand permissions from config for faster lookup
-	if (IS_LOCAL(this))
+	if (localuser)
 		oper->init();
 
 	FOREACH_MOD(OnPostOper, (this, oper->name, opername));
@@ -362,8 +406,8 @@ void User::Oper(OperInfo* info)
 
 void OperInfo::init()
 {
-	AllowedOperCommands.clear();
-	AllowedPrivs.clear();
+	AllowedOperCommands.Clear();
+	AllowedPrivs.Clear();
 	AllowedUserModes.reset();
 	AllowedChanModes.reset();
 	AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
@@ -371,19 +415,9 @@ void OperInfo::init()
 	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))
-		{
-			AllowedOperCommands.insert(mycmd);
-		}
 
-		irc::spacesepstream PrivList(tag->getString("privs"));
-		while (PrivList.GetToken(mypriv))
-		{
-			AllowedPrivs.insert(mypriv);
-		}
+		AllowedOperCommands.AddList(tag->getString("commands"));
+		AllowedPrivs.AddList(tag->getString("privs"));
 
 		std::string modes = tag->getString("usermodes");
 		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
@@ -442,7 +476,9 @@ void User::UnOper()
 	stdalgo::vector::swaperase(ServerInstance->Users->all_opers, this);
 
 	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
-	this->SetMode(opermh, false);
+	if (opermh)
+		this->SetMode(opermh, false);
+	FOREACH_MOD(OnPostDeoper, (this));
 }
 
 /*
@@ -481,7 +517,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)
@@ -524,48 +560,21 @@ void LocalUser::FullConnect()
 	if (quitting)
 		return;
 
-	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::Format("This server was created %s %s", __TIME__, __DATE__));
-
-	const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
-	this->WriteNumeric(RPL_SERVERVERSION, ServerInstance->Config->ServerName, INSPIRCD_BRANCH, modelist);
-
-	ServerInstance->ISupport.SendTo(this);
-
-	/* Now registered */
-	if (ServerInstance->Users->unregistered_count)
-		ServerInstance->Users->unregistered_count--;
-
-	/* Trigger MOTD and LUSERS output, give modules a chance too */
-	ModResult MOD_RESULT;
-	std::string command("LUSERS");
-	std::vector<std::string> parameters;
-	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
-	if (!MOD_RESULT)
-		ServerInstance->Parser.CallHandler(command, parameters, this);
-
-	MOD_RESULT = MOD_RES_PASSTHRU;
-	command = "MOTD";
-	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
-	if (!MOD_RESULT)
-		ServerInstance->Parser.CallHandler(command, parameters, this);
-
-	if (ServerInstance->Config->RawLog)
-		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
-
 	/*
 	 * 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(OnUserConnect, (this));
 
+	/* Now registered */
+	if (ServerInstance->Users->unregistered_count)
+		ServerInstance->Users->unregistered_count--;
 	this->registered = REG_ALL;
 
 	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());
+		this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->GetRealName().c_str());
 	ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding NEGATIVE hit for " + this->GetIPString());
 	ServerInstance->BanCache.AddHit(this->GetIPString(), "", "");
 	// reset the flood penalty (which could have been raised due to things like auto +x)
@@ -575,6 +584,7 @@ void LocalUser::FullConnect()
 void User::InvalidateCache()
 {
 	/* Invalidate cache */
+	cachedip.clear();
 	cached_fullhost.clear();
 	cached_hostip.clear();
 	cached_makehost.clear();
@@ -614,11 +624,8 @@ 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, InUse->nick, "Nickname overruled.");
-
-				InUse->registered &= ~REG_NICK;
-				InUse->ChangeNick(InUse->uuid);
+				LocalUser* const localuser = static_cast<LocalUser*>(InUse);
+				localuser->OverruleNick();
 			}
 			else
 			{
@@ -632,8 +639,12 @@ bool User::ChangeNick(const std::string& newnick, time_t newts)
 	}
 
 	if (this->registered == REG_ALL)
-		this->WriteCommon("NICK %s",newnick.c_str());
-	std::string oldnick = nick;
+	{
+		ClientProtocol::Messages::Nick nickmsg(this, newnick);
+		ClientProtocol::Event nickevent(ServerInstance->GetRFCEvents().nick, nickmsg);
+		this->WriteCommonRaw(nickevent, true);
+	}
+	const std::string oldnick = nick;
 	nick = newnick;
 
 	InvalidateCache();
@@ -646,24 +657,29 @@ bool User::ChangeNick(const std::string& newnick, time_t newts)
 	return true;
 }
 
-int LocalUser::GetServerPort()
+void LocalUser::OverruleNick()
 {
-	switch (this->server_sa.sa.sa_family)
 	{
-		case AF_INET6:
-			return htons(this->server_sa.in6.sin6_port);
-		case AF_INET:
-			return htons(this->server_sa.in4.sin_port);
+		ClientProtocol::Messages::Nick nickmsg(this, this->uuid);
+		this->Send(ServerInstance->GetRFCEvents().nick, nickmsg);
 	}
-	return 0;
+	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()
+{
+	return this->server_sa.port();
 }
 
 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');
@@ -672,10 +688,30 @@ 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;
+}
+
+const std::string& User::GetRealName() const
+{
+	return realname;
+}
+
 irc::sockets::cidr_mask User::GetCIDRMask()
 {
-	int range = 0;
-	switch (client_sa.sa.sa_family)
+	unsigned char range = 0;
+	switch (client_sa.family())
 	{
 		case AF_INET6:
 			range = ServerInstance->Config->c_ipv6_range;
@@ -687,25 +723,33 @@ 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);
+	irc::sockets::sockaddrs sa;
+	if (!irc::sockets::aptosa(address, client_sa.port(), sa))
+		return false;
+
+	User::SetClientIP(sa, recheck_eline);
+	return true;
 }
 
 void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
 {
-	cachedip.clear();
-	cached_hostip.clear();
+	const std::string oldip(GetIPString());
 	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
+	this->InvalidateCache();
+
+	// If the users hostname was their IP then update it.
+	if (GetRealHost() == oldip)
+		ChangeRealHost(GetIPString(), false);
+	if (GetDisplayedHost() == oldip)
+		ChangeDisplayedHost(GetIPString());
 }
 
-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))
-		// Invalid
+	if (!irc::sockets::aptosa(address, client_sa.port(), sa))
 		return false;
 
 	LocalUser::SetClientIP(sa, recheck_eline);
@@ -724,86 +768,72 @@ void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_elin
 	}
 }
 
-static std::string wide_newline("\r\n");
-
-void User::Write(const std::string& text)
-{
-}
-
-void User::Write(const char *text, ...)
-{
-}
-
-void LocalUser::Write(const std::string& text)
+void LocalUser::Write(const ClientProtocol::SerializedMessage& text)
 {
 	if (!SocketEngine::BoundsCheckFd(&eh))
 		return;
 
-	if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
+	if (ServerInstance->Config->RawLog)
 	{
-		// this should happen rarely or never. Crop the string at 512 and try again.
-		std::string try_again(text, 0, ServerInstance->Config->Limits.MaxLine - 2);
-		Write(try_again);
-		return;
-	}
+		if (text.empty())
+			return;
 
-	ServerInstance->Logs->Log("USEROUTPUT", LOG_RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str());
+		std::string::size_type nlpos = text.find_first_of("\r\n", 0, 2);
+		if (nlpos == std::string::npos)
+			nlpos = text.length(); // TODO is this ok, test it
+
+		ServerInstance->Logs->Log("USEROUTPUT", LOG_RAWIO, "C[%s] O %.*s", uuid.c_str(), (int) nlpos, text.c_str());
+	}
 
 	eh.AddWriteBuf(text);
-	eh.AddWriteBuf(wide_newline);
 
-	ServerInstance->stats.Sent += text.length() + 2;
-	this->bytes_out += text.length() + 2;
+	const size_t bytessent = text.length() + 2;
+	ServerInstance->stats.Sent += bytessent;
+	this->bytes_out += bytessent;
 	this->cmds_out++;
 }
 
-/** Write()
- */
-void LocalUser::Write(const char *text, ...)
-{
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	this->Write(textbuffer);
-}
-
-void User::WriteServ(const std::string& text)
+void LocalUser::Send(ClientProtocol::Event& protoev)
 {
-	this->Write(":%s %s",ServerInstance->Config->ServerName.c_str(),text.c_str());
-}
-
-/** WriteServ()
- *  Same as Write(), except `text' is prefixed with `:server.name '.
- */
-void User::WriteServ(const char* text, ...)
-{
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	this->WriteServ(textbuffer);
-}
+	if (!serializer)
+		return;
 
-void User::WriteCommand(const char* command, const std::string& text)
-{
-	this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text);
+	// In the most common case a static LocalUser field, sendmsglist, is passed to the event to be
+	// populated. The list is cleared before returning.
+	// To handle re-enters, if sendmsglist is non-empty upon entering the method then a temporary
+	// list is used instead of the static one.
+	if (sendmsglist.empty())
+	{
+		Send(protoev, sendmsglist);
+		sendmsglist.clear();
+	}
+	else
+	{
+		ClientProtocol::MessageList msglist;
+		Send(protoev, msglist);
+	}
 }
 
-namespace
+void LocalUser::Send(ClientProtocol::Event& protoev, ClientProtocol::MessageList& msglist)
 {
-	std::string BuildNumeric(const std::string& source, User* targetuser, unsigned int num, const std::vector<std::string>& params)
+	// Modules can personalize the messages sent per user for the event
+	protoev.GetMessagesForUser(this, msglist);
+	for (ClientProtocol::MessageList::const_iterator i = msglist.begin(); i != msglist.end(); ++i)
 	{
-		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;
+		ClientProtocol::Message& curr = **i;
+		ModResult res;
+		FIRST_MOD_RESULT(OnUserWrite, res, (this, curr));
+		if (res != MOD_RES_DENY)
+			Write(serializer->SerializeForUser(this, curr));
 	}
 }
 
 void User::WriteNumeric(const Numeric::Numeric& numeric)
 {
+	LocalUser* const localuser = IS_LOCAL(this);
+	if (!localuser)
+		return;
+
 	ModResult MOD_RESULT;
 
 	FIRST_MOD_RESULT(OnNumeric, MOD_RESULT, (this, numeric));
@@ -811,24 +841,8 @@ void User::WriteNumeric(const Numeric::Numeric& numeric)
 	if (MOD_RESULT == MOD_RES_DENY)
 		return;
 
-	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)
-{
-	const std::string message = ":" + user->GetFullHost() + " " + text;
-	this->Write(message);
-}
-
-
-/* write text from an originating user to originating user */
-
-void User::WriteFrom(User *user, const char* text, ...)
-{
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	this->WriteFrom(user, textbuffer);
+	ClientProtocol::Messages::Numeric numericmsg(numeric, localuser);
+	localuser->Send(ServerInstance->GetRFCEvents().numeric, numericmsg);
 }
 
 void User::WriteRemoteNotice(const std::string& text)
@@ -845,32 +859,24 @@ namespace
 {
 	class WriteCommonRawHandler : public User::ForEachNeighborHandler
 	{
-		const std::string& msg;
+		ClientProtocol::Event& ev;
 
 		void Execute(LocalUser* user) CXX11_OVERRIDE
 		{
-			user->Write(msg);
+			user->Send(ev);
 		}
 
 	 public:
-		WriteCommonRawHandler(const std::string& message)
-			: msg(message)
+		WriteCommonRawHandler(ClientProtocol::Event& protoev)
+			: ev(protoev)
 		{
 		}
 	};
 }
 
-void User::WriteCommon(const char* text, ...)
-{
-	std::string textbuffer;
-	VAFORMAT(textbuffer, text, text);
-	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
-	this->WriteCommonRaw(textbuffer, true);
-}
-
-void User::WriteCommonRaw(const std::string &line, bool include_self)
+void User::WriteCommonRaw(ClientProtocol::Event& protoev, bool include_self)
 {
-	WriteCommonRawHandler handler(line);
+	WriteCommonRawHandler handler(protoev);
 	ForEachNeighbor(handler, include_self);
 }
 
@@ -927,27 +933,6 @@ void User::ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self)
 	}
 }
 
-void LocalUser::SendText(const std::string& line)
-{
-	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::WriteRemoteNumeric(const Numeric::Numeric& numeric)
 {
 	WriteNumeric(numeric);
@@ -979,48 +964,80 @@ bool User::SharesChannelWith(User *other)
 	return false;
 }
 
-bool User::ChangeName(const std::string& gecos)
+bool User::ChangeRealName(const std::string& real)
 {
-	if (!this->fullname.compare(gecos))
+	if (!this->realname.compare(real))
 		return true;
 
 	if (IS_LOCAL(this))
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (IS_LOCAL(this),gecos));
+		FIRST_MOD_RESULT(OnPreChangeRealName, MOD_RESULT, (IS_LOCAL(this), real));
 		if (MOD_RESULT == MOD_RES_DENY)
 			return false;
-		FOREACH_MOD(OnChangeName, (this,gecos));
+		FOREACH_MOD(OnChangeRealName, (this, real));
 	}
-	this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
+	this->realname.assign(real, 0, ServerInstance->Config->Limits.MaxReal);
 
 	return true;
 }
 
 bool User::ChangeDisplayedHost(const std::string& shost)
 {
-	if (dhost == shost)
+	if (GetDisplayedHost() == shost)
 		return true;
 
-	if (IS_LOCAL(this))
+	LocalUser* luser = IS_LOCAL(this);
+	if (luser)
 	{
 		ModResult MOD_RESULT;
-		FIRST_MOD_RESULT(OnChangeLocalUserHost, MOD_RESULT, (IS_LOCAL(this),shost));
+		FIRST_MOD_RESULT(OnPreChangeHost, MOD_RESULT, (luser, shost));
 		if (MOD_RESULT == MOD_RES_DENY)
 			return false;
 	}
 
 	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, this->dhost, "is now your displayed host");
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host");
 
 	return true;
 }
 
+void User::ChangeRealHost(const std::string& host, bool resetdisplay)
+{
+	// If the real host is the new host and we are not resetting the
+	// display host then we have nothing to do.
+	const bool changehost = (realhost != host);
+	if (!changehost && !resetdisplay)
+		return;
+	
+	// If the displayhost is not set and we are not resetting it then
+	// we need to copy it to the displayhost field.
+	if (displayhost.empty() && !resetdisplay)
+		displayhost = realhost;
+
+	// If the displayhost is the new host or we are resetting it then
+	// we clear its contents to save memory.
+	else if (displayhost == host || resetdisplay)
+		displayhost.clear();
+
+	// If we are just resetting the display host then we don't need to
+	// do anything else.
+	if (!changehost)
+		return;
+
+	realhost = host;
+	this->InvalidateCache();
+}
+
 bool User::ChangeIdent(const std::string& newident)
 {
 	if (this->ident == newident)
@@ -1087,7 +1104,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;
@@ -1104,14 +1121,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())
@@ -1147,21 +1164,29 @@ void User::PurgeEmptyChannels()
 		++i;
 		c->DelUser(this);
 	}
+}
 
-	this->UnOper();
+void User::WriteNotice(const std::string& text)
+{
+	LocalUser* const localuser = IS_LOCAL(this);
+	if (!localuser)
+		return;
+
+	ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, localuser, text, MSG_NOTICE);
+	localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
 }
 
 const std::string& FakeUser::GetFullHost()
 {
-	if (!ServerInstance->Config->HideWhoisServer.empty())
-		return ServerInstance->Config->HideWhoisServer;
+	if (!ServerInstance->Config->HideServer.empty())
+		return ServerInstance->Config->HideServer;
 	return server->GetName();
 }
 
 const std::string& FakeUser::GetFullRealHost()
 {
-	if (!ServerInstance->Config->HideWhoisServer.empty())
-		return ServerInstance->Config->HideWhoisServer;
+	if (!ServerInstance->Config->HideServer.empty())
+		return ServerInstance->Config->HideServer;
 	return server->GetName();
 }
 
@@ -1174,13 +1199,36 @@ 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;
+	host = mask;
+
+	// Connect classes can inherit from each other but this is problematic for modules which can't use
+	// ConnectClass::Update so we build a hybrid tag containing all of the values set on this class as
+	// well as the parent class.
+	ConfigItems* items = NULL;
+	config = ConfigTag::create(tag->tag, tag->src_name, tag->src_line, items);
+
+	const ConfigItems& parentkeys = parent.config->getItems();
+	for (ConfigItems::const_iterator piter = parentkeys.begin(); piter != parentkeys.end(); ++piter)
+	{
+		// The class name and parent name are not inherited
+		if (stdalgo::string::equalsci(piter->first, "name") || stdalgo::string::equalsci(piter->first, "parent"))
+			continue;
+
+		// Store the item in the config tag. If this item also
+		// exists in the child it will be overwritten.
+		(*items)[piter->first] = piter->second;
+	}
+
+	const ConfigItems& childkeys = tag->getItems();
+	for (ConfigItems::const_iterator citer = childkeys.begin(); citer != childkeys.end(); ++citer)
+	{
+		// This will overwrite the parent value if present.
+		(*items)[citer->first] = citer->second;
+	}
 }
 
 void ConnectClass::Update(const ConnectClass* src)
@@ -1203,4 +1251,5 @@ void ConnectClass::Update(const ConnectClass* src)
 	maxchans = src->maxchans;
 	limit = src->limit;
 	resolvehostnames = src->resolvehostnames;
+	ports = src->ports;
 }