X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=5070dd3a76b26e6e629f71b4415451e104c43ca3;hb=3d0d64933da3d37866fadfa042e34a1125315db6;hp=b1a9d8c7ce7e4e0ab7f94c78e6e934ef4fd1d33f;hpb=9bc04a302572eb311a147a32ff1d36f1d91f2d7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index b1a9d8c7c..5070dd3a7 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,87 +1,73 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- *     --- This module contributed by pippijn ---
- * 
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
-/* $ModDesc: Connection throttle */
-
-int conns = 0, throttled = 0;
-extern time_t TIME;
-
-extern InspIRCd* ServerInstance;
-
 class ModuleConnFlood : public Module
 {
-private:
-	int seconds, maxconns, timeout, boot_wait;
+	unsigned int seconds;
+	unsigned int timeout;
+	unsigned int boot_wait;
+	unsigned int conns;
+	unsigned int maxconns;
+	bool throttled;
 	time_t first;
 	std::string quitmsg;
 
-	ConfigReader* conf;
-	Server *Srv;
-
 public:
-	ModuleConnFlood(Server* Me) : Module::Module(Me)
-	{
-		Srv = Me;
-		InitConf();
-	}
-
-	virtual ~ModuleConnFlood()
+	ModuleConnFlood()
+		: conns(0), throttled(false)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,0,0,0,0);
+		return Version("Connection throttle", VF_VENDOR);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnUserRegister] = 1;
-	}
-   
-	void InitConf()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		/* read configuration variables */
-		conf = new ConfigReader;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
 		/* throttle configuration */
-		seconds = conf->ReadInteger("connflood", "seconds", 0, true);
-		maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
-		timeout = conf->ReadInteger("connflood", "timeout", 0, true);
-		quitmsg = conf->ReadValue("connflood", "quitmsg", 0);
+		seconds = tag->getDuration("period", tag->getDuration("seconds", 30));
+		maxconns = tag->getUInt("maxconns", 3);
+		timeout = tag->getDuration("timeout", 30);
+		quitmsg = tag->getString("quitmsg");
 
 		/* seconds to wait when the server just booted */
-		boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
+		boot_wait = tag->getDuration("bootwait", 10);
 
-		first = TIME;
+		first = ServerInstance->Time();
 	}
- 
-	virtual void OnUserRegister(userrec* user)
+
+	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
-		time_t next = TIME;
-		if (!first)
-			first = next - boot_wait;
+		if (user->exempt)
+			return MOD_RES_PASSTHRU;
+
+		time_t next = ServerInstance->Time();
+
+		if ((ServerInstance->startup_time + boot_wait) > next)
+			return MOD_RES_PASSTHRU;
 
 		/* time difference between first and latest connection */
 		time_t tdiff = next - first;
@@ -89,27 +75,28 @@ public:
 		/* increase connection count */
 		conns++;
 
-		if (throttled == 1)
+		if (throttled)
 		{
 			if (tdiff > seconds + timeout)
 			{
 				/* expire throttle */
-				throttled = 0;
-				Srv->SendOpers("*** Connection throttle deactivated");
-				return;
+				throttled = false;
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
+				return MOD_RES_PASSTHRU;
 			}
-			userrec::QuitUser(ServerInstance, user, quitmsg);
-			return;
+
+			ServerInstance->Users->QuitUser(user, quitmsg);
+			return MOD_RES_DENY;
 		}
 
 		if (tdiff <= seconds)
 		{
 			if (conns >= maxconns)
 			{
-				throttled = 1;
-				Srv->SendOpers("*** Connection throttle activated");
-				userrec::QuitUser(ServerInstance, user, quitmsg);
-				return;
+				throttled = true;
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
+				ServerInstance->Users->QuitUser(user, quitmsg);
+				return MOD_RES_DENY;
 			}
 		}
 		else
@@ -117,35 +104,8 @@ public:
 			conns = 1;
 			first = next;
 		}
-	}
-
-	virtual void OnRehash(const std::string &parameter)
-	{
-		InitConf();
-	}
-
-};
-
-
-class ModuleConnFloodFactory : public ModuleFactory
-{
-public:
-	ModuleConnFloodFactory()
-	{
-	}
-
-	~ModuleConnFloodFactory()
-	{
-	}
-    
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleConnFlood(Me);
+		return MOD_RES_PASSTHRU;
 	}
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)