X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=956ed34940f888b5a47d441c8eb914550648ec04;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=d931b567c2b7e38efc97074d424051f7ac387225;hpb=8ed28d1f98d4d4c653201f0c4273e74dd8a122e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index d931b567c..956ed3494 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -1,97 +1,80 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * Written by Craig Edwards, Craig McLure, and others.
- * 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/>.
  */
 
-using namespace std;
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.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 "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cull_list.h"
-
-CullItem::CullItem(userrec* u, std::string r)
-{
-        this->user = u;
-        this->reason = r;
-}
-
-userrec* CullItem::GetUser()
-{
-        return this->user;
-}
+#include <typeinfo>
 
-std::string CullItem::GetReason()
-{
-        return this->reason;
-}
-
-CullList::CullList()
+void CullList::Apply()
 {
+	std::vector<LocalUser *> working;
+	while (!SQlist.empty())
+	{
+		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);
+		}
+	}
 	list.clear();
-        memset(exempt,0,65535);
+	for(unsigned int i=0; i < queue.size(); i++)
+	{
+		classbase* c = queue[i];
+		delete c;
+	}
+	if (list.size())
+	{
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Objects added to cull list in a destructor");
+		Apply();
+	}
 }
 
-void CullList::AddItem(userrec* user, std::string reason)
+void ActionList::Run()
 {
-        if ((user->fd > -1) && (exempt[user->fd] == 0))
-        {
-                CullItem item(user,reason);
-                list.push_back(item);
-                exempt[user->fd] = 1;
-        }
-}
-
-int CullList::Apply()
-{
-        int n = 0;
-        while (list.size())
-        {
-               std::vector<CullItem>::iterator a = list.begin();
-               userrec* u = a->GetUser();
-               std::string reason = a->GetReason();
-               kill_link(u,reason.c_str());
-               list.erase(list.begin());
-               n++;
-        }
-        return n;
+	for(unsigned int i=0; i < list.size(); i++)
+	{
+		list[i]->Call();
+	}
+	list.clear();
 }