X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=1d27e3990d1581f967486cecef6ef068967c164e;hb=5076d9d3c4d9cdf9a9124a60e3311d111297d301;hp=85aa85a9b8ee185322b1f39a94f3941e32505ee3;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 85aa85a9b..1d27e3990 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -21,11 +21,8 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Connection throttle */
-
 class ModuleConnFlood : public Module
 {
-private:
 	int seconds, timeout, boot_wait;
 	unsigned int conns;
 	unsigned int maxconns;
@@ -39,26 +36,19 @@ public:
 	{
 	}
 
-	void init()
-	{
-		InitConf();
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Connection throttle", VF_VENDOR);
 	}
 
-	void InitConf()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		/* read configuration variables */
 		ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
 		/* throttle configuration */
-		seconds = tag->getInt("seconds");
+		seconds = tag->getDuration("period", tag->getInt("seconds"));
 		maxconns = tag->getInt("maxconns");
-		timeout = tag->getInt("timeout");
+		timeout = tag->getDuration("timeout");
 		quitmsg = tag->getString("quitmsg");
 
 		/* seconds to wait when the server just booted */
@@ -67,8 +57,11 @@ public:
 		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)
@@ -111,12 +104,6 @@ public:
 		}
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void OnRehash(User* user)
-	{
-		InitConf();
-	}
-
 };
 
 MODULE_INIT(ModuleConnFlood)