Argh, i give up

[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 40d64520f73b13818d01be9984a4b156c5c2eedc..5cd50d028c74b10c631d0a46b4564bde64fbf0a6 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Connection throttle */
@@ -31,10 +28,12 @@ private:
        
 
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module::Module(Me)
+       ModuleConnFlood(InspIRCd* Me) : Module(Me)
        {
                
                InitConf();
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleConnFlood()
@@ -46,10 +45,6 @@ public:
                return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserRegister] = 1;
-       }
    
        void InitConf()
        {
@@ -67,12 +62,13 @@ public:
                first = ServerInstance->Time();
        }
  
-       virtual int 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;
 
@@ -88,7 +84,7 @@ public:
                                ServerInstance->WriteOpers("*** Connection throttle deactivated");
                                return 0;
                        }
-                       userrec::QuitUser(ServerInstance, user, quitmsg);
+                       User::QuitUser(ServerInstance, user, quitmsg);
                        return 1;
                }
 
@@ -98,7 +94,7 @@ public:
                        {
                                throttled = 1;
                                ServerInstance->WriteOpers("*** Connection throttle activated");
-                               userrec::QuitUser(ServerInstance, user, quitmsg);
+                               User::QuitUser(ServerInstance, user, quitmsg);
                                return 1;
                        }
                }
@@ -110,33 +106,11 @@ public:
                return 0;
        }
 
-       virtual void OnRehash(userrec* user, 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)