X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=227373a36443ea12cd2484756134334a320d2e0b;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=f54c4efa2736f64012635ba07054b7dd690e35ef;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index f54c4efa2..227373a36 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -20,8 +20,6 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $ModDesc: Throttles the connections of IP ranges who try to connect flood. */
-
 class ModuleConnectBan : public Module
 {
 	clonemap connects;
@@ -33,8 +31,6 @@ class ModuleConnectBan : public Module
  public:
 	void init() CXX11_OVERRIDE
 	{
-		Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
@@ -47,21 +43,10 @@ class ModuleConnectBan : public Module
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
-		ipv4_cidr = tag->getInt("ipv4cidr", 32);
-		if (ipv4_cidr == 0)
-			ipv4_cidr = 32;
-
-		ipv6_cidr = tag->getInt("ipv6cidr", 128);
-		if (ipv6_cidr == 0)
-			ipv6_cidr = 128;
-
-		threshold = tag->getInt("threshold", 10);
-		if (threshold == 0)
-			threshold = 10;
-
-		banduration = InspIRCd::Duration(tag->getString("duration", "10m"));
-		if (banduration == 0)
-			banduration = 10*60;
+		ipv4_cidr = tag->getInt("ipv4cidr", 32, 1, 32);
+		ipv6_cidr = tag->getInt("ipv6cidr", 128, 1, 128);
+		threshold = tag->getInt("threshold", 10, 1);
+		banduration = tag->getDuration("duration", 10*60, 1);
 	}
 
 	void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
@@ -93,11 +78,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",
@@ -114,7 +100,7 @@ class ModuleConnectBan : public Module
 
 	void OnGarbageCollect()
 	{
-		ServerInstance->Logs->Log("m_connectban",LOG_DEBUG, "Clearing map.");
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map.");
 		connects.clear();
 	}
 };