X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=3a6ddbc0f436e7ed577c838b933c2cd83a6cfd6b;hb=d2ed9f842f5c4d5d0ebb9230f920f7f2ac44fd5a;hp=eb87824fcf1f22d7ba543f49edc6d61931c1d9f7;hpb=0a1f9bc59494a532a91bc9c8afcecb31ece656ee;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index eb87824fc..3a6ddbc0f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -46,7 +46,7 @@ std::string User::GetModeLetters(bool includeparams) const
 	std::string ret(1, '+');
 	std::string params;
 
-	for (unsigned char i = 'A'; i < 'z'; i++)
+	for (unsigned char i = 'A'; i <= 'z'; i++)
 	{
 		const ModeHandler* const mh = ServerInstance->Modes.FindMode(i, MODETYPE_USER);
 		if ((!mh) || (!IsModeSet(mh)))
@@ -97,7 +97,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 	, quitting_sendq(false)
 	, lastping(true)
 	, exempt(false)
-	, nping(0)
+	, nextping(0)
 	, idle_lastmsg(0)
 	, CommandFloodPenalty(0)
 	, already_sent(0)
@@ -239,23 +239,30 @@ void UserIOHandler::OnDataReady()
 	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;
+	// The cleaned message sent by the user or empty if not found yet.
 	std::string line;
-	line.reserve(maxmessage);
 
-	bool eol_found;
+	// The position of the most \n character or npos if not found yet.
+	std::string::size_type eolpos;
+
+	// The position within the recvq of the current character.
 	std::string::size_type qpos;
 
 	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
-		qpos = 0;
-		eol_found = false;
+		// Check the newly received data for an EOL.
+		eolpos = recvq.find('\n', checked_until);
+		if (eolpos == std::string::npos)
+		{
+			checked_until = recvq.length();
+			return;
+		}
 
-		const size_t qlen = recvq.length();
-		while (qpos < qlen)
+		// We've found a line! Clean it up and move it to the line buffer.
+		line.reserve(eolpos);
+		for (qpos = 0; qpos < eolpos; ++qpos)
 		{
-			char c = recvq[qpos++];
+			char c = recvq[qpos];
 			switch (c)
 			{
 				case '\0':
@@ -263,25 +270,14 @@ void UserIOHandler::OnDataReady()
 					break;
 				case '\r':
 					continue;
-				case '\n':
-					eol_found = true;
-					break;
 			}
 
-			if (eol_found)
-				break;
-
-			if (line.length() < maxmessage)
-				line.push_back(c);
+			line.push_back(c);
 		}
 
-		// 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);
+		recvq.erase(0, eolpos + 1);
+		checked_until = 0;
 
 		// TODO should this be moved to when it was inserted in recvq?
 		ServerInstance->stats.Recv += qpos;
@@ -381,17 +377,6 @@ void User::Oper(OperInfo* info)
 	if (info->oper_block)
 		opername = info->oper_block->getString("name");
 
-	if (IS_LOCAL(this))
-	{
-		LocalUser* l = IS_LOCAL(this);
-		std::string vhost = oper->getConfig("vhost");
-		if (!vhost.empty())
-			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(), 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()));
@@ -518,7 +503,7 @@ void LocalUser::CheckClass(bool clone_count)
 		}
 	}
 
-	this->nping = ServerInstance->Time() + a->GetPingTime();
+	this->nextping = ServerInstance->Time() + a->GetPingTime();
 }
 
 bool LocalUser::CheckLines(bool doZline)
@@ -575,7 +560,7 @@ void LocalUser::FullConnect()
 	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->GetRealName().c_str());
+		this->server_sa.port(), 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)
@@ -671,11 +656,6 @@ void LocalUser::OverruleNick()
 	this->ChangeNick(this->uuid);
 }
 
-int LocalUser::GetServerPort()
-{
-	return this->server_sa.port();
-}
-
 const std::string& User::GetIPString()
 {
 	if (cachedip.empty())
@@ -1017,7 +997,7 @@ bool User::ChangeDisplayedHost(const std::string& shost)
 
 	this->InvalidateCache();
 
-	if (IS_LOCAL(this))
+	if (IS_LOCAL(this) && this->registered != REG_NONE)
 		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host");
 
 	return true;
@@ -1030,7 +1010,7 @@ void User::ChangeRealHost(const std::string& host, bool resetdisplay)
 	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)
@@ -1136,7 +1116,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 			if (!c->ports.empty())
 			{
 				/* and our port doesn't match, fail. */
-				if (!c->ports.count(this->GetServerPort()))
+				if (!c->ports.count(this->server_sa.port()))
 				{
 					ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Requires a different port, skipping");
 					continue;