X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=47b19fdf4e7920636236c8199056ee51010ed3e4;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=a226fa1893e976e53d2df7ff56432d48b4e520cd;hpb=06fd57cc35c9d5869ca3a24d349b791963b2acc4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index a226fa189..47b19fdf4 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,28 +1,20 @@
-/*   +------------------------------------+
- *   | 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 "inspircd.h"
 #include "users.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Connection throttle */
 
 int conns = 0, throttled = 0;
@@ -38,7 +30,7 @@ private:
 	
 
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
+	ModuleConnFlood(InspIRCd* Me) : Module(Me)
 	{
 		
 		InitConf();
@@ -77,9 +69,10 @@ public:
 	virtual int OnUserRegister(userrec* user)
 	{
 		time_t next = ServerInstance->Time();
-		if (!first)
-			first = next - boot_wait;
-
+		
+		if ((ServerInstance->startup_time + boot_wait) > next)
+			return 0;
+		
 		/* time difference between first and latest connection */
 		time_t tdiff = next - first;
 
@@ -117,33 +110,11 @@ public:
 		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(InspIRCd* Me)
-	{
-		return new ModuleConnFlood(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)