X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_connflood.cpp;h=f77691e3276a8efe2f6649b4da04d31a588b79fc;hb=09186df9f8c0d4f699b5abb4325d7dd583a8a0b1;hp=d0e9257168c0ec038c5c39ff1504e42688ecc098;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index d0e925716..f77691e32 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -23,25 +23,27 @@
 
 /* $ModDesc: Connection throttle */
 
-int conns = 0, throttled = 0;
-
 class ModuleConnFlood : public Module
 {
 private:
-	int seconds, maxconns, timeout, boot_wait;
+	int seconds, timeout, boot_wait;
+	unsigned int conns;
+	unsigned int maxconns;
+	bool throttled;
 	time_t first;
 	std::string quitmsg;
 
 public:
-	ModuleConnFlood() 	{
-
-		InitConf();
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	ModuleConnFlood()
+		: conns(0), throttled(false)
+	{
 	}
 
-	virtual ~ModuleConnFlood()
+	void init()
 	{
+		InitConf();
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual Version GetVersion()
@@ -52,21 +54,24 @@ public:
 	void InitConf()
 	{
 		/* read configuration variables */
-		ConfigReader conf;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
 		/* 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 = tag->getInt("seconds");
+		maxconns = tag->getInt("maxconns");
+		timeout = tag->getInt("timeout");
+		quitmsg = tag->getString("quitmsg");
 
 		/* seconds to wait when the server just booted */
-		boot_wait = conf.ReadInteger("connflood", "bootwait", 0, true);
+		boot_wait = tag->getInt("bootwait");
 
 		first = ServerInstance->Time();
 	}
 
 	virtual ModResult OnUserRegister(LocalUser* user)
 	{
+		if (user->exempt)
+			return MOD_RES_PASSTHRU;
+
 		time_t next = ServerInstance->Time();
 
 		if ((ServerInstance->startup_time + boot_wait) > next)
@@ -78,12 +83,12 @@ public:
 		/* increase connection count */
 		conns++;
 
-		if (throttled == 1)
+		if (throttled)
 		{
 			if (tdiff > seconds + timeout)
 			{
 				/* expire throttle */
-				throttled = 0;
+				throttled = false;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
 				return MOD_RES_PASSTHRU;
 			}
@@ -96,7 +101,7 @@ public:
 		{
 			if (conns >= maxconns)
 			{
-				throttled = 1;
+				throttled = true;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
 				ServerInstance->Users->QuitUser(user, quitmsg);
 				return MOD_RES_DENY;