debug

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b518685faf6b2f19165b858cdb5956e9394997b5..ecbd683b77b181210896504ee7e669db084dd912 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
+void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
 {
        /* NOTE: Calling this one parameter constructor for User automatically
         * allocates a new UUID and places it in the hash_map.
@@ -43,9 +43,11 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 #endif
                inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
 
+       New->SetFd(socket);
+       New->SetSockAddr(socketfamily, ipaddr, port);
 
        /* Give each of the modules an attempt to hook the user for I/O */
-       FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New));
+       FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip));
 
        if (New->io)
        {
@@ -78,10 +80,6 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
        New->signon = Instance->Time() + Instance->Config->dns_timeout;
        New->lastping = 1;
 
-       New->SetSockAddr(socketfamily, ipaddr, port);
-
-       New->SetFd(socket);
-
        /* 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;
@@ -110,7 +108,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
        this->local_users.push_back(New);
 
-       if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= MAXCLIENTS))
+       if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
        {
                Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
                User::QuitUser(Instance, New,"No more connections allowed");
@@ -127,13 +125,12 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
         * which for the time being is a physical impossibility (even the largest networks dont have more
         * than about 10,000 users on ONE server!)
         */
-#ifndef WINDOWS
-       if ((unsigned int)socket >= MAX_DESCRIPTORS)
+       if (socket >= Instance->SE->GetMaxFds())
        {
                User::QuitUser(Instance, New, "Server is full");
                return;
        }
-#endif
+
        /*
         * 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