* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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;
-
-#include "inspircd_config.h"
#include "inspircd.h"
-#include <string>
-#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;
-
/*
* In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
*/
if (es != exempt.end())
esignon = es->second;
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->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 this->reason;
}
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
{
list.clear();
exempt.clear();
int CullList::Apply()
{
- int n = 0;
+ int n = list.size();
while (list.size())
{
std::vector<CullItem>::iterator a = list.begin();
- kill_link(a->GetUser(), a->GetReason().c_str());
+ userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
list.erase(list.begin());
}
return n;