X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=627e1c79e2e14dffcc11a89f04680bae54edf5b2;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=cb5c8575561aacbda935ece783e9fbe5d049b273;hpb=b0884a94ef85f28fa964adc1b4f0732f2986ca7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index cb5c85755..627e1c79e 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -24,12 +24,8 @@ private:
 	time_t first;
 	std::string quitmsg;
 
-	ConfigReader* conf;
-
-
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module(Me)
-	{
+	ModuleConnFlood() 	{
 
 		InitConf();
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
@@ -42,31 +38,31 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Connection throttle", VF_VENDOR);
 	}
 
 	void InitConf()
 	{
 		/* read configuration variables */
-		conf = new ConfigReader(ServerInstance);
+		ConfigReader conf;
 		/* throttle configuration */
-		seconds = conf->ReadInteger("connflood", "seconds", 0, true);
-		maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
-		timeout = conf->ReadInteger("connflood", "timeout", 0, true);
-		quitmsg = conf->ReadValue("connflood", "quitmsg", 0);
+		seconds = conf.ReadInteger("connflood", "seconds", 0, true);
+		maxconns = conf.ReadInteger("connflood", "maxconns", 0, true);
+		timeout = conf.ReadInteger("connflood", "timeout", 0, true);
+		quitmsg = conf.ReadValue("connflood", "quitmsg", 0);
 
 		/* seconds to wait when the server just booted */
-		boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
+		boot_wait = conf.ReadInteger("connflood", "bootwait", 0, true);
 
 		first = ServerInstance->Time();
 	}
 
-	virtual int OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(LocalUser* 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,11 +77,11 @@ public:
 				/* expire throttle */
 				throttled = 0;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 
 			ServerInstance->Users->QuitUser(user, quitmsg);
-			return 1;
+			return MOD_RES_DENY;
 		}
 
 		if (tdiff <= seconds)
@@ -95,7 +91,7 @@ public:
 				throttled = 1;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
 				ServerInstance->Users->QuitUser(user, quitmsg);
-				return 1;
+				return MOD_RES_DENY;
 			}
 		}
 		else
@@ -103,10 +99,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();
 	}