Fix for bug #604 reported by Phoenix, thanks

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 9ac6681314ddea0263e63d1abb1837eda574bc7e..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)
                {
@@ -111,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