Rewrite clone counting to use one map instead of two

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

diff --git a/src/users.cpp b/src/users.cpp
index eb91a9cb5d6156c8fbdd29ad2b86f7696b79752b..a78e9635b209959e689b4699d1e69badb373cabd 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -40,9 +40,8 @@ bool User::IsNoticeMaskSet(unsigned char sm)
 
 bool User::IsModeSet(unsigned char m)
 {
-       if (!isalpha(m))
-               return false;
-       return (modes[m-65]);
+       ModeHandler* mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
+       return (mh && modes[mh->GetId()]);
 }
 
 const char* User::FormatModes(bool showparameters)
@@ -53,11 +52,11 @@ const char* User::FormatModes(bool showparameters)
 
        for (unsigned char n = 0; n < 64; n++)
        {
-               if (modes[n])
+               ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+               if (mh && IsModeSet(mh))
                {
                        data.push_back(n + 65);
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
-                       if (showparameters && mh && mh->GetNumParams(true))
+                       if (showparameters && mh->GetNumParams(true))
                        {
                                std::string p = mh->GetUserParameter(this);
                                if (p.length())
@@ -80,7 +79,7 @@ User::User(const std::string& uid, Server* srv, int type)
 
        ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str());
 
-       if (!ServerInstance->Users->uuidlist->insert(std::make_pair(uuid, this)).second)
+       if (!ServerInstance->Users->uuidlist.insert(std::make_pair(uuid, this)).second)
                throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
@@ -101,7 +100,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 
 User::~User()
 {
-       if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end())
+       if (ServerInstance->FindUUID(uuid))
                ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "User destructor for %s called without cull", uuid.c_str());
 }
 
@@ -345,7 +344,7 @@ CullResult FakeUser::cull()
        // Fake users don't quit, they just get culled.
        quitting = true;
        // Fake users are not inserted into UserManager::clientlist, they're only in the uuidlist
-       ServerInstance->Users->uuidlist->erase(uuid);
+       ServerInstance->Users->uuidlist.erase(uuid);
        return User::cull();
 }
 
@@ -498,14 +497,15 @@ void LocalUser::CheckClass(bool clone_count)
        }
        else if (clone_count)
        {
-               if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
+               const UserManager::CloneCounts& clonecounts = ServerInstance->Users->GetCloneCounts(this);
+               if ((a->GetMaxLocal()) && (clonecounts.local > a->GetMaxLocal()))
                {
                        ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
                        if (a->maxconnwarn)
                                ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString().c_str());
                        return;
                }
-               else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
+               else if ((a->GetMaxGlobal()) && (clonecounts.global > a->GetMaxGlobal()))
                {
                        ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
                        if (a->maxconnwarn)
@@ -614,7 +614,7 @@ void User::InvalidateCache()
        cached_fullrealhost.clear();
 }
 
-bool User::ChangeNick(const std::string& newnick, bool force)
+bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
 {
        if (quitting)
        {
@@ -638,6 +638,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
        {
                // case change, don't need to check Q:lines and such
                // and, if it's identical including case, we can leave right now
+               // We also don't update the nick TS if it's a case change, either
                if (newnick == nick)
                        return true;
        }
@@ -697,8 +698,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
                                InUse->WriteTo(InUse, "NICK %s", InUse->uuid.c_str());
                                InUse->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", InUse->nick.c_str());
 
-                               ServerInstance->Users->clientlist->erase(InUse->nick);
-                               (*(ServerInstance->Users->clientlist))[InUse->uuid] = InUse;
+                               ServerInstance->Users->clientlist.erase(InUse->nick);
+                               ServerInstance->Users->clientlist[InUse->uuid] = InUse;
 
                                InUse->nick = InUse->uuid;
                                InUse->InvalidateCache();
@@ -711,6 +712,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
                                return false;
                        }
                }
+
+               age = newts ? newts : ServerInstance->Time();
        }
 
        if (this->registered == REG_ALL)
@@ -719,8 +722,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
        nick = newnick;
 
        InvalidateCache();
-       ServerInstance->Users->clientlist->erase(oldnick);
-       (*(ServerInstance->Users->clientlist))[newnick] = this;
+       ServerInstance->Users->clientlist.erase(oldnick);
+       ServerInstance->Users->clientlist[newnick] = this;
 
        if (registered == REG_ALL)
                FOREACH_MOD(OnUserPostNick, (this,oldnick));
@@ -1074,9 +1077,6 @@ void User::SendText(const std::string& linePrefix, std::stringstream& textStream
  */
 bool User::SharesChannelWith(User *other)
 {
-       if ((this->registered != REG_ALL) || (other->registered != REG_ALL))
-               return false;
-
        /* Outer loop */
        for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
        {
@@ -1122,7 +1122,7 @@ bool User::ChangeDisplayedHost(const std::string& shost)
 
        FOREACH_MOD(OnChangeHost, (this,shost));
 
-       this->dhost.assign(shost, 0, 64);
+       this->dhost.assign(shost, 0, ServerInstance->Config->Limits.MaxHost);
        this->InvalidateCache();
 
        if (IS_LOCAL(this))