Rip flood/threshold out of config classes also.

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 9ac6681314ddea0263e63d1abb1837eda574bc7e..58c9b4e3e952a9f745e3aa7478d81dc420446cfa 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -11,14 +11,14 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDusermanager */
+/* $Core */
 
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
+void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, 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.
@@ -37,23 +37,23 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
        char ipaddr[MAXBUF];
 #ifdef IPV6
-       if (socketfamily == AF_INET6)
+       if (ip->sa_family == AF_INET6)
                inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr));
        else
 #endif
                inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
 
        New->SetFd(socket);
-       New->SetSockAddr(socketfamily, ipaddr, port);
+       New->SetSockAddr(ip->sa_family, ipaddr, port);
 
        /* 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
@@ -188,8 +172,15 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
 {
+       if (user->quitting)
+       {
+               ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+               return;
+       }
+
        ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
        user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+       user->quitting = true;
        user->quietquit = false;
        user->quitmsg = quitreason;
 
@@ -298,7 +289,23 @@ void UserManager::RemoveCloneCounts(User *user)
 
 unsigned long UserManager::GlobalCloneCount(User *user)
 {
-       clonemap::iterator x = global_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 = global_clones.find(user->GetCIDRMask(range));
        if (x != global_clones.end())
                return x->second;
        else
@@ -307,7 +314,23 @@ unsigned long UserManager::GlobalCloneCount(User *user)
 
 unsigned long UserManager::LocalCloneCount(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())
                return x->second;
        else