X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_connflood.cpp;h=107798e3444ce501ac10239e9ddb6eb0279c89a4;hb=83137d5f9274832f152acc7d19de3cb0897f9630;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..107798e34 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Connection throttle */
@@ -31,10 +28,12 @@ private:
 	
 
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
+	ModuleConnFlood(InspIRCd* Me) : Module(Me)
 	{
 		
 		InitConf();
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleConnFlood()
@@ -46,10 +45,6 @@ public:
 		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnUserRegister] = 1;
-	}
    
 	void InitConf()
 	{
@@ -67,12 +62,13 @@ public:
 		first = ServerInstance->Time();
 	}
  
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* 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;
 
@@ -85,10 +81,10 @@ public:
 			{
 				/* expire throttle */
 				throttled = 0;
-				ServerInstance->WriteOpers("*** Connection throttle deactivated");
+				ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle deactivated");
 				return 0;
 			}
-			userrec::QuitUser(ServerInstance, user, quitmsg);
+			User::QuitUser(ServerInstance, user, quitmsg);
 			return 1;
 		}
 
@@ -97,8 +93,8 @@ public:
 			if (conns >= maxconns)
 			{
 				throttled = 1;
-				ServerInstance->WriteOpers("*** Connection throttle activated");
-				userrec::QuitUser(ServerInstance, user, quitmsg);
+				ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle activated");
+				User::QuitUser(ServerInstance, user, quitmsg);
 				return 1;
 			}
 		}
@@ -110,33 +106,11 @@ public:
 		return 0;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* 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)