X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=b179622aa95f7bd9b36e3753edcae674c38c8ead;hb=ad9cb625d950f8157c5ff4d6c89bfd9d672b2c05;hp=d2c481fbbd86995f59ea295b85b97817ea8c084b;hpb=4840d5e77572f42b710501912d59b5dbb6d2c2af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index d2c481fbb..b179622aa 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,26 +11,28 @@
  * ---------------------------------------------------
  */
 
-/* $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->Log(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);
-	User::QuitUser(Server, current, "Excess flood");
+			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)
 	{
-		Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		Server->XLines->apply_lines();
+		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();
+		else
+			delete zl;
 	}
 }
 
@@ -43,18 +45,18 @@ void ProcessUserHandler::Call(User* cu)
 
 	char* ReadBuffer = Server->GetReadBuffer();
 
-	if (Server->Config->GetIOHook(cu->GetPort()))
+	if (cu->GetIOHook())
 	{
 		int result2 = 0;
 		int MOD_RESULT = 0;
 
 		try
 		{
-			MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
+			MOD_RESULT = cu->GetIOHook()->OnRawSocketRead(cu->GetFd(), ReadBuffer, Server->Config->NetBufferSize, result2);
 		}
 		catch (CoreException& modexcept)
 		{
-			Server->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			Server->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 
 		if (MOD_RESULT < 0)
@@ -68,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))
@@ -117,7 +119,7 @@ void ProcessUserHandler::Call(User* cu)
 							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->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();
 						}
 					}
@@ -137,7 +139,7 @@ void ProcessUserHandler::Call(User* cu)
 
 		if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
 		{
-			User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
+			Server->Users->QuitUser(cu, errno ? strerror(errno) : "EOF from client");
 			return;
 		}
 	}
@@ -149,7 +151,7 @@ void ProcessUserHandler::Call(User* cu)
 	}
 	else if (result == 0)
 	{
-		User::QuitUser(Server, cu, "Connection closed");
+		Server->Users->QuitUser(cu, "Connection closed");
 		return;
 	}
 }
@@ -164,10 +166,13 @@ void InspIRCd::DoBackgroundUserStuff()
 	/*
 	 * loop over all local users..
 	 */
-	for (std::vector<User*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
+	for (std::vector<User*>::iterator count2 = this->Users->local_users.begin(); count2 != this->Users->local_users.end(); count2++)
 	{
 		User *curr = *count2;
 
+		if (curr->quitting)
+			continue;
+
 		if (curr->Penalty)
 		{
 			curr->Penalty--;
@@ -181,52 +186,47 @@ 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
 			 * in the time specified in their connection class.
 			 */
-			curr->muted = true;
-			User::QuitUser(this, curr, "Registration timeout");
+			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(false) - (curr->nping - curr->MyClass->GetPingTime());
-				char message[MAXBUF];
-				snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
-				curr->muted = true;
-				curr->lastping = 1;
-				curr->nping = TIME + curr->MyClass->GetPingTime();
-				User::QuitUser(this, curr, message);
-				continue;
-			}
-			curr->Write("PING :%s",this->Config->ServerName);
-			curr->lastping = 0;
-			curr->nping = TIME  +curr->MyClass->GetPingTime();
-		}
 	}
 }