fix some unitialised vectors and tidy up a bit.

[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 c834605b0622419790586676f3269c1ad03be4ef..412a0965e28fef20f6b43815c133568b57cbe5ab 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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()
@@ -43,13 +42,9 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserRegister] = 1;
-       }
    
        void InitConf()
        {
@@ -67,7 +62,7 @@ public:
                first = ServerInstance->Time();
        }
  
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                time_t next = ServerInstance->Time();
                
@@ -86,10 +81,11 @@ public:
                        {
                                /* expire throttle */
                                throttled = 0;
-                               ServerInstance->WriteOpers("*** Connection throttle deactivated");
+                               ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle deactivated");
                                return 0;
                        }
-                       userrec::QuitUser(ServerInstance, user, quitmsg);
+
+                       ServerInstance->Users->QuitUser(user, quitmsg);
                        return 1;
                }
 
@@ -98,8 +94,8 @@ public:
                        if (conns >= maxconns)
                        {
                                throttled = 1;
-                               ServerInstance->WriteOpers("*** Connection throttle activated");
-                               userrec::QuitUser(ServerInstance, user, quitmsg);
+                               ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle activated");
+                               ServerInstance->Users->QuitUser(user, quitmsg);
                                return 1;
                        }
                }
@@ -111,33 +107,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)