Extbans can be VF_OPTCOMMON as they do not desync on module add/remove

[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 7c0659ad6b57ba1ac9a1f28b9701f4765a65c521..98fa3b847bcc9ec4f7f556128e5432fe233c3919 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -25,11 +25,10 @@ class ModuleConnectBan : public Module
        unsigned int ipv4_cidr;
        unsigned int ipv6_cidr;
  public:
-       ModuleConnectBan(InspIRCd* Me) : Module(Me)
-       {
+       ModuleConnectBan()      {
                Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 3);
-               OnRehash(NULL, "");
+               OnRehash(NULL);
        }
 
        virtual ~ModuleConnectBan()
@@ -38,12 +37,12 @@ class ModuleConnectBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Throttles the connections of any users who try connect flood", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                std::string duration;
 
                ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
@@ -67,28 +66,23 @@ class ModuleConnectBan : public Module
                banduration = ServerInstance->Duration(duration);
        }
 
-       virtual void OnUserConnect(User *u)
+       virtual void OnUserConnect(LocalUser *u)
        {
                int range = 32;
                clonemap::iterator i;
 
-               switch (u->GetProtocolFamily())
+               switch (u->client_sa.sa.sa_family)
                {
-       #ifdef SUPPORT_IP6LINKS
                        case AF_INET6:
-                       {
                                range = ipv6_cidr;
-                       }
                        break;
-       #endif
                        case AF_INET:
-                       {
                                range = ipv4_cidr;
-                       }
                        break;
                }
 
-               i = connects.find(u->GetCIDRMask(range));
+               irc::sockets::cidr_mask mask(u->client_sa, range);
+               i = connects.find(mask);
 
                if (i != connects.end())
                {
@@ -97,19 +91,21 @@ class ModuleConnectBan : public Module
                        if (i->second >= threshold)
                        {
                                // Create zline for set duration.
-                               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetCIDRMask(range));
+                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName.c_str(), "Connect flooding", mask.str().c_str());
                                if (ServerInstance->XLines->AddLine(zl,NULL))
                                        ServerInstance->XLines->ApplyLines();
                                else
                                        delete zl;
 
-                               ServerInstance->SNO->WriteToSnoMask('x', "Connect flooding from IP range %s (%d)", u->GetCIDRMask(range), threshold);
+                               ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding", 
+                                       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;
                }
        }