X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=44ed3559b5b1e65d094ca51a9c9cef860622b528;hb=b0546ed55e040330dd28a856d6fab2e55863dd1f;hp=286135f22e223878a180d9c4f1396d531fc67c44;hpb=d7a0cd3db1e8b64a6f706f1831e645ad69aa7927;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 286135f22..44ed3559b 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -11,20 +11,19 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDuserprocess */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "command_parse.h"
 
 void FloodQuitUserHandler::Call(User* current)
 {
-	Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
+	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",
-			current->registered == REG_ALL ? current->nick : "",
-			current->registered == REG_ALL ? "!" : "", current->ident, current->host);
+			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");
 
 	if (current->registered != REG_ALL)
@@ -46,14 +45,14 @@ void ProcessUserHandler::Call(User* cu)
 
 	char* ReadBuffer = Server->GetReadBuffer();
 
-	if (cu->io)
+	if (cu->GetIOHook())
 	{
 		int result2 = 0;
 		int MOD_RESULT = 0;
 
 		try
 		{
-			MOD_RESULT = cu->io->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
+			MOD_RESULT = cu->GetIOHook()->OnRawSocketRead(cu->GetFd(), ReadBuffer, Server->Config->NetBufferSize, result2);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -71,7 +70,7 @@ void ProcessUserHandler::Call(User* cu)
 	}
 	else
 	{
-		result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
+		result = cu->ReadData(ReadBuffer, Server->Config->NetBufferSize);
 	}
 
 	if ((result) && (result != -EAGAIN))
@@ -103,36 +102,12 @@ void ProcessUserHandler::Call(User* cu)
 			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, MAXBUF-2);
-							current->recvq.clear();
-						}
-					}
-				}
-				else
-					Server->FloodQuitUser(current);
-
+				Server->FloodQuitUser(current);
 				return;
 			}
 
 			/* If user is over penalty, dont process here, just build up */
-			if (!current->OverPenalty)
+			if (current->Penalty < 10)
 				Server->Parser->DoLines(current);
 
 			return;
@@ -171,6 +146,9 @@ void InspIRCd::DoBackgroundUserStuff()
 	{
 		User *curr = *count2;
 
+		if (curr->quitting)
+			continue;
+
 		if (curr->Penalty)
 		{
 			curr->Penalty--;
@@ -178,13 +156,39 @@ void InspIRCd::DoBackgroundUserStuff()
 				Parser->DoLines(curr, true);
 		}
 
-		if (curr->OverPenalty)
+		switch (curr->registered)
 		{
-			if (curr->sendq.empty())
-				curr->OverPenalty = false;
+			case REG_ALL:
+				if (TIME > curr->nping)
+				{
+					// This user didn't answer the last ping, remove them
+					if (!curr->lastping)
+					{
+						time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
+						char message[MAXBUF];
+						snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
+						curr->lastping = 1;
+						curr->nping = TIME + curr->MyClass->GetPingTime();
+						this->Users->QuitUser(curr, message);
+						continue;
+					}
+
+					curr->Write("PING :%s",this->Config->ServerName);
+					curr->lastping = 0;
+					curr->nping = TIME  +curr->MyClass->GetPingTime();
+				}
+				break;
+			case REG_NICKUSER:
+				if (AllModulesReportReady(curr) && curr->dns_done)
+				{
+					/* User has sent NICK/USER, modules are okay, DNS finished. */
+					curr->FullConnect();
+					continue;
+				}
+				break;
 		}
 
-		if ((curr->registered != REG_ALL) && (TIME > curr->timeout))
+		if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST
@@ -193,42 +197,6 @@ void InspIRCd::DoBackgroundUserStuff()
 			this->Users->QuitUser(curr, "Registration timeout");
 			continue;
 		}
-
-		/*
-		 * `ready` means that the user has provided NICK/USER(/PASS), and all modules agree
-		 * that the user is okay to proceed. The one thing we are then waiting for now is DNS...
-		 */
-		bool ready = ((curr->registered == REG_NICKUSER) && AllModulesReportReady(curr));
-
-		if (ready)
-		{
-			if (curr->dns_done)
-			{
-				/* DNS passed, connect the user */
-				curr->FullConnect();
-				continue;
-			}
-		}
-
-		// It's time to PING this user. Send them a ping.
-		if ((TIME > curr->nping) && (curr->registered == REG_ALL))
-		{
-			// This user didn't answer the last ping, remove them
-			if (!curr->lastping)
-			{
-				time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
-				char message[MAXBUF];
-				snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
-				curr->lastping = 1;
-				curr->nping = TIME + curr->MyClass->GetPingTime();
-				this->Users->QuitUser(curr, message);
-				continue;
-			}
-
-			curr->Write("PING :%s",this->Config->ServerName);
-			curr->lastping = 0;
-			curr->nping = TIME  +curr->MyClass->GetPingTime();
-		}
 	}
 }