X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=c2de4dc2b1d895cab85720d657945f9d50aa7223;hb=3c8b0ea13b84b52b95c7e0b17f1ddf208045d665;hp=066800409ca7a300e47c865921df4afed6837aec;hpb=ce9b1289c672d3d6b9cadec865754710bc1b80f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 066800409..c2de4dc2b 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,7 +21,7 @@
 
 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);
@@ -29,8 +29,11 @@ void FloodQuitUserHandler::Call(User* current)
 
 	if (current->registered != REG_ALL)
 	{
-		Server->XLines->AddZLine(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		Server->XLines->ApplyLines();
+		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 +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)
@@ -164,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;
 
@@ -187,7 +190,6 @@ 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");
 			continue;
 		}
@@ -214,10 +216,9 @@ 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);