X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=d66e548c9e3e2f894975267e153704097bc177a9;hb=7c340cba11b16d3c4a95c274c22f1617ac4711f2;hp=33057c52dbb96848b6e750dfc0e77b0ebc8701f1;hpb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 33057c52d..d66e548c9 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,23 +11,28 @@
  * ---------------------------------------------------
  */
 
+/* $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(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 +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,sizeof(ReadBuffer),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)
@@ -65,14 +70,13 @@ void ProcessUserHandler::Call(User* cu)
 	}
 	else
 	{
-		result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
+		result = cu->ReadData(ReadBuffer, Server->Config->NetBufferSize);
 	}
 
 	if ((result) && (result != -EAGAIN))
 	{
 		User *current;
 		int currfd;
-		int floodlines = 0;
 
 		Server->stats->statsRecv += result;
 		/*
@@ -98,68 +102,20 @@ void ProcessUserHandler::Call(User* cu)
 			if (!current->AddBuffer(ReadBuffer))
 			{
 				// 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)
-					{
-						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();
-					}
-				}
-				else
-					Server->FloodQuitUser(current);
-
+				Server->FloodQuitUser(current);
 				return;
 			}
 
-			// while there are complete lines to process...
-			while (current->BufferIsReady())
-			{
-				if (Server->Time() > current->reset_due)
-				{
-					current->reset_due = Server->Time() + current->threshold;
-					current->lines_in = 0;
-				}
-
-				if (++current->lines_in > current->flood && current->flood)
-				{
-					Server->FloodQuitUser(current);
-					return;
-				}
-
-				if ((++floodlines > current->flood) && (current->flood != 0))
-				{
-					Server->FloodQuitUser(current);
-					return;
-				}
-
-				// use GetBuffer to copy single lines into the sanitized string
-				std::string single_line = current->GetBuffer();
-				current->bytes_in += single_line.length();
-				current->cmds_in++;
-				if (single_line.length() > MAXBUF - 2)	/* MAXBUF is 514 to allow for neccessary line terminators */
-					single_line.resize(MAXBUF - 2); /* So to trim to 512 here, we use MAXBUF - 2 */
-
-				Server->Parser->ProcessBuffer(single_line, current);
-			}
+			/* If user is over penalty, dont process here, just build up */
+			if (current->Penalty < 10)
+				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;
 		}
 	}
@@ -171,7 +127,7 @@ void ProcessUserHandler::Call(User* cu)
 	}
 	else if (result == 0)
 	{
-		User::QuitUser(Server, cu, "Connection closed");
+		Server->Users->QuitUser(cu, "Connection closed");
 		return;
 	}
 }
@@ -186,72 +142,60 @@ 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->registered != REG_ALL) && (TIME > curr->timeout))
-		{
-			/*
-			 * registration timeout -- didnt send USER/NICK/HOST
-			 * in the time specified in their connection class.
-			 */
-			curr->muted = true;
-			User::QuitUser(this, curr, "Registration timeout");
+		if (curr->quitting)
 			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...
-		 */
-		bool ready = ((curr->registered == REG_NICKUSER) && AllModulesReportReady(curr));
+		if (curr->Penalty)
+		{
+			curr->Penalty--;
+			if (curr->Penalty < 10)
+				Parser->DoLines(curr, true);
+		}
 
-		if (ready)
+		switch (curr->registered)
 		{
-			if (!curr->dns_done)
-			{
-				/*
-				 * DNS isn't done yet?
-				 * Cool. Check for timeout.
-				 */
-				if (TIME > curr->signon)
+			case REG_ALL:
+				if (TIME > curr->nping)
 				{
-					/* 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++;
+					// 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;
 				}
-			}
-			else
-			{
-				/* DNS passed, connect the user */
-				curr->FullConnect();
-				continue;
-			}
+				break;
 		}
 
-		// It's time to PING this user. Send them a ping.
-		if ((TIME > curr->nping) && (curr->registered == REG_ALL))
+		if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout())))
 		{
-			// This user didn't answer the last ping, remove them
-			if (!curr->lastping)
-			{
-				/* Everybody loves boobies. */
-				time_t time = this->Time(false) - (curr->nping - curr->pingmax);
-				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);
-				continue;
-			}
-			curr->Write("PING :%s",this->Config->ServerName);
-			curr->lastping = 0;
-			curr->nping = TIME+curr->pingmax;
+			/*
+			 * registration timeout -- didnt send USER/NICK/HOST
+			 * in the time specified in their connection class.
+			 */
+			this->Users->QuitUser(curr, "Registration timeout");
+			continue;
 		}
 	}
 }