Remove some of this, this isn't (strictly speaking) an issue now

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 9a3c088e81e95d7fd9e75a487ef40399afeb72b2..ddbf6acae8e7d12980c3efeb8a5f69e2418d92d2 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -19,29 +19,23 @@
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
-       exempt.clear();
 }
 
 void CullList::AddItem(User* user)
 {
-       if (exempt.find(user) == exempt.end())
+       if (user->quitting)
        {
-               list.push_back(user);
-               exempt[user] = user;
+               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)
 {
-/*     for (std::vector<CullItem *>::iterator a = list.begin(); a != list.end(); ++a)
-       {
-               if ((*a)->GetUser() == user)
-               {
-                       (*a)->MakeSilent();
-                       break;
-               }
-       }
-*/
+       user->quietquit = true;
        return;
 }
 
@@ -55,20 +49,17 @@ int CullList::Apply()
                std::vector<User *>::iterator a = list.begin();
 
                User *u = (*a);
-               user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
-               std::map<User*, User*>::iterator exemptiter = exempt.find(u);
-               const char* preset_reason = u->GetOperQuit();
-               std::string reason = u->operquitmsg;
-               std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
+               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
+               const std::string& preset_reason = u->GetOperQuit();
+               std::string reason;
+               std::string oper_reason;
 
-               if (reason.length() > MAXQUIT - 1)
-                       reason.resize(MAXQUIT - 1);
-               if (oper_reason.length() > MAXQUIT - 1)
-                       oper_reason.resize(MAXQUIT - 1);
+               reason.assign(u->quitmsg, 0, MAXQUIT - 1);
+               oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, MAXQUIT - 1);
 
                if (u->registered != REG_ALL)
-                       if (ServerInstance->unregistered_count)
-                               ServerInstance->unregistered_count--;
+                       if (ServerInstance->Users->unregistered_count)
+                               ServerInstance->Users->unregistered_count--;
 
                if (IS_LOCAL(u))
                {
@@ -87,15 +78,15 @@ int CullList::Apply()
 
                if (IS_LOCAL(u))
                {
-                       if (ServerInstance->Config->GetIOHook(u->GetPort()))
+                       if (u->io)
                        {
                                try
                                {
-                                       ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+                                       u->io->OnRawSocketClose(u->GetFd());
                                }
                                catch (CoreException& modexcept)
                                {
-                                       ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                                       ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                                }
                        }
 
@@ -111,38 +102,45 @@ int CullList::Apply()
                {
                        if (IS_LOCAL(u))
                        {
-       // XXX
-       //                      if (!(*a)->IsSilent())
-       //                      {
-       //                              ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str());
-       //                      }
+                               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)) && (!(*a)->IsSilent()))
-       //                      {
-                                       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());
-       //                      }
+                               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->clientlist->end())
+               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->local_users.begin(),ServerInstance->local_users.end(),u);
-                               if (x != ServerInstance->local_users.end())
-                                       ServerInstance->local_users.erase(x);
+                               ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
                        }
-                       ServerInstance->clientlist->erase(iter);
-                       delete u;
                }
 
-       //      delete *list.begin();
+               delete u;
                list.erase(list.begin());
-               exempt.erase(exemptiter);
        }
+
        return n;
 }