Reset the already_sent IDs during slow garbage collection

[user/henk/code/inspircd.git] / src / modules / m_connectban.cpp

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index b676fa681df8bd8506a878688a46fd857965f851..f9dc37b36ff9910530d8fad64e57e6d9ad4fb69c 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -37,7 +37,7 @@ class ModuleConnectBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Throttles the connections of any users who try connect flood", VF_VENDOR,API_VERSION);
+               return Version("Throttles the connections of any users who try connect flood", VF_VENDOR);
        }
 
        virtual void OnRehash(User* user)
@@ -66,7 +66,7 @@ class ModuleConnectBan : public Module
                banduration = ServerInstance->Duration(duration);
        }
 
-       virtual void OnUserConnect(User *u)
+       virtual void OnUserConnect(LocalUser *u)
        {
                int range = 32;
                clonemap::iterator i;
@@ -81,7 +81,8 @@ class ModuleConnectBan : public Module
                        break;
                }
 
-               i = connects.find(u->GetCIDRMask(range));
+               irc::sockets::cidr_mask mask(u->client_sa, range);
+               i = connects.find(mask);
 
                if (i != connects.end())
                {
@@ -90,21 +91,21 @@ class ModuleConnectBan : public Module
                        if (i->second >= threshold)
                        {
                                // Create zline for set duration.
-                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName.c_str(), "Connect flooding", u->GetCIDRMask(range));
+                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect.", mask.str());
                                if (ServerInstance->XLines->AddLine(zl,NULL))
                                        ServerInstance->XLines->ApplyLines();
                                else
                                        delete zl;
 
                                ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding", 
-                                       u->GetCIDRMask(range), ServerInstance->TimeString(zl->expiry).c_str());
-                               ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", u->GetCIDRMask(range), threshold);
+                                       mask.str().c_str(), ServerInstance->TimeString(zl->expiry).c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", mask.str().c_str(), threshold);
                                connects.erase(i);
                        }
                }
                else
                {
-                       connects[u->GetCIDRMask(range)] = 1;
+                       connects[mask] = 1;
                }
        }