In the grand tradition of huge fucking commits:

[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 85ea0a84d0a9e60ff9847343304dad162c0b74a1..d6d9eee0fc0be984539026f77ff95f964bcdf790 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,34 +1,21 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *     --- This module contributed by pippijn ---
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Connection throttle */
 
 int conns = 0, throttled = 0;
-extern time_t TIME;
-
-extern InspIRCd* ServerInstance;
 
 class ModuleConnFlood : public Module
 {
@@ -38,12 +25,12 @@ private:
        std::string quitmsg;
 
        ConfigReader* conf;
-       Server *Srv;
+       
 
 public:
-       ModuleConnFlood(Server* Me) : Module::Module(Me)
+       ModuleConnFlood(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
+               
                InitConf();
        }
 
@@ -53,7 +40,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,0);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 
        void Implements(char* List)
@@ -64,7 +51,7 @@ public:
        void InitConf()
        {
                /* read configuration variables */
-               conf = new ConfigReader;
+               conf = new ConfigReader(ServerInstance);
                /* throttle configuration */
                seconds = conf->ReadInteger("connflood", "seconds", 0, true);
                maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
@@ -74,15 +61,16 @@ public:
                /* seconds to wait when the server just booted */
                boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
 
-               first = TIME;
+               first = ServerInstance->Time();
        }
  
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
-               time_t next = TIME;
-               if (!first)
-                       first = next - boot_wait;
-
+               time_t next = ServerInstance->Time();
+               
+               if ((ServerInstance->startup_time + boot_wait) > next)
+                       return 0;
+               
                /* time difference between first and latest connection */
                time_t tdiff = next - first;
 
@@ -96,10 +84,10 @@ public:
                                /* expire throttle */
                                throttled = 0;
                                ServerInstance->WriteOpers("*** Connection throttle deactivated");
-                               return;
+                               return 0;
                        }
-                       userrec::QuitUser(ServerInstance, user, quitmsg);
-                       return;
+                       User::QuitUser(ServerInstance, user, quitmsg);
+                       return 1;
                }
 
                if (tdiff <= seconds)
@@ -108,8 +96,8 @@ public:
                        {
                                throttled = 1;
                                ServerInstance->WriteOpers("*** Connection throttle activated");
-                               userrec::QuitUser(ServerInstance, user, quitmsg);
-                               return;
+                               User::QuitUser(ServerInstance, user, quitmsg);
+                               return 1;
                        }
                }
                else
@@ -117,35 +105,14 @@ public:
                        conns = 1;
                        first = next;
                }
+               return 0;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                InitConf();
        }
 
 };
 
-
-class ModuleConnFloodFactory : public ModuleFactory
-{
-public:
-       ModuleConnFloodFactory()
-       {
-       }
-
-       ~ModuleConnFloodFactory()
-       {
-       }
-    
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleConnFlood(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)