Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_connflood.cpp

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 32d36188b3ec26abe63f85c949288812d83301f4..1f8286e77a8a21cf31a48d8a6b246094fd85cc0a 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -23,6 +27,7 @@
 
 class ModuleConnFlood : public Module
 {
+ private:
        unsigned int seconds;
        unsigned int timeout;
        unsigned int boot_wait;
@@ -32,6 +37,16 @@ class ModuleConnFlood : public Module
        time_t first;
        std::string quitmsg;
 
+       static bool IsExempt(LocalUser* user)
+       {
+               // E-lined and already banned users shouldn't be hit.
+               if (user->exempt || user->quitting)
+                       return true;
+
+               // Users in an exempt class shouldn't be hit.
+               return user->GetClass() && !user->GetClass()->config->getBool("useconnflood", true);
+       }
+
 public:
        ModuleConnFlood()
                : conns(0), throttled(false)
@@ -40,7 +55,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Connection throttle", VF_VENDOR);
+               return Version("Throttles excessive connections to the server.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -49,19 +64,19 @@ public:
                ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
                /* throttle configuration */
                seconds = tag->getDuration("period", tag->getDuration("seconds", 30));
-               maxconns = tag->getInt("maxconns", 3);
+               maxconns = tag->getUInt("maxconns", 3);
                timeout = tag->getDuration("timeout", 30);
                quitmsg = tag->getString("quitmsg");
 
                /* seconds to wait when the server just booted */
-               boot_wait = tag->getDuration("bootwait", 10);
+               boot_wait = tag->getDuration("bootwait", 60*2);
 
                first = ServerInstance->Time();
        }
 
        ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
        {
-               if (user->exempt)
+               if (IsExempt(user))
                        return MOD_RES_PASSTHRU;
 
                time_t next = ServerInstance->Time();