Just to mess with om's head, remove helperfuncs.h from everywhere

[user/henk/code/inspircd.git] / src / cull_list.cpp

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 0951a3224b57cc3dd608b923ea4c8b7d65b46e7a..74e16e64ed4765fe71383aa97a421d55998b1bea 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -18,17 +18,7 @@ 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>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
@@ -39,19 +29,18 @@ using namespace std;
 #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.
+ */
 bool CullList::IsValid(userrec* user)
 {
        time_t esignon = 0;
@@ -59,7 +48,7 @@ bool CullList::IsValid(userrec* user)
        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
@@ -83,44 +72,43 @@ bool CullList::IsValid(userrec* user)
 
 CullItem::CullItem(userrec* u, std::string &r)
 {
-        this->user = u;
-        this->reason = strdup(r.c_str());
+       this->user = u;
+       this->reason = r;
 }
 
 CullItem::CullItem(userrec* u, const char* r)
 {
        this->user = u;
-       this->reason = strdup(r);
+       this->reason = r;
 }
 
 CullItem::~CullItem()
 {
-       free(reason);
 }
 
 userrec* CullItem::GetUser()
 {
-        return this->user;
+       return this->user;
 }
 
-const char* CullItem::GetReason()
+std::string& CullItem::GetReason()
 {
-        return this->reason;
+       return this->reason;
 }
 
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
-        exempt.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;
+               CullItem item(user,reason);
+               list.push_back(item);
+               exempt[user] = user->signon;
        }
 }
 
@@ -136,33 +124,13 @@ void CullList::AddItem(userrec* user, const char* reason)
 
 int CullList::Apply()
 {
-        int n = 0;
-        while (list.size())
-        {
+       int n = list.size();
+       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;
+
+               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
+               list.erase(list.begin());
+       }
+       return n;
 }