X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=fcb4b09ed8dcb9c2a69473808458801007fd35ac;hb=f9fd78c01623514a060c607534fc52cb73140200;hp=39639927ce4dd6b81e95d85a5c758dd37f6b8694;hpb=c202dea024542b9c6c6b771bb9a3a081d9eacdc5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 39639927c..fcb4b09ed 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -22,11 +22,13 @@
 
 class ModuleConnectBan : public Module
 {
-	clonemap connects;
+	typedef std::map<irc::sockets::cidr_mask, unsigned int> ConnectMap;
+	ConnectMap connects;
 	unsigned int threshold;
 	unsigned int banduration;
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
+	std::string banmessage;
 
  public:
 	Version GetVersion() CXX11_OVERRIDE
@@ -42,6 +44,7 @@ class ModuleConnectBan : public Module
 		ipv6_cidr = tag->getInt("ipv6cidr", 128, 1, 128);
 		threshold = tag->getInt("threshold", 10, 1);
 		banduration = tag->getDuration("duration", 10*60, 1);
+		banmessage = tag->getString("banmessage", "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.");
 	}
 
 	void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
@@ -50,7 +53,6 @@ class ModuleConnectBan : public Module
 			return;
 
 		int range = 32;
-		clonemap::iterator i;
 
 		switch (u->client_sa.sa.sa_family)
 		{
@@ -63,7 +65,7 @@ class ModuleConnectBan : public Module
 		}
 
 		irc::sockets::cidr_mask mask(u->client_sa, range);
-		i = connects.find(mask);
+		ConnectMap::iterator i = connects.find(mask);
 
 		if (i != connects.end())
 		{
@@ -72,7 +74,7 @@ class ModuleConnectBan : public Module
 			if (i->second >= threshold)
 			{
 				// 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());
+				ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, banmessage, mask.str());
 				if (!ServerInstance->XLines->AddLine(zl, NULL))
 				{
 					delete zl;
@@ -80,7 +82,7 @@ class ModuleConnectBan : public Module
 				}
 				ServerInstance->XLines->ApplyLines();
 				std::string maskstr = mask.str();
-				std::string timestr = ServerInstance->TimeString(zl->expiry);
+				std::string timestr = InspIRCd::TimeString(zl->expiry);
 				ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding",
 					maskstr.c_str(), timestr.c_str());
 				ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", maskstr.c_str(), threshold);