X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=79c077ead4b4e077c3b0d53c21f4be1956424618;hb=ca1b136b306784191235a6579da59f7e862003d1;hp=a911cbc7844a5c420c0562a2c7b4b18f2a9df3c9;hpb=02497f5a89123c679260be44f4d2068b0a7f34e4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index a911cbc78..79c077ead 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,169 +2,24 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#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>
-#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)
-{
-	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 = clientlist.begin(); u != clientlist.end(); u++)
-	{
-		/*
-		 * BUGFIX
-		 *
-		 * Because there is an undetermined period of time between a user existing,
-		 * and this function being called, we have to check for the following condition:
-		 *
-		 * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called,
-		 * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO
-		 * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we
-		 * cross reference each pointer to the user's signon time, and if the signon times
-		 * do not match, we return false here to indicate this user is NOT valid as it
-		 * seems to differ from the pointer snapshot we got a few seconds earlier. Should
-		 * prevent a few random crashes during netsplits.
-		 */
-		if (user == u->second)
-			return (u->second->signon == esignon);
-	}
-	return false;
-}
-
-CullItem::CullItem(userrec* u, std::string &r)
-{
-        this->user = u;
-        this->reason = strdup(r.c_str());
-}
-
-CullItem::CullItem(userrec* u, const char* r)
-{
-	this->user = u;
-	this->reason = strdup(r);
-}
-
-CullItem::~CullItem()
-{
-	if (reason)
-		free(reason);
-	reason = NULL;
-}
-
-userrec* CullItem::GetUser()
-{
-        return this->user;
-}
-
-const char* CullItem::GetReason()
-{
-        return this->reason;
-}
-
-CullList::CullList()
+void CullList::Apply()
 {
+	for(std::vector<classbase*>::iterator i = list.begin(); i != list.end(); i++)
+		delete *i;
 	list.clear();
-        exempt.clear();
-}
-
-void CullList::AddItem(userrec* user, std::string &reason)
-{
-	if (exempt.find(user) == exempt.end())
-	{
-	        CullItem item(user,reason);
-	        list.push_back(item);
-	        exempt[user] = user->signon;
-	}
 }
 
-void CullList::AddItem(userrec* user, const char* reason)
-{
-	if (exempt.find(user) == exempt.end())
-	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
-	}
-}
-
-int CullList::Apply()
-{
-        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());
-			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;
-}