X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=bc354fa6d955ab0d11341dc6e6305cf4f1c1a1f8;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=bdd7e7e8a563bf84b27391ac1c0a306bb8d8584d;hpb=c16cda5d715241bb4bff8050bee942a8a34a72c0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index bdd7e7e8a..bc354fa6d 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,142 +20,22 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-	Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
-	Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
+	ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
+	ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
 			current->registered == REG_ALL ? current->nick.c_str() : "",
 			current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str());
-	Server->Users->QuitUser(current, "Excess flood");
+	ServerInstance->Users->QuitUser(current, "Excess flood");
 
 	if (current->registered != REG_ALL)
 	{
-		ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		if (Server->XLines->AddLine(zl,NULL))
-			Server->XLines->ApplyLines();
+		ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+		if (ServerInstance->XLines->AddLine(zl,NULL))
+			ServerInstance->XLines->ApplyLines();
 		else
 			delete zl;
 	}
 }
 
-void ProcessUserHandler::Call(User* cu)
-{
-	int result = EAGAIN;
-
-	if (cu->GetFd() == FD_MAGIC_NUMBER)
-		return;
-
-	char* ReadBuffer = Server->GetReadBuffer();
-
-	if (cu->io)
-	{
-		int result2 = 0;
-		int MOD_RESULT = 0;
-
-		try
-		{
-			MOD_RESULT = cu->io->OnRawSocketRead(cu->GetFd(), ReadBuffer, Server->Config->NetBufferSize, result2);
-		}
-		catch (CoreException& modexcept)
-		{
-			Server->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-		}
-
-		if (MOD_RESULT < 0)
-		{
-			result = -EAGAIN;
-		}
-		else
-		{
-			result = result2;
-		}
-	}
-	else
-	{
-		result = cu->ReadData(ReadBuffer, Server->Config->NetBufferSize);
-	}
-
-	if ((result) && (result != -EAGAIN))
-	{
-		User *current;
-		int currfd;
-
-		Server->stats->statsRecv += result;
-		/*
-		 * perform a check on the raw buffer as an array (not a string!) to remove
-		 * character 0 which is illegal in the RFC - replace them with spaces.
-		 */
-
-		for (int checker = 0; checker < result; checker++)
-		{
-			if (ReadBuffer[checker] == 0)
-				ReadBuffer[checker] = ' ';
-		}
-
-		if (result > 0)
-			ReadBuffer[result] = '\0';
-
-		current = cu;
-		currfd = current->GetFd();
-
-		// add the data to the users buffer
-		if (result > 0)
-		{
-			if (!current->AddBuffer(ReadBuffer))
-			{
-				// AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
-				if (current->registered == REG_ALL)
-				{
-					if (current->MyClass)
-					{
-						// Make sure they arn't flooding long lines.
-						if (Server->Time() > current->reset_due)
-						{
-							current->reset_due = Server->Time() + current->MyClass->GetThreshold();
-							current->lines_in = 0;
-						}
-
-						current->lines_in++;
-
-						if (current->MyClass->GetFlood() && current->lines_in > current->MyClass->GetFlood())
-							Server->FloodQuitUser(current);
-						else
-						{
-							current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick.c_str(), MAXBUF-2);
-							current->recvq.clear();
-						}
-					}
-				}
-				else
-					Server->FloodQuitUser(current);
-
-				return;
-			}
-
-			/* If user is over penalty, dont process here, just build up */
-			if (!current->OverPenalty)
-				Server->Parser->DoLines(current);
-
-			return;
-		}
-
-		if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
-		{
-			Server->Users->QuitUser(cu, errno ? strerror(errno) : "EOF from client");
-			return;
-		}
-	}
-
-	// result EAGAIN means nothing read
-	else if ((result == EAGAIN) || (result == -EAGAIN))
-	{
-		/* do nothing */
-	}
-	else if (result == 0)
-	{
-		Server->Users->QuitUser(cu, "Connection closed");
-		return;
-	}
-}
-
 /**
  * This function is called once a second from the mainloop.
  * It is intended to do background checking on all the user structs, e.g.
@@ -166,9 +46,11 @@ void InspIRCd::DoBackgroundUserStuff()
 	/*
 	 * loop over all local users..
 	 */
-	for (std::vector<User*>::iterator count2 = this->Users->local_users.begin(); count2 != this->Users->local_users.end(); count2++)
+	std::vector<User*>::reverse_iterator count2 = this->Users->local_users.rbegin();
+	while (count2 != this->Users->local_users.rend())
 	{
 		User *curr = *count2;
+		count2++;
 
 		if (curr->quitting)
 			continue;
@@ -176,14 +58,12 @@ void InspIRCd::DoBackgroundUserStuff()
 		if (curr->Penalty)
 		{
 			curr->Penalty--;
-			if (curr->Penalty < 10)
-				Parser->DoLines(curr, true);
+			curr->OnDataReady();
 		}
 
-		if (curr->OverPenalty)
+		if (curr->getSendQSize() == 0)
 		{
-			if (curr->sendq.empty())
-				curr->OverPenalty = false;
+			FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(curr));
 		}
 
 		switch (curr->registered)