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 6a31f0a93f02027a2f99e5dcf79bc9b091c1c974..a78e9635b209959e689b4699d1e69badb373cabd 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -497,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)