X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=e6bfdda1fab6e2d1ba1556a0d510d7ed2a6a56ac;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=798f06fb6f5704af2743bc0f9c63f8033507d88d;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 798f06fb6..e6bfdda1f 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -24,24 +24,20 @@
 
 class ModuleConnectBan : public Module
 {
- private:
 	clonemap connects;
 	unsigned int threshold;
 	unsigned int banduration;
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
+
  public:
 	void init()
 	{
-		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
+		Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
-	virtual ~ModuleConnectBan()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
@@ -63,13 +59,16 @@ class ModuleConnectBan : public Module
 		if (threshold == 0)
 			threshold = 10;
 
-		banduration = ServerInstance->Duration(tag->getString("duration", "10m"));
+		banduration = InspIRCd::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;
 
@@ -115,7 +114,7 @@ class ModuleConnectBan : public Module
 
 	virtual void OnGarbageCollect()
 	{
-		ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map.");
+		ServerInstance->Logs->Log("m_connectban",LOG_DEBUG, "Clearing map.");
 		connects.clear();
 	}
 };