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 ffa2fba83c0c777e906865c93246426d639cd617..d6d9eee0fc0be984539026f77ff95f964bcdf790 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,26 +1,16 @@
-/*   +------------------------------------+
- *   | 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 */
@@ -38,7 +28,7 @@ private:
        
 
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
+       ModuleConnFlood(InspIRCd* Me) : Module(Me)
        {
                
                InitConf();
@@ -50,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)
@@ -74,12 +64,13 @@ public:
                first = ServerInstance->Time();
        }
  
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                time_t next = ServerInstance->Time();
-               if (!first)
-                       first = next - boot_wait;
-
+               
+               if ((ServerInstance->startup_time + boot_wait) > next)
+                       return 0;
+               
                /* time difference between first and latest connection */
                time_t tdiff = next - first;
 
@@ -93,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)
@@ -105,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
@@ -114,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(InspIRCd* Me)
-       {
-               return new ModuleConnFlood(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)