X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=d13dc1e0a1f64922a5fce73c3e1a5ce9216771df;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=19408046fcc4356889d07d8e31d5090140bfae68;hpb=0da6b3a13def40e8fd002b9fc60f955467f6372d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 19408046f..d13dc1e0a 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -25,8 +25,7 @@ class ModuleConnectBan : public Module
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
  public:
-	ModuleConnectBan(InspIRCd* Me) : Module(Me)
-	{
+	ModuleConnectBan() 	{
 		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 		OnRehash(NULL);
@@ -38,12 +37,12 @@ class ModuleConnectBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Throttles the connections of any users who try connect flood", VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		std::string duration;
 
 		ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
@@ -72,19 +71,13 @@ class ModuleConnectBan : public Module
 		int range = 32;
 		clonemap::iterator i;
 
-		switch (u->GetProtocolFamily())
+		switch (u->client_sa.sa.sa_family)
 		{
-	#ifdef SUPPORT_IP6LINKS
 			case AF_INET6:
-			{
 				range = ipv6_cidr;
-			}
 			break;
-	#endif
 			case AF_INET:
-			{
 				range = ipv4_cidr;
-			}
 			break;
 		}
 
@@ -97,13 +90,15 @@ class ModuleConnectBan : public Module
 			if (i->second >= threshold)
 			{
 				// Create zline for set duration.
-				ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetCIDRMask(range));
+				ZLine* zl = new ZLine(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 range %s (%d)", u->GetCIDRMask(range), threshold);
+				ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding", 
+					u->GetCIDRMask(range), ServerInstance->TimeString(zl->expiry).c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", u->GetCIDRMask(range), threshold);
 				connects.erase(i);
 			}
 		}