Fix crash

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index f18ea91d4c6651d7902b51b8cfd7f571629101f4..1cb269bdf45909b475ab255fde892cc2e0e68bc8 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDusermanager */
+/* $Core */
 
 #include "inspircd.h"
 #include "xline.h"
@@ -49,11 +49,11 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
        /* Give each of the modules an attempt to hook the user for I/O */
        FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip));
 
-       if (New->io)
+       if (New->GetIOHook())
        {
                try
                {
-                       New->io->OnRawSocketAccept(socket, ipaddr, port);
+                       New->GetIOHook()->OnRawSocketAccept(socket, ipaddr, port);
                }
                catch (CoreException& modexcept)
                {
@@ -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);
@@ -114,22 +111,6 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
                return;
        }
 
-       /*
-        * XXX -
-        * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
-        * its a pretty big but for the moment valid assumption:
-        * file descriptors are handed out starting at 0, and are recycled as theyre freed.
-        * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
-        * irc server at once (or the irc server otherwise initiating this many connections, files etc)
-        * which for the time being is a physical impossibility (even the largest networks dont have more
-        * than about 10,000 users on ONE server!)
-        */
-       if (socket >= Instance->SE->GetMaxFds())
-       {
-               this->QuitUser(New, "Server is full");
-               return;
-       }
-
        /*
         * even with bancache, we still have to keep User::exempt current.
         * besides that, if we get a positive bancache hit, we still won't fuck
@@ -207,25 +188,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 +269,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--;