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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 412a0965e..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-2008 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.
@@ -25,12 +25,11 @@ private:
 	std::string quitmsg;
 
 	ConfigReader* conf;
-	
+
 
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module(Me)
-	{
-		
+	ModuleConnFlood() 	{
+
 		InitConf();
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -42,14 +41,13 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("Connection throttle", VF_VENDOR,API_VERSION);
 	}
 
-   
 	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);
@@ -61,14 +59,14 @@ public:
 
 		first = ServerInstance->Time();
 	}
- 
-	virtual int OnUserRegister(User* user)
+
+	virtual ModResult OnUserRegister(User* user)
 	{
 		time_t next = ServerInstance->Time();
-		
+
 		if ((ServerInstance->startup_time + boot_wait) > next)
-			return 0;
-		
+			return MOD_RES_PASSTHRU;
+
 		/* time difference between first and latest connection */
 		time_t tdiff = next - first;
 
@@ -81,12 +79,12 @@ public:
 			{
 				/* expire throttle */
 				throttled = 0;
-				ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle deactivated");
-				return 0;
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
+				return MOD_RES_PASSTHRU;
 			}
 
 			ServerInstance->Users->QuitUser(user, quitmsg);
-			return 1;
+			return MOD_RES_DENY;
 		}
 
 		if (tdiff <= seconds)
@@ -94,9 +92,9 @@ public:
 			if (conns >= maxconns)
 			{
 				throttled = 1;
-				ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle activated");
+				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
 				ServerInstance->Users->QuitUser(user, quitmsg);
-				return 1;
+				return MOD_RES_DENY;
 			}
 		}
 		else
@@ -104,10 +102,10 @@ public:
 			conns = 1;
 			first = next;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		InitConf();
 	}