X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=90ea385688339d21861166d7de840fc0494edcdb;hp=7c4afa16cc22d66a8c762b993f2b100517d74cbc;hpb=e9001885478b51dad173ddc2f93170db2591a8be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 7c4afa16c..07649ed81 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,127 +2,113 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "inspircd.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
 #include "cull_list.h"
 
-extern InspIRCd* ServerInstance;
-extern user_hash clientlist;
-
-bool CullList::IsValid(userrec* user)
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-	{
-		if (user == u->second)
-			return true;
-	}
-	return false;
 }
 
-CullItem::CullItem(userrec* u, std::string r)
+void CullList::AddItem(User* user)
 {
-        this->user = u;
-        this->reason = r;
+	list.push_back(user);
 }
 
-userrec* CullItem::GetUser()
+void CullList::MakeSilent(User* user)
 {
-        return this->user;
+	user->quietquit = true;
+	return;
 }
 
-std::string CullItem::GetReason()
+void CullList::Apply()
 {
-        return this->reason;
-}
+	for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
+	{
+		User *u = *a;
+		// user has been moved onto their UID; that's why this isn't find(u->nick)
+		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid);
 
-CullList::CullList()
-{
-	list.clear();
-        exempt.clear();
-}
+		if (u->registered != REG_ALL)
+			if (ServerInstance->Users->unregistered_count)
+				ServerInstance->Users->unregistered_count--;
 
-void CullList::AddItem(userrec* user, std::string reason)
-{
-	if (exempt.find(user) == exempt.end())
-	{
-	        CullItem item(user,reason);
-	        list.push_back(item);
-	        exempt[user] = 1;
-	}
-}
+		if (IS_LOCAL(u))
+		{
+			if (!u->sendq.empty())
+				u->FlushWriteBuf();
 
-int CullList::Apply()
-{
-        int n = 0;
-        while (list.size())
-        {
-		std::vector<CullItem>::iterator a = list.begin();
-		userrec* u = a->GetUser();
-		/* Because ServerInstance->DoOneIteration can
-		 * take the user away from us in the middle of
-		 * our operation, we should check to see if this
-		 * pointer is still valid by iterating the hash.
-		 * It's expensive, yes, but the DoOneIteration
-		 * call stops it being horrendously bad.
+			if (u->GetIOHook())
+			{
+				try
+				{
+					u->GetIOHook()->OnRawSocketClose(u->GetFd());
+				}
+				catch (CoreException& modexcept)
+				{
+					ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				}
+			}
+
+			ServerInstance->SE->DelFd(u);
+			u->CloseSocket();
+		}
+
+		/*
+		 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
+		 * if they were an oper with +sn +qQ.
 		 */
-		if (IsValid(u))
+		if (u->registered == REG_ALL)
+		{
+			if (IS_LOCAL(u))
+			{
+				if (!u->quietquit)
+				{
+					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
+				}
+			}
+			else
+			{
+				if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
+				{
+					ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", u->server, u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
+				}
+			}
+			u->AddToWhoWas();
+		}
+
+		if (iter != ServerInstance->Users->clientlist->end())
 		{
-			kill_link(u,a->GetReason().c_str());
-			list.erase(list.begin());
-			/* So that huge numbers of quits dont block,
-			 * we yield back to our mainloop every 15
-			 * iterations.
-			 * The DoOneIteration call basically acts
-			 * like a software threading mechanism.
-			 */
-			if (((n++) % 15) == 0)
+			ServerInstance->Users->clientlist->erase(iter);
+		}
+		else
+		{
+			ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+		}
+
+		if (IS_LOCAL(u))
+		{
+			std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+			if (x != ServerInstance->Users->local_users.end())
+				ServerInstance->Users->local_users.erase(x);
+			else
 			{
-				ServerInstance->DoOneIteration(false);
+				ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
 			}
 		}
-        }
-        return n;
+
+		delete u;
+	}
+	list.clear();
 }
+