Remove unneeded ProtocolInterface::Introduce

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 224591b6f82f5610f19439745781b41d47f4e722..07649ed819b173240c1563bb107e7273506295ec 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,25 +11,17 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
+/* $Core */
 
 #include "inspircd.h"
 #include "cull_list.h"
 
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
-       list.clear();
 }
 
 void CullList::AddItem(User* user)
 {
-       if (user->quitting)
-       {
-               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
-               return;
-       }
-
-       user->quitting = true;
        list.push_back(user);
 }
 
@@ -39,25 +31,13 @@ void CullList::MakeSilent(User* user)
        return;
 }
 
-int CullList::Apply()
+void CullList::Apply()
 {
-       int n = list.size();
-       int i = 0;
-
-       while (list.size() && i++ != 100)
+       for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
        {
-               std::vector<User *>::iterator a = list.begin();
-
-               User *u = (*a);
-               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
-               const char* preset_reason = u->GetOperQuit();
-               std::string reason = u->operquitmsg;
-               std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
-
-               if (reason.length() > MAXQUIT - 1)
-                       reason.resize(MAXQUIT - 1);
-               if (oper_reason.length() > MAXQUIT - 1)
-                       oper_reason.resize(MAXQUIT - 1);
+               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)
@@ -65,26 +45,14 @@ int CullList::Apply()
 
                if (IS_LOCAL(u))
                {
-                       if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+                       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 (ServerInstance->Config->GetIOHook(u->GetPort()))
+                       if (u->GetIOHook())
                        {
                                try
                                {
-                                       ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+                                       u->GetIOHook()->OnRawSocketClose(u->GetFd());
                                }
                                catch (CoreException& modexcept)
                                {
@@ -106,14 +74,14 @@ int CullList::Apply()
                        {
                                if (!u->quietquit)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str());
+                                       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,u->ident,u->host,oper_reason.c_str());
+                                       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();
@@ -121,19 +89,26 @@ int CullList::Apply()
 
                if (iter != ServerInstance->Users->clientlist->end())
                {
-                       if (IS_LOCAL(u))
+                       ServerInstance->Users->clientlist->erase(iter);
+               }
+               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
                        {
-                               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);
+                               ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
                        }
-                       ServerInstance->Users->clientlist->erase(iter);
                }
 
                delete u;
-               list.erase(list.begin());
        }
-
-       return n;
+       list.clear();
 }