Stop recreating hashmaps every hour, move garbage collection code related to local...

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index e74f7dadcd5ecd162677ea62ce9e6e4a95931930..2d9c3f281c3953aeb2ad29119e7826c2158c7e0f 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -37,7 +37,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        }
        catch (...)
        {
-               ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
+               ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
                ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
                return;
        }
@@ -66,20 +66,14 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
        (*(this->clientlist))[New->nick] = New;
 
-       New->ident.assign("unknown");
-
        New->registered = REG_NONE;
        New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
        New->lastping = 1;
 
-       /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-       New->dhost.assign(New->GetIPString(), 0, 64);
-       New->host.assign(New->GetIPString(), 0, 64);
-
        ServerInstance->Users->AddLocalClone(New);
        ServerInstance->Users->AddGlobalClone(New);
 
-       this->local_users.push_back(New);
+       New->localuseriter = this->local_users.insert(local_users.end(), New);
 
        if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
        {
@@ -114,7 +108,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                if (!b->Type.empty() && !New->exempt)
                {
                        /* user banned */
-                       ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
+                       ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Positive hit for " + New->GetIPString());
                        if (!ServerInstance->Config->MoronBanner.empty())
                                New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
                        this->QuitUser(New, b->Reason);
@@ -122,7 +116,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                }
                else
                {
-                       ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
+                       ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Negative hit for " + New->GetIPString());
                }
        }
        else
@@ -152,6 +146,10 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        if (ServerInstance->Config->RawLog)
                New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
+       FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+       if (New->quitting)
+               return;
+
        FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 
        if (ServerInstance->Config->NoUserDns)
@@ -213,7 +211,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
        /*
         * 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 they were an oper with +s +qQ.
         */
        if (user->registered == REG_ALL)
        {
@@ -221,19 +219,18 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                {
                        if (!user->quietquit)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s] (%s)",
-                                       user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]",
+                                       user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
                        }
                }
                else
                {
                        if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s] (%s)",
-                                       user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s (%s) [%s]",
+                                       user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
                        }
                }
-               user->AddToWhoWas();
        }
 
        user_hash::iterator iter = this->clientlist->find(user->nick);
@@ -249,23 +246,12 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 void UserManager::AddLocalClone(User *user)
 {
-       clonemap::iterator x;
-       x = local_clones.find(user->GetCIDRMask());
-       if (x != local_clones.end())
-               x->second++;
-       else
-               local_clones[user->GetCIDRMask()] = 1;
+       local_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::AddGlobalClone(User *user)
 {
-       clonemap::iterator x;
-
-       x = global_clones.find(user->GetCIDRMask());
-       if (x != global_clones.end())
-               x->second++;
-       else
-               global_clones[user->GetCIDRMask()] = 1;
+       global_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
@@ -362,7 +348,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 
        snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-       for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                User* t = *i;
                t->WriteServ(std::string(formatbuffer));
@@ -383,7 +369,7 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 
        snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-       for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                User* t = *i;
                t->WriteServ(std::string(formatbuffer));
@@ -403,3 +389,14 @@ int UserManager::ModeCount(const char mode)
        }
        return c;
 }
+
+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++)
+       {
+               (**i).already_sent = 0;
+               (**i).RemoveExpiredInvites();
+       }
+}