X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=80d7ddb97bde802fe95be7414dc528340397253a;hb=f3d3ccaac1038775bf2cca62066e32cc2d52edc4;hp=c45dff46c3d7b27d1fde53ec31c80991c6ad5970;hpb=3400b094ef19fc8fc1eae6d12fb33667cd5629b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index c45dff46c..80d7ddb97 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -1,30 +1,90 @@
-/*       +------------------------------------+
- *       | 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) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2011 jackmcbarn <jackmcbarn@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * 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"
-#include "cull_list.h"
+#ifdef INSPIRCD_ENABLE_RTTI
+#include <typeinfo>
+#endif
 
 void CullList::Apply()
 {
-	std::vector<classbase*> todel(list.begin(), list.end());
+	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)
+		{
+#ifdef INSPIRCD_ENABLE_RTTI
+			ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting %s @%p", typeid(*c).name(),
+				(void*)c);
+#else
+			ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Deleting @%p", (void*)c);
+#endif
+			c->cull();
+			queue.push_back(c);
+		}
+		else
+		{
+			ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "WARNING: Object @%p culled twice!",
+				(void*)c);
+		}
+	}
 	list.clear();
-	for(std::vector<classbase*>::iterator i = todel.begin(); i != todel.end(); i++)
+	for(unsigned int i=0; i < queue.size(); i++)
 	{
-		classbase* c = *i;
-		c->cull();
+		classbase* c = queue[i];
 		delete c;
 	}
+	if (!list.empty())
+	{
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "WARNING: Objects added to cull list in a destructor");
+		Apply();
+	}
 }
 
+void ActionList::Run()
+{
+	for(unsigned int i=0; i < list.size(); i++)
+	{
+		list[i]->Call();
+	}
+	list.clear();
+}