X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=69c31f8400898caacd9d2b1f01090aa1ac4f9f82;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=b150f2828ebb4951b809ee0189a84bb572831ba7;hpb=e2af2347fc035d702e45f12e772223a8d578410d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b150f2828..69c31f840 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig McLure <craig@chatspike.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* $Core */
 
 #include "inspircd.h"
@@ -20,17 +30,17 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-	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",
+	ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
+	ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
 			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");
+	ServerInstance->Users->QuitUser(current, "Excess flood");
 
 	if (current->registered != REG_ALL)
 	{
-		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();
+		ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+		if (ServerInstance->XLines->AddLine(zl,NULL))
+			ServerInstance->XLines->ApplyLines();
 		else
 			delete zl;
 	}
@@ -46,30 +56,29 @@ void InspIRCd::DoBackgroundUserStuff()
 	/*
 	 * loop over all local users..
 	 */
-	std::vector<User*>::reverse_iterator count2 = this->Users->local_users.rbegin();
+	LocalUserList::reverse_iterator count2 = this->Users->local_users.rbegin();
 	while (count2 != this->Users->local_users.rend())
 	{
-		User *curr = *count2;
+		LocalUser *curr = *count2;
 		count2++;
 
 		if (curr->quitting)
 			continue;
 
-		if (curr->Penalty)
+		if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
 		{
-			curr->Penalty--;
-			curr->OnDataReady();
-		}
-
-		if (curr->getSendQSize() == 0)
-		{
-			FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(curr));
+			unsigned int rate = curr->MyClass->GetCommandRate();
+			if (curr->CommandFloodPenalty > rate)
+				curr->CommandFloodPenalty -= rate;
+			else
+				curr->CommandFloodPenalty = 0;
+			curr->eh.OnDataReady();
 		}
 
 		switch (curr->registered)
 		{
 			case REG_ALL:
-				if (TIME > curr->nping)
+				if (Time() > curr->nping)
 				{
 					// This user didn't answer the last ping, remove them
 					if (!curr->lastping)
@@ -78,14 +87,14 @@ void InspIRCd::DoBackgroundUserStuff()
 						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();
+						curr->nping = Time() + curr->MyClass->GetPingTime();
 						this->Users->QuitUser(curr, message);
 						continue;
 					}
 
-					curr->Write("PING :%s",this->Config->ServerName);
+					curr->Write("PING :%s",this->Config->ServerName.c_str());
 					curr->lastping = 0;
-					curr->nping = TIME  +curr->MyClass->GetPingTime();
+					curr->nping = Time()  +curr->MyClass->GetPingTime();
 				}
 				break;
 			case REG_NICKUSER:
@@ -95,10 +104,15 @@ void InspIRCd::DoBackgroundUserStuff()
 					curr->FullConnect();
 					continue;
 				}
+
+				// If the user has been quit in OnCheckReady then we shouldn't
+				// quit them again for having a registration timeout.
+				if (curr->quitting)
+					continue;
 				break;
 		}
 
-		if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout())))
+		if (curr->registered != REG_ALL && curr->MyClass && (Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST