X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=809055a5ad3a854e4a99c02044ed764a14c37d0b;hb=56b4dc61e49e4218544f51ac9a25ab3ece60a782;hp=f86b9ce52c7fc952e038a10f850f0cef41777aa6;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index f86b9ce52..809055a5a 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -21,12 +25,11 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Connection throttle */
-
 class ModuleConnFlood : public Module
 {
-private:
-	int seconds, timeout, boot_wait;
+	unsigned int seconds;
+	unsigned int timeout;
+	unsigned int boot_wait;
 	unsigned int conns;
 	unsigned int maxconns;
 	bool throttled;
@@ -39,36 +42,32 @@ public:
 	{
 	}
 
-	void init()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		InitConf();
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		return Version("Throttles excessive connections to the server.", VF_VENDOR);
 	}
 
-	virtual Version GetVersion()
-	{
-		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");
-		maxconns = tag->getInt("maxconns");
-		timeout = tag->getInt("timeout");
+		seconds = tag->getDuration("period", tag->getDuration("seconds", 30));
+		maxconns = tag->getUInt("maxconns", 3);
+		timeout = tag->getDuration("timeout", 30);
 		quitmsg = tag->getString("quitmsg");
 
 		/* seconds to wait when the server just booted */
-		boot_wait = tag->getInt("bootwait");
+		boot_wait = tag->getDuration("bootwait", 60*2);
 
 		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 +110,6 @@ public:
 		}
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void OnRehash(User* user)
-	{
-		InitConf();
-	}
-
 };
 
 MODULE_INIT(ModuleConnFlood)