X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=419dbab9c3a5bf5e18f9859946c3d1b035751268;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=519088324868a5aaf1bea41f82f465f4005dc5cf;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 519088324..419dbab9c 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Connection throttle */
@@ -28,13 +25,14 @@ private:
 	std::string quitmsg;
 
 	ConfigReader* conf;
-	
+
 
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
-	{
-		
+	ModuleConnFlood() 	{
+
 		InitConf();
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleConnFlood()
@@ -43,18 +41,13 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version("Connection throttle", VF_VENDOR,API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnUserRegister] = 1;
-	}
-   
 	void InitConf()
 	{
 		/* read configuration variables */
-		conf = new ConfigReader(ServerInstance);
+		conf = new ConfigReader;
 		/* throttle configuration */
 		seconds = conf->ReadInteger("connflood", "seconds", 0, true);
 		maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
@@ -66,12 +59,13 @@ public:
 
 		first = ServerInstance->Time();
 	}
- 
-	virtual int OnUserRegister(userrec* user)
+
+	virtual ModResult OnUserRegister(User* user)
 	{
 		time_t next = ServerInstance->Time();
-		if (!first)
-			first = next - boot_wait;
+
+		if ((ServerInstance->startup_time + boot_wait) > next)
+			return MOD_RES_PASSTHRU;
 
 		/* time difference between first and latest connection */
 		time_t tdiff = next - first;
@@ -85,11 +79,12 @@ public:
 			{
 				/* expire throttle */
 				throttled = 0;
-				ServerInstance->WriteOpers("*** Connection throttle deactivated");
-				return 0;
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
+				return MOD_RES_PASSTHRU;
 			}
-			userrec::QuitUser(ServerInstance, user, quitmsg);
-			return 1;
+
+			ServerInstance->Users->QuitUser(user, quitmsg);
+			return MOD_RES_DENY;
 		}
 
 		if (tdiff <= seconds)
@@ -97,9 +92,9 @@ public:
 			if (conns >= maxconns)
 			{
 				throttled = 1;
-				ServerInstance->WriteOpers("*** Connection throttle activated");
-				userrec::QuitUser(ServerInstance, user, quitmsg);
-				return 1;
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
+				ServerInstance->Users->QuitUser(user, quitmsg);
+				return MOD_RES_DENY;
 			}
 		}
 		else
@@ -107,36 +102,14 @@ public:
 			conns = 1;
 			first = next;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		InitConf();
 	}
 
 };
 
-
-class ModuleConnFloodFactory : public ModuleFactory
-{
-public:
-	ModuleConnFloodFactory()
-	{
-	}
-
-	~ModuleConnFloodFactory()
-	{
-	}
-    
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleConnFlood(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)