Add extban +b C: - blocks matching masks from sending CTCP. Allows +e.

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 7f07bc69ffcc35c635ab6c2c7a29a6bc086fa588..35d455c45b9bd1c5934f72a58564e4ec991f54fd 100644 (file)
--- 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");
@@ -78,7 +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. */
-       New->dhost.assign(New->host.assign(New->GetIPString(), 64));
+       New->dhost.assign(New->GetIPString(), 0, 64);
+       New->host.assign(New->GetIPString(), 0, 64);
 
        Instance->Users->AddLocalClone(New);
        Instance->Users->AddGlobalClone(New);
@@ -203,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--;
@@ -231,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--;