X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=01019004645b140a4d116bf21775662ab537b5f1;hb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;hp=f831a3b77b1ba50873c374efe77a065f29d8d1ed;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index f831a3b77..010190046 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -20,7 +20,7 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $ModDesc: Throttles the connections of any users who try connect flood */
+/* $ModDesc: Throttles the connections of IP ranges who try to connect flood. */
 
 class ModuleConnectBan : public Module
 {
@@ -31,7 +31,8 @@ class ModuleConnectBan : public Module
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
  public:
-	ModuleConnectBan() 	{
+	void init()
+	{
 		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 		OnRehash(NULL);
@@ -43,33 +44,28 @@ class ModuleConnectBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Throttles the connections of any users who try connect flood", VF_VENDOR);
+		return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-		std::string duration;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
-		ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
+		ipv4_cidr = tag->getInt("ipv4cidr", 32);
 		if (ipv4_cidr == 0)
 			ipv4_cidr = 32;
 
-		ipv6_cidr = Conf.ReadInteger("connectban", "ipv6cidr", 0, true);
+		ipv6_cidr = tag->getInt("ipv6cidr", 128);
 		if (ipv6_cidr == 0)
 			ipv6_cidr = 128;
 
-		threshold = Conf.ReadInteger("connectban", "threshold", 0, true);
-
+		threshold = tag->getInt("threshold", 10);
 		if (threshold == 0)
 			threshold = 10;
 
-		duration = Conf.ReadValue("connectban", "duration", 0, true);
-
-		if (duration.empty())
-			duration = "10m";
-
-		banduration = ServerInstance->Duration(duration);
+		banduration = ServerInstance->Duration(tag->getString("duration", "10m"));
+		if (banduration == 0)
+			banduration = 10*60;
 	}
 
 	virtual void OnUserConnect(LocalUser *u)
@@ -103,9 +99,11 @@ class ModuleConnectBan : public Module
 				else
 					delete zl;
 
-				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);
+				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",
+					maskstr.c_str(), timestr.c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", maskstr.c_str(), threshold);
 				connects.erase(i);
 			}
 		}