X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=19408046fcc4356889d07d8e31d5090140bfae68;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=a1ff0816c2baa6ab45c4cc208b2d6f1843914904;hpb=c3e52465901f11226616a2a93393c3d07295b45d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index a1ff0816c..19408046f 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -16,34 +16,44 @@
 
 /* $ModDesc: Throttles the connections of any users who try connect flood */
 
-class ModuleQuitBan : public Module
+class ModuleConnectBan : public Module
 {
  private:
 	clonemap connects;
 	unsigned int threshold;
 	unsigned int banduration;
+	unsigned int ipv4_cidr;
+	unsigned int ipv6_cidr;
  public:
-	ModuleQuitBan(InspIRCd* Me) : Module(Me)
+	ModuleConnectBan(InspIRCd* Me) : Module(Me)
 	{
 		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 	}
-	
-	virtual ~ModuleQuitBan()
+
+	virtual ~ModuleConnectBan()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string duration;
 
+		ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
+		if (ipv4_cidr == 0)
+			ipv4_cidr = 32;
+
+		ipv6_cidr = Conf.ReadInteger("connectban", "ipv6cidr", 0, true);
+		if (ipv6_cidr == 0)
+			ipv6_cidr = 128;
+
 		threshold = Conf.ReadInteger("connectban", "threshold", 0, true);
 
 		if (threshold == 0)
@@ -59,38 +69,55 @@ class ModuleQuitBan : public Module
 
 	virtual void OnUserConnect(User *u)
 	{
-		clonemap::iterator i = connects.find(u->GetIPString());
+		int range = 32;
+		clonemap::iterator i;
+
+		switch (u->GetProtocolFamily())
+		{
+	#ifdef SUPPORT_IP6LINKS
+			case AF_INET6:
+			{
+				range = ipv6_cidr;
+			}
+			break;
+	#endif
+			case AF_INET:
+			{
+				range = ipv4_cidr;
+			}
+			break;
+		}
+
+		i = connects.find(u->GetCIDRMask(range));
 
 		if (i != connects.end())
 		{
 			i->second++;
-			ServerInstance->Logs->Log("m_connectban",DEBUG, "Count for IP is now %d", i->second);
 
 			if (i->second >= threshold)
 			{
 				// Create zline for set duration.
-				ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetIPString());
+				ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetCIDRMask(range));
 				if (ServerInstance->XLines->AddLine(zl,NULL))
 					ServerInstance->XLines->ApplyLines();
 				else
 					delete zl;
 
-				ServerInstance->SNO->WriteToSnoMask('x', "Connect flooding from IP %s (%d)", u->GetIPString(), threshold);
+				ServerInstance->SNO->WriteToSnoMask('x', "Connect flooding from IP range %s (%d)", u->GetCIDRMask(range), threshold);
 				connects.erase(i);
 			}
 		}
 		else
 		{
-			connects[u->GetIPString()] = 1;
-			ServerInstance->Logs->Log("m_quitban",DEBUG, "Added new record");
+			connects[u->GetCIDRMask(range)] = 1;
 		}
 	}
 
 	virtual void OnGarbageCollect()
 	{
-		ServerInstance->Logs->Log("m_quitban",DEBUG, "Clearing map.");
+		ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map.");
 		connects.clear();
 	}
 };
 
-MODULE_INIT(ModuleQuitBan)
+MODULE_INIT(ModuleConnectBan)