m_dnsbl updates

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 2b6e4578c619578311aea1363f9a73cd95e9d911..4f70ca466034ca3a0facec6cc19b1249f8718a87 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,112 +11,48 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
-#include "cull_list.h"
-
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
-{
-       list.clear();
-}
+#include <typeinfo>
 
-void CullList::AddItem(User* user)
+void CullList::Apply()
 {
-       list.push_back(user);
-}
-
-void CullList::MakeSilent(User* user)
-{
-       user->quietquit = true;
-       return;
-}
-
-int CullList::Apply()
-{
-       int n = list.size();
-       int i = 0;
-
-       while (list.size() && i++ != 100)
+       std::set<classbase*> gone;
+       std::vector<classbase*> queue;
+       queue.reserve(list.size() + 32);
+       for(unsigned int i=0; i < list.size(); i++)
        {
-               std::vector<User *>::iterator a = list.begin();
-
-               User *u = (*a);
-               // user has been moved onto their UID; that's why this isn't find(u->nick)
-               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid);
-
-               if (u->registered != REG_ALL)
-                       if (ServerInstance->Users->unregistered_count)
-                               ServerInstance->Users->unregistered_count--;
-
-               if (IS_LOCAL(u))
-               {
-                       if (!u->sendq.empty())
-                               u->FlushWriteBuf();
-
-                       if (u->GetIOHook())
-                       {
-                               try
-                               {
-                                       u->GetIOHook()->OnRawSocketClose(u->GetFd());
-                               }
-                               catch (CoreException& modexcept)
-                               {
-                                       ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                               }
-                       }
-
-                       ServerInstance->SE->DelFd(u);
-                       u->CloseSocket();
-               }
-
-               /*
-                * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-                * if they were an oper with +sn +qQ.
-                */
-               if (u->registered == REG_ALL)
+               classbase* c = list[i];
+               if (gone.insert(c).second)
                {
-                       if (IS_LOCAL(u))
-                       {
-                               if (!u->quietquit)
-                               {
-                                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
-                               }
-                       }
-                       else
-                       {
-                               if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
-                               {
-                                       ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", u->server, u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
-                               }
-                       }
-                       u->AddToWhoWas();
-               }
-
-               if (iter != ServerInstance->Users->clientlist->end())
-               {
-                       ServerInstance->Users->clientlist->erase(iter);
+                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "Deleting %s @%p", typeid(*c).name(),
+                               (void*)c);
+                       c->cull();
+                       queue.push_back(c);
                }
                else
                {
-                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
-               }
-
-               if (IS_LOCAL(u))
-               {
-                       std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
-                       if (x != ServerInstance->Users->local_users.end())
-                               ServerInstance->Users->local_users.erase(x);
-                       else
-                       {
-                               ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
-                       }
+                       ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Object @%p culled twice!",
+                               (void*)c);
                }
-
-               delete u;
-               list.erase(list.begin());
        }
-
-       return n;
+       list.clear();
+       for(unsigned int i=0; i < queue.size(); i++)
+       {
+               classbase* c = queue[i];
+               delete c;
+       }
+       if (list.size())
+       {
+               ServerInstance->Logs->Log("CULLLIST",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();
+}