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 1cfacf480dddfb3d34a3dbebab2845a7fefc3f15..d6d9eee0fc0be984539026f77ff95f964bcdf790 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 */
@@ -67,7 +64,7 @@ public:
                first = ServerInstance->Time();
        }
  
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                time_t next = ServerInstance->Time();
                
@@ -89,7 +86,7 @@ public:
                                ServerInstance->WriteOpers("*** Connection throttle deactivated");
                                return 0;
                        }
-                       userrec::QuitUser(ServerInstance, user, quitmsg);
+                       User::QuitUser(ServerInstance, user, quitmsg);
                        return 1;
                }
 
@@ -99,7 +96,7 @@ public:
                        {
                                throttled = 1;
                                ServerInstance->WriteOpers("*** Connection throttle activated");
-                               userrec::QuitUser(ServerInstance, user, quitmsg);
+                               User::QuitUser(ServerInstance, user, quitmsg);
                                return 1;
                        }
                }
@@ -111,33 +108,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" DllExport void * init_module( void )
-{
-       return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood)