X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=d1b7ddc9fc989cb7361ee0a8600d5e8dc5762620;hb=a3cdff95f4120526d0944a6bb6b3a96136466aa8;hp=b19054b0ddd562c20ebfe1dc1942de8c1c021bb3;hpb=74c8913f72e6d48c88a01155ef5fe5ca20cc2bb1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index b19054b0d..d1b7ddc9f 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,88 +12,60 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "cull_list.h"
+#include <typeinfo>
 
-/*
- * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
- */
-bool CullList::IsValid(userrec* user)
+void CullList::Apply()
 {
-	time_t esignon = 0;
-	std::map<userrec*,time_t>::iterator es = exempt.find(user);
-	if (es != exempt.end())
-		esignon = es->second;
-
-	for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
+	std::vector<LocalUser *> working;
+	while (!SQlist.empty())
 	{
-		if (user == u->second)
-			return (u->second->signon == esignon);
+		working.swap(SQlist);
+		for(std::vector<LocalUser *>::iterator a = working.begin(); a != working.end(); a++)
+		{
+			LocalUser *u = *a;
+			ServerInstance->SNO->WriteGlobalSno('a', "User %s SendQ exceeds connect class maximum of %lu",
+				u->nick.c_str(), u->MyClass->GetSendqHardMax());
+			ServerInstance->Users->QuitUser(u, "SendQ exceeded");
+		}
+		working.clear();
+	}
+	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);
+		}
 	}
-	return false;
-}
-
-CullItem::CullItem(userrec* u, std::string &r)
-{
-	this->user = u;
-	this->reason = r;
-}
-
-CullItem::CullItem(userrec* u, const char* r)
-{
-	this->user = u;
-	this->reason = r;
-}
-
-CullItem::~CullItem()
-{
-}
-
-userrec* CullItem::GetUser()
-{
-	return this->user;
-}
-
-std::string& CullItem::GetReason()
-{
-	return this->reason;
-}
-
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
-{
 	list.clear();
-	exempt.clear();
-}
-
-void CullList::AddItem(userrec* user, std::string &reason)
-{
-	if (exempt.find(user) == exempt.end())
+	for(unsigned int i=0; i < queue.size(); i++)
 	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
+		classbase* c = queue[i];
+		delete c;
 	}
-}
-
-void CullList::AddItem(userrec* user, const char* reason)
-{
-	if (exempt.find(user) == exempt.end())
+	if (list.size())
 	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
+		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();
-
-		userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
-		list.erase(list.begin());
+		list[i]->Call();
 	}
-	return n;
+	list.clear();
 }