m_callerid Route ACCEPT to the server of the target user only, do not send METADATA...

[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 01019004645b140a4d116bf21775662ab537b5f1..eca9352e871e452ce114b586efbf4eb9656c577b 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -24,30 +24,26 @@
 
 class ModuleConnectBan : public Module
 {
- private:
        clonemap connects;
        unsigned int threshold;
        unsigned int banduration;
        unsigned int ipv4_cidr;
        unsigned int ipv6_cidr;
+
  public:
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
-       virtual ~ModuleConnectBan()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
@@ -63,13 +59,16 @@ class ModuleConnectBan : public Module
                if (threshold == 0)
                        threshold = 10;
 
-               banduration = ServerInstance->Duration(tag->getString("duration", "10m"));
+               banduration = InspIRCd::Duration(tag->getString("duration", "10m"));
                if (banduration == 0)
                        banduration = 10*60;
        }
 
-       virtual void OnUserConnect(LocalUser *u)
+       void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
        {
+               if (u->exempt)
+                       return;
+
                int range = 32;
                clonemap::iterator i;
 
@@ -94,11 +93,12 @@ class ModuleConnectBan : public Module
                        {
                                // Create zline for set duration.
                                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
+                               if (!ServerInstance->XLines->AddLine(zl, NULL))
+                               {
                                        delete zl;
-
+                                       return;
+                               }
+                               ServerInstance->XLines->ApplyLines();
                                std::string maskstr = mask.str();
                                std::string timestr = ServerInstance->TimeString(zl->expiry);
                                ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding",
@@ -113,9 +113,9 @@ class ModuleConnectBan : public Module
                }
        }
 
-       virtual void OnGarbageCollect()
+       void OnGarbageCollect()
        {
-               ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map.");
+               ServerInstance->Logs->Log("m_connectban", LOG_DEBUG, "Clearing map.");
                connects.clear();
        }
 };