X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=5dc410fffae7260e1fe13ff36f4443cff3c38471;hb=d60103cada2c954f6d735c0ae4fb7d9b1b5ed844;hp=ee6eafbb58d6aacb463fc30a661c28cdc0bd1f5a;hpb=869fd6ca2822ef45ad7c3939b9ab7418200daf3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ee6eafbb5..5dc410fff 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -73,8 +73,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
 	New->lastping = 1;
 
-	ServerInstance->Users->AddLocalClone(New);
-	ServerInstance->Users->AddGlobalClone(New);
+	this->AddClone(New);
 
 	this->local_users.push_front(New);
 
@@ -203,58 +202,40 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
 	user->PurgeEmptyChannels();
 }
 
-void UserManager::AddLocalClone(User *user)
+void UserManager::AddClone(User* user)
 {
-	local_clones[user->GetCIDRMask()]++;
-}
-
-void UserManager::AddGlobalClone(User *user)
-{
-	global_clones[user->GetCIDRMask()]++;
+	CloneCounts& counts = clonemap[user->GetCIDRMask()];
+	counts.global++;
+	if (IS_LOCAL(user))
+		counts.local++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-	if (IS_LOCAL(user))
+	CloneMap::iterator it = clonemap.find(user->GetCIDRMask());
+	if (it != clonemap.end())
 	{
-		clonemap::iterator x = local_clones.find(user->GetCIDRMask());
-		if (x != local_clones.end())
+		CloneCounts& counts = it->second;
+		counts.global--;
+		if (counts.global == 0)
 		{
-			x->second--;
-			if (!x->second)
-			{
-				local_clones.erase(x);
-			}
+			// No more users from this IP, remove entry from the map
+			clonemap.erase(it);
+			return;
 		}
-	}
 
-	clonemap::iterator y = global_clones.find(user->GetCIDRMask());
-	if (y != global_clones.end())
-	{
-		y->second--;
-		if (!y->second)
-		{
-			global_clones.erase(y);
-		}
+		if (IS_LOCAL(user))
+			counts.local--;
 	}
 }
 
-unsigned long UserManager::GlobalCloneCount(User *user)
-{
-	clonemap::iterator x = global_clones.find(user->GetCIDRMask());
-	if (x != global_clones.end())
-		return x->second;
-	else
-		return 0;
-}
-
-unsigned long UserManager::LocalCloneCount(User *user)
+const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
-	clonemap::iterator x = local_clones.find(user->GetCIDRMask());
-	if (x != local_clones.end())
-		return x->second;
+	CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());
+	if (it != clonemap.end())
+		return it->second;
 	else
-		return 0;
+		return zeroclonecounts;
 }
 
 void UserManager::ServerNoticeAll(const char* text, ...)