X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=35d455c45b9bd1c5934f72a58564e4ec991f54fd;hb=1913c07c2eda9c946850dfd2ebafa498ed8b2970;hp=a171c32d203aec7ae4cafc8712aea2b95941bc4d;hpb=7e4b66804044616a85d5049cbfdb88efa012cc51;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index a171c32d2..35d455c45 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDusermanager */
+/* $Core */
 
 #include "inspircd.h"
 #include "xline.h"
@@ -68,7 +68,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 	(*(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");
@@ -204,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--;
@@ -232,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--;