X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=c050e9887ec5a9ec34df3df932b9d69ed6ca6fea;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=a6dd915a29db503184264ce7cdaf9eedff5050da;hpb=0f5d9bac0f47be5a85379cac349fed6eee440d49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index a6dd915a2..c050e9887 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -1,130 +1,90 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2020 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>
  *
- * 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 <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
+#ifdef INSPIRCD_ENABLE_RTTI
+#include <typeinfo>
 #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)
+void CullList::Apply()
 {
-	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+	std::vector<LocalUser *> working;
+	while (!SQlist.empty())
 	{
-		userrec* u2 = (userrec*)*u;
-		if (user == u2)
-			return true;
+		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);
+		}
 	}
-	return false;
-}
-
-CullItem::CullItem(userrec* u, std::string r)
-{
-        this->user = u;
-        this->reason = r;
-}
-
-userrec* CullItem::GetUser()
-{
-        return this->user;
-}
-
-std::string CullItem::GetReason()
-{
-        return this->reason;
-}
-
-CullList::CullList()
-{
 	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);
-		names.push_back(user->nick);
-	        exempt[user] = 1;
+		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();
 	}
 }
 
-int CullList::Apply()
+void ActionList::Run()
 {
-        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 (IsValid(u))
-		{
-			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->DoOneIteration(false);
-			}
-		}
-        }
-        return n;
+	for(unsigned int i=0; i < list.size(); i++)
+	{
+		list[i]->Call();
+	}
+	list.clear();
 }