Convert a bunch of time-related config options to getDuration.

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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index d0e9257168c0ec038c5c39ff1504e42688ecc098..1d27e3990d1581f967486cecef6ef068967c164e 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -21,52 +21,47 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Connection throttle */
-
-int conns = 0, throttled = 0;
-
 class ModuleConnFlood : public Module
 {
-private:
-       int seconds, maxconns, timeout, boot_wait;
+       int seconds, timeout, boot_wait;
+       unsigned int conns;
+       unsigned int maxconns;
+       bool throttled;
        time_t first;
        std::string quitmsg;
 
 public:
-       ModuleConnFlood()       {
-
-               InitConf();
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-       virtual ~ModuleConnFlood()
+       ModuleConnFlood()
+               : conns(0), throttled(false)
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Connection throttle", VF_VENDOR);
        }
 
-       void InitConf()
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                /* read configuration variables */
-               ConfigReader conf;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
                /* throttle configuration */
-               seconds = conf.ReadInteger("connflood", "seconds", 0, true);
-               maxconns = conf.ReadInteger("connflood", "maxconns", 0, true);
-               timeout = conf.ReadInteger("connflood", "timeout", 0, true);
-               quitmsg = conf.ReadValue("connflood", "quitmsg", 0);
+               seconds = tag->getDuration("period", tag->getInt("seconds"));
+               maxconns = tag->getInt("maxconns");
+               timeout = tag->getDuration("timeout");
+               quitmsg = tag->getString("quitmsg");
 
                /* seconds to wait when the server just booted */
-               boot_wait = conf.ReadInteger("connflood", "bootwait", 0, true);
+               boot_wait = tag->getInt("bootwait");
 
                first = ServerInstance->Time();
        }
 
-       virtual ModResult OnUserRegister(LocalUser* user)
+       ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
        {
+               if (user->exempt)
+                       return MOD_RES_PASSTHRU;
+
                time_t next = ServerInstance->Time();
 
                if ((ServerInstance->startup_time + boot_wait) > next)
@@ -78,12 +73,12 @@ public:
                /* increase connection count */
                conns++;
 
-               if (throttled == 1)
+               if (throttled)
                {
                        if (tdiff > seconds + timeout)
                        {
                                /* expire throttle */
-                               throttled = 0;
+                               throttled = false;
                                ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
                                return MOD_RES_PASSTHRU;
                        }
@@ -96,7 +91,7 @@ public:
                {
                        if (conns >= maxconns)
                        {
-                               throttled = 1;
+                               throttled = true;
                                ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
                                ServerInstance->Users->QuitUser(user, quitmsg);
                                return MOD_RES_DENY;
@@ -109,12 +104,6 @@ public:
                }
                return MOD_RES_PASSTHRU;
        }
-
-       virtual void OnRehash(User* user)
-       {
-               InitConf();
-       }
-
 };
 
 MODULE_INIT(ModuleConnFlood)