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

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 95b55c0c0..419dbab9c 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -28,8 +28,7 @@ private:
 
 
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module(Me)
-	{
+	ModuleConnFlood() 	{
 
 		InitConf();
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
@@ -42,13 +41,13 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", 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,12 +60,12 @@ 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;
@@ -80,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)
@@ -93,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
@@ -103,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();
 	}