X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=286135f22e223878a180d9c4f1396d531fc67c44;hb=82bf46fa061a4f18071e73756e4e0d618eb57320;hp=eb5ea050c5d7c73471609b23a65e130c32567e30;hpb=393c1afdd7bfede2b7f489d7ceb000c909c0fccf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index eb5ea050c..286135f22 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
@@ -21,15 +21,19 @@
 
 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, current->host);
 	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");
+	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(APPLY_ZLINES);
+		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;
 	}
 }
 
@@ -42,18 +46,18 @@ void ProcessUserHandler::Call(User* cu)
 
 	char* ReadBuffer = Server->GetReadBuffer();
 
-	if (Server->Config->GetIOHook(cu->GetPort()))
+	if (cu->io)
 	{
 		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->io->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)
@@ -136,7 +140,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;
 		}
 	}
@@ -148,7 +152,7 @@ void ProcessUserHandler::Call(User* cu)
 	}
 	else if (result == 0)
 	{
-		User::QuitUser(Server, cu, "Connection closed");
+		Server->Users->QuitUser(cu, "Connection closed");
 		return;
 	}
 }
@@ -163,7 +167,7 @@ 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;
 
@@ -186,8 +190,7 @@ void InspIRCd::DoBackgroundUserStuff()
 			 * 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;
 		}
 
@@ -213,15 +216,15 @@ void InspIRCd::DoBackgroundUserStuff()
 			// This user didn't answer the last ping, remove them
 			if (!curr->lastping)
 			{
-				time_t time = this->Time(false) - (curr->nping - curr->MyClass->GetPingTime());
+				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->muted = true;
 				curr->lastping = 1;
 				curr->nping = TIME + curr->MyClass->GetPingTime();
-				User::QuitUser(this, curr, message);
+				this->Users->QuitUser(curr, message);
 				continue;
 			}
+
 			curr->Write("PING :%s",this->Config->ServerName);
 			curr->lastping = 0;
 			curr->nping = TIME  +curr->MyClass->GetPingTime();