X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=3dc3143de02abaa8b441813e695c423147499700;hb=12ffb909a66401f540234aecbeeee6f94ef2fc6d;hp=75f0da0ee48e166e8aab79c03fd844753fdb53ff;hpb=6856c87ae51d655870607c6e74e0eed6d338283a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 75f0da0ee..3dc3143de 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,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDuserprocess */
+
 #include "inspircd.h"
 #include "wildcard.h"
 #include "xline.h"
@@ -19,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.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(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;
 	}
 }
 
@@ -40,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,sizeof(ReadBuffer),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)
@@ -99,21 +105,24 @@ void ProcessUserHandler::Call(User* cu)
 				// AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
 				if (current->registered == REG_ALL)
 				{
-					// Make sure they arn't flooding long lines.
-					if (Server->Time() > current->reset_due)
+					if (current->MyClass)
 					{
-						current->reset_due = Server->Time() + current->threshold;
-						current->lines_in = 0;
-					}
-
-					current->lines_in++;
-
-					if (current->flood && current->lines_in > current->flood)
-						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();
+						// 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.c_str(), MAXBUF-2);
+							current->recvq.clear();
+						}
 					}
 				}
 				else
@@ -122,14 +131,16 @@ void ProcessUserHandler::Call(User* cu)
 				return;
 			}
 
-			Server->Parser->DoLines(current);
+			/* If user is over penalty, dont process here, just build up */
+			if (!current->OverPenalty)
+				Server->Parser->DoLines(current);
 
 			return;
 		}
 
 		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;
 		}
 	}
@@ -141,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;
 	}
 }
@@ -156,18 +167,23 @@ 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->OverPenalty)
-			Parser->DoLines(curr, true);
+		if (curr->quitting)
+			continue;
 
-		/* Knock a second off */
 		if (curr->Penalty)
 		{
 			curr->Penalty--;
-			if (!curr->Penalty)
+			if (curr->Penalty < 10)
+				Parser->DoLines(curr, true);
+		}
+
+		if (curr->OverPenalty)
+		{
+			if (curr->sendq.empty())
 				curr->OverPenalty = false;
 		}
 
@@ -177,36 +193,19 @@ 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;
 		}
 
 		/*
 		 * `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 is DNS, which we do here...
+		 * 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 isn't done yet?
-				 * Cool. Check for timeout.
-				 */
-				if (TIME > curr->signon)
-				{
-					/* FZZZZZZZZT, timeout! */
-					curr->WriteServ("NOTICE Auth :*** Could not resolve your hostname: Request timed out; using your IP address (%s) instead.", curr->GetIPString());
-					curr->dns_done = true;
-					this->stats->statsDnsBad++;
-					curr->FullConnect();
-					continue;
-				}
-			}
-			else
+			if (curr->dns_done)
 			{
 				/* DNS passed, connect the user */
 				curr->FullConnect();
@@ -220,18 +219,18 @@ 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->pingmax);
+				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->pingmax;
-				User::QuitUser(this, curr, message);
+				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->pingmax;
+			curr->nping = TIME  +curr->MyClass->GetPingTime();
 		}
 	}
 }