Detect, complain, and don't crash when objects are inserted into cull list twice

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 5c7eb7b4258855ebeef7f3c18e4feffbf65d9597..5715c314766bef230682b141452caa5d719bbac4 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,136 +11,27 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
-
 #include "inspircd.h"
-#include "cull_list.h"
+#include <typeinfo>
 
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
+void CullList::Apply()
 {
-       list.clear();
-}
-
-void CullList::AddItem(User* user)
-{
-       if (user->quitting)
+       std::set<classbase*> gone;
+       for(unsigned int i=0; i < list.size(); i++)
        {
-               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
-               return;
-       }
-
-       user->quitting = true;
-       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::vector<User *>::iterator a = list.begin();
-
-               User *u = (*a);
-               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
-               const std::string& preset_reason = u->GetOperQuit();
-               std::string reason;
-               std::string oper_reason;
-
-               reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
-               oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
-
-               if (u->registered != REG_ALL)
-                       if (ServerInstance->Users->unregistered_count)
-                               ServerInstance->Users->unregistered_count--;
-
-               if (IS_LOCAL(u))
+               classbase* c = list[i];
+               if (gone.insert(c).second)
                {
-                       if (!u->sendq.empty())
-                               u->FlushWriteBuf();
-               }
-
-               if (u->registered == REG_ALL)
-               {
-                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(u, reason, oper_reason));
-                       u->PurgeEmptyChannels();
-                       u->WriteCommonQuit(reason, oper_reason);
-               }
-
-               FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u));
-
-               if (IS_LOCAL(u))
-               {
-                       if (u->io)
-                       {
-                               try
-                               {
-                                       u->io->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)
-               {
-                       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(), oper_reason.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(), oper_reason.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();
+                       delete c;
                }
                else
                {
-                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+                       ServerInstance->Logs->Log("CULLLIST",DEBUG, "WARNING: Object @%p culled twice!",
+                               (void*)c);
                }
-
-               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..");
-                       }
-               }
-
-               delete u;
-               list.erase(list.begin());
        }
-
-       return n;
 }