X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=b179622aa95f7bd9b36e3753edcae674c38c8ead;hb=cbb95cffac2fe5533bae8bf5dc2ce62fb0f17c2f;hp=3dc3143de02abaa8b441813e695c423147499700;hpb=12427e75fe175fe7a62f388281dd7ab5100c9dda;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 3dc3143de..b179622aa 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDuserprocess */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "command_parse.h"
@@ -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))
@@ -187,7 +186,39 @@ void InspIRCd::DoBackgroundUserStuff()
 				curr->OverPenalty = false;
 		}
 
-		if ((curr->registered != REG_ALL) && (TIME > curr->timeout))
+		switch (curr->registered)
+		{
+			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->age + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST
@@ -196,42 +227,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();
-		}
 	}
 }