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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 47b19fdf4..d25b6abfc 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
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 
 /* $ModDesc: Connection throttle */
 
@@ -27,13 +25,15 @@ private:
 	std::string quitmsg;
 
 	ConfigReader* conf;
-	
+
 
 public:
 	ModuleConnFlood(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		InitConf();
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleConnFlood()
@@ -42,14 +42,9 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnUserRegister] = 1;
-	}
-   
 	void InitConf()
 	{
 		/* read configuration variables */
@@ -65,14 +60,14 @@ public:
 
 		first = ServerInstance->Time();
 	}
- 
-	virtual int OnUserRegister(userrec* user)
+
+	virtual int OnUserRegister(User* user)
 	{
 		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;
 
@@ -85,10 +80,11 @@ public:
 			{
 				/* expire throttle */
 				throttled = 0;
-				ServerInstance->WriteOpers("*** Connection throttle deactivated");
+				ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle deactivated");
 				return 0;
 			}
-			userrec::QuitUser(ServerInstance, user, quitmsg);
+
+			ServerInstance->Users->QuitUser(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");
+				ServerInstance->Users->QuitUser(user, quitmsg);
 				return 1;
 			}
 		}
@@ -110,7 +106,7 @@ public:
 		return 0;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		InitConf();
 	}