m_services_account Fix possible recursion when checking 'U' extbans

[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 88f566d6d9a6b006597c2ace6bf1bab8417aa608..9d7c9cb2cf648014ea3e31d49fd0cbbe0cafcd57 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,67 +1,69 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $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;
 
-       ConfigReader* conf;
-
-
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module(Me)
+       ModuleConnFlood()
+               : conns(0), throttled(false)
        {
-
                InitConf();
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleConnFlood()
-       {
-       }
-
        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 ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                time_t next = ServerInstance->Time();
 
@@ -74,12 +76,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;
                        }
@@ -92,7 +94,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;