X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=4f70ca466034ca3a0facec6cc19b1249f8718a87;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=c1a9de1a08baf8b9bb8180c70df4815b272e4a1b;hpb=b790abb1545fc22d0f6799f48d4b7df22711db8a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index c1a9de1a0..4f70ca466 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,154 +12,47 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "cull_list.h"
+#include <typeinfo>
 
-CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
-{
-	this->user = u;
-	this->reason = r;
-	/* Seperate oper reason not set, use the user reason */
-	if (*o_reason)
-		this->oper_reason = o_reason;
-	else
-		this->oper_reason = r;
-}
-
-CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
-{
-	this->user = u;
-	this->reason = r;
-	/* Seperate oper reason not set, use the user reason */
-	if (*o_reason)
-		this->oper_reason = o_reason;
-	else
-		this->oper_reason = r;
-}
-
-CullItem::~CullItem()
-{
-}
-
-userrec* CullItem::GetUser()
-{
-	return this->user;
-}
-
-std::string& CullItem::GetReason()
-{
-	return this->reason;
-}
-
-std::string& CullItem::GetOperReason()
-{
-	return this->oper_reason;
-}
-
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
+void CullList::Apply()
 {
+	std::set<classbase*> gone;
+	std::vector<classbase*> queue;
+	queue.reserve(list.size() + 32);
+	for(unsigned int i=0; i < list.size(); i++)
+	{
+		classbase* c = list[i];
+		if (gone.insert(c).second)
+		{
+			ServerInstance->Logs->Log("CULLLIST", DEBUG, "Deleting %s @%p", typeid(*c).name(),
+				(void*)c);
+			c->cull();
+			queue.push_back(c);
+		}
+		else
+		{
+			ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Object @%p culled twice!",
+				(void*)c);
+		}
+	}
 	list.clear();
-	exempt.clear();
-}
-
-void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason)
-{
-	AddItem(user, reason.c_str(), o_reason);
-}
-
-
-void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
-{
-	if (exempt.find(user) == exempt.end())
+	for(unsigned int i=0; i < queue.size(); i++)
 	{
-		CullItem item(user, reason, o_reason);
-		list.push_back(item);
-		exempt[user] = user;
+		classbase* c = queue[i];
+		delete c;
+	}
+	if (list.size())
+	{
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor");
+		Apply();
 	}
 }
 
-int CullList::Apply()
+void ActionList::Run()
 {
-	int n = list.size();
-	while (list.size())
+	for(unsigned int i=0; i < list.size(); i++)
 	{
-		std::vector<CullItem>::iterator a = list.begin();
-
-		user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
-		std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
-		std::string reason = a->GetReason();
-		std::string oper_reason = a->GetOperReason();
-
-		if (reason.length() > MAXQUIT - 1)
-			reason.resize(MAXQUIT - 1);
-		if (oper_reason.length() > MAXQUIT - 1)
-			oper_reason.resize(MAXQUIT - 1);
-
-		if (a->GetUser()->registered != REG_ALL)
-			if (ServerInstance->unregistered_count)
-				ServerInstance->unregistered_count--;
-
-		if (IS_LOCAL(a->GetUser()))
-		{
-			a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
-			if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
-				a->GetUser()->FlushWriteBuf();
-		}
-
-		if (a->GetUser()->registered == REG_ALL)
-		{
-			a->GetUser()->PurgeEmptyChannels();
-			a->GetUser()->WriteCommonQuit(reason, oper_reason);
-			FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
-		}
-
-		FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
-
-		if (IS_LOCAL(a->GetUser()))
-		{
-			if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
-			{
-				try
-				{
-					ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
-				}
-				catch (CoreException& modexcept)
-				{
-					ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-				}
-			}
-
-			ServerInstance->SE->DelFd(a->GetUser());
-			a->GetUser()->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 (a->GetUser()->registered == REG_ALL)
-		{
-			if (IS_LOCAL(a->GetUser()))
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
-			else
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
-			a->GetUser()->AddToWhoWas();
-		}
-
-		if (iter != ServerInstance->clientlist->end())
-		{
-			if (IS_LOCAL(a->GetUser()))
-			{
-				std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
-				if (x != ServerInstance->local_users.end())
-					ServerInstance->local_users.erase(x);
-			}
-			ServerInstance->clientlist->erase(iter);
-			DELETE(a->GetUser());
-		}
-
-		list.erase(list.begin());
-		exempt.erase(exemptiter);
+		list[i]->Call();
 	}
-	return n;
+	list.clear();
 }