X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=9ac6681314ddea0263e63d1abb1837eda574bc7e;hb=f474e7e6dc2d36f96150ebe33b23b4ea76814415;hp=f18ea91d4c6651d7902b51b8cfd7f571629101f4;hpb=12427e75fe175fe7a62f388281dd7ab5100c9dda;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index f18ea91d4..9ac668131 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -63,14 +63,12 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 	Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
 
-	int j = 0;
-
 	this->unregistered_count++;
 
 	(*(this->clientlist))[New->uuid] = New;
 
 	/* The users default nick is their UUID */
-	New->nick.assign(New->uuid, 0, NICKMAX - 1);
+	New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
 
 	New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
 	New->ident.assign("unknown");
@@ -80,9 +78,8 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 	New->lastping = 1;
 
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
-		New->dhost[j] = New->host[j] = *temp;
-	New->dhost[j] = New->host[j] = 0;
+	New->dhost.assign(New->GetIPString(), 0, 64);
+	New->host.assign(New->GetIPString(), 0, 64);
 
 	Instance->Users->AddLocalClone(New);
 	Instance->Users->AddGlobalClone(New);
@@ -207,25 +204,78 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 void UserManager::AddLocalClone(User *user)
 {
-	clonemap::iterator x = local_clones.find(user->GetIPString());
+	int range = 32;
+	clonemap::iterator x;
+	switch (user->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			range = ServerInstance->Config->c_ipv6_range;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			range = ServerInstance->Config->c_ipv4_range;
+		}
+		break;
+	}
+
+	x = local_clones.find(user->GetCIDRMask(range));
 	if (x != local_clones.end())
 		x->second++;
 	else
-		local_clones[user->GetIPString()] = 1;
+		local_clones[user->GetCIDRMask(range)] = 1;
 }
 
 void UserManager::AddGlobalClone(User *user)
 {
-	clonemap::iterator y = global_clones.find(user->GetIPString());
-	if (y != global_clones.end())
-		y->second++;
+	int range = 32;
+	clonemap::iterator x;
+	switch (user->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			range = ServerInstance->Config->c_ipv6_range;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			range = ServerInstance->Config->c_ipv4_range;
+		}
+		break;
+	}
+
+	x = global_clones.find(user->GetCIDRMask(range));
+	if (x != global_clones.end())
+		x->second++;
 	else
-		global_clones[user->GetIPString()] = 1;
+		global_clones[user->GetCIDRMask(range)] = 1;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-	clonemap::iterator x = local_clones.find(user->GetIPString());
+	int range = 32;
+	switch (user->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			range = ServerInstance->Config->c_ipv6_range;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			range = ServerInstance->Config->c_ipv4_range;
+		}
+		break;
+	}
+
+	clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
 	if (x != local_clones.end())
 	{
 		x->second--;
@@ -235,7 +285,7 @@ void UserManager::RemoveCloneCounts(User *user)
 		}
 	}
 	
-	clonemap::iterator y = global_clones.find(user->GetIPString());
+	clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
 	if (y != global_clones.end())
 	{
 		y->second--;