X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=e3fea05218933858ab01382660f92d2717dacb5f;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=85ea0a84d0a9e60ff9847343304dad162c0b74a1;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 85ea0a84d..e3fea0521 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,34 +1,21 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *     --- 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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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
 {
@@ -38,12 +25,12 @@ private:
 	std::string quitmsg;
 
 	ConfigReader* conf;
-	Server *Srv;
+	
 
 public:
-	ModuleConnFlood(Server* Me) : Module::Module(Me)
+	ModuleConnFlood(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
+		
 		InitConf();
 	}
 
@@ -53,7 +40,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,0);
+		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
@@ -64,7 +51,7 @@ public:
 	void InitConf()
 	{
 		/* read configuration variables */
-		conf = new ConfigReader;
+		conf = new ConfigReader(ServerInstance);
 		/* throttle configuration */
 		seconds = conf->ReadInteger("connflood", "seconds", 0, true);
 		maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
@@ -74,15 +61,16 @@ public:
 		/* seconds to wait when the server just booted */
 		boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
 
-		first = TIME;
+		first = ServerInstance->Time();
 	}
  
-	virtual void OnUserRegister(userrec* user)
+	virtual int OnUserRegister(userrec* user)
 	{
-		time_t next = TIME;
-		if (!first)
-			first = next - boot_wait;
-
+		time_t next = ServerInstance->Time();
+		
+		if ((ServerInstance->startup_time + boot_wait) > next)
+			return 0;
+		
 		/* time difference between first and latest connection */
 		time_t tdiff = next - first;
 
@@ -96,10 +84,10 @@ public:
 				/* expire throttle */
 				throttled = 0;
 				ServerInstance->WriteOpers("*** Connection throttle deactivated");
-				return;
+				return 0;
 			}
 			userrec::QuitUser(ServerInstance, user, quitmsg);
-			return;
+			return 1;
 		}
 
 		if (tdiff <= seconds)
@@ -109,7 +97,7 @@ public:
 				throttled = 1;
 				ServerInstance->WriteOpers("*** Connection throttle activated");
 				userrec::QuitUser(ServerInstance, user, quitmsg);
-				return;
+				return 1;
 			}
 		}
 		else
@@ -117,35 +105,14 @@ public:
 			conns = 1;
 			first = next;
 		}
+		return 0;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		InitConf();
 	}
 
 };
 
-
-class ModuleConnFloodFactory : public ModuleFactory
-{
-public:
-	ModuleConnFloodFactory()
-	{
-	}
-
-	~ModuleConnFloodFactory()
-	{
-	}
-    
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleConnFlood(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)