Merge pull request #971 from SaberUK/master+numeric-xline

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 665149e4872d88bc4cbaed66b38835389fa14ba1..1966c9b4729f86193e8c8fa87694a3bf9395c936 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -24,6 +24,30 @@
 #include "xline.h"
 #include "iohook.h"
 
+namespace
+{
+       class WriteCommonQuit : public User::ForEachNeighborHandler
+       {
+               std::string line;
+               std::string operline;
+
+               void Execute(LocalUser* user) CXX11_OVERRIDE
+               {
+                       user->Write(user->IsOper() ? operline : line);
+               }
+
+        public:
+               WriteCommonQuit(User* user, const std::string& msg, const std::string& opermsg)
+                       : line(":" + user->GetFullHost() + " QUIT :")
+                       , operline(line)
+               {
+                       line += msg;
+                       operline += opermsg;
+                       user->ForEachNeighbor(*this, false);
+               }
+       };
+}
+
 UserManager::UserManager()
        : unregistered_count(0)
 {
@@ -104,14 +128,15 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
         */
        New->exempt = (ServerInstance->XLines->MatchesLine("E",New) != NULL);
 
-       if (BanCacheHit *b = ServerInstance->BanCache->GetHit(New->GetIPString()))
+       BanCacheHit* const b = ServerInstance->BanCache.GetHit(New->GetIPString());
+       if (b)
        {
                if (!b->Type.empty() && !New->exempt)
                {
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
                        if (!ServerInstance->Config->XLineMessage.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
+                               New->WriteNumeric(ERR_YOUREBANNEDCREEP, ":" + ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -179,7 +204,7 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
        if (user->registered == REG_ALL)
        {
                FOREACH_MOD(OnUserQuit, (user, reason, *operreason));
-               user->WriteCommonQuit(reason, *operreason);
+               WriteCommonQuit(user, reason, *operreason);
        }
        else
                unregistered_count--;
@@ -192,6 +217,7 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
 
                if (lu->registered == REG_ALL)
                        ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operreason->c_str());
+               local_users.erase(lu);
        }
 
        if (!clientlist.erase(user->nick))
@@ -243,7 +269,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
        VAFORMAT(message, text, text);
        message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + message;
 
-       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                User* t = *i;
                t->WriteServ(message);
@@ -254,7 +280,7 @@ void UserManager::GarbageCollect()
 {
        // Reset the already_sent IDs so we don't wrap it around and drop a message
        LocalUser::already_sent_id = 0;
-       for (LocalUserList::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                (**i).already_sent = 0;
                (**i).RemoveExpiredInvites();
@@ -282,13 +308,10 @@ void UserManager::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       for (LocalUserList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+       for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                LocalUser* curr = *i;
 
-               if (curr->quitting)
-                       continue;
-
                if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
                {
                        unsigned int rate = curr->MyClass->GetCommandRate();
@@ -302,7 +325,7 @@ void UserManager::DoBackgroundUserStuff()
                switch (curr->registered)
                {
                        case REG_ALL:
-                               if (ServerInstance->Time() > curr->nping)
+                               if (ServerInstance->Time() >= curr->nping)
                                {
                                        // This user didn't answer the last ping, remove them
                                        if (!curr->lastping)