Move quitting of clients to a central Cull List, and do quitting outside userrec...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index b19054b0ddd562c20ebfe1dc1942de8c1c021bb3..2a022449f96d9e165684539262450dd2cf67146b 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -15,24 +15,6 @@
 #include "users.h"
 #include "cull_list.h"
 
-/*
- * 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;
-       std::map<userrec*,time_t>::iterator es = exempt.find(user);
-       if (es != exempt.end())
-               esignon = es->second;
-
-       for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
-       {
-               if (user == u->second)
-                       return (u->second->signon == esignon);
-       }
-       return false;
-}
-
 CullItem::CullItem(userrec* u, std::string &r)
 {
        this->user = u;
@@ -67,21 +49,17 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 
 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;
-       }
+       AddItem(user, reason.c_str());
 }
 
+
 void CullList::AddItem(userrec* user, const char* reason)
 {
        if (exempt.find(user) == exempt.end())
        {
                CullItem item(user,reason);
                list.push_back(item);
-               exempt[user] = user->signon;
+               exempt[user] = user;
        }
 }
 
@@ -92,8 +70,78 @@ int CullList::Apply()
        {
                std::vector<CullItem>::iterator a = list.begin();
 
-               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
+               user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
+               std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
+               std::string reason = a->GetReason();
+
+               if (reason.length() > MAXQUIT - 1)
+                       reason.resize(MAXQUIT - 1);
+
+               if (a->GetUser()->registered != REG_ALL)
+                       if (ServerInstance->unregistered_count)
+                               ServerInstance->unregistered_count--;
+
+               if (IS_LOCAL(a->GetUser()))
+               {
+                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
+                               a->GetUser()->FlushWriteBuf();
+               }
+
+               if (a->GetUser()->registered == REG_ALL)
+               {
+                       a->GetUser()->PurgeEmptyChannels();
+                       a->GetUser()->WriteCommonExcept("QUIT :%s",reason.c_str());
+                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
+               }
+
+               FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
+
+               if (IS_LOCAL(a->GetUser()))
+               {
+                       if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
+                       {
+                               try
+                               {
+                                       ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
+                               }
+                               catch (CoreException& modexcept)
+                               {
+                                       ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                               }
+                       }
+
+                       ServerInstance->SE->DelFd(a->GetUser());
+                       a->GetUser()->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 (a->GetUser()->registered == REG_ALL)
+               {
+                       if (IS_LOCAL(a->GetUser()))
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       else
+                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       a->GetUser()->AddToWhoWas();
+               }
+
+               if (iter != ServerInstance->clientlist->end())
+               {
+                       if (IS_LOCAL(a->GetUser()))
+                       {
+                               std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
+                               if (x != ServerInstance->local_users.end())
+                                       ServerInstance->local_users.erase(x);
+                       }
+                       ServerInstance->clientlist->erase(iter);
+                       DELETE(a->GetUser());
+               }
+
                list.erase(list.begin());
+               exempt.erase(exemptiter);
        }
        return n;
 }