X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=26120add984381529a736bcd3af0f8b67b4e0d61;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=aebe9a4ca8a3eaa5ccbd6e45882e75d402633de0;hpb=02859be56d43bcece02aab350e02bc95ed1bf446;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index aebe9a4ca..26120add9 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -31,9 +31,10 @@ class ModuleConnectBan : public Module
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
  public:
-	ModuleConnectBan() 	{
-		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+	void init()
+	{
+		Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
@@ -48,32 +49,30 @@ class ModuleConnectBan : public Module
 
 	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)
+	virtual void OnSetUserIP(LocalUser* u)
 	{
+		if (u->exempt)
+			return;
+
 		int range = 32;
 		clonemap::iterator i;
 
@@ -98,11 +97,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",