Remove InspIRCd* parameters and fields

[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 a88ee38867caa69b1cbe92fa8da2280a4ef3fa10..419dbab9c3a5bf5e18f9859946c3d1b035751268 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -28,8 +28,7 @@ private:
 
 
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module(Me)
-       {
+       ModuleConnFlood()       {
 
                InitConf();
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
@@ -42,13 +41,13 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Connection throttle", VF_VENDOR,API_VERSION);
        }
 
        void InitConf()
        {
                /* read configuration variables */
-               conf = new ConfigReader(ServerInstance);
+               conf = new ConfigReader;
                /* throttle configuration */
                seconds = conf->ReadInteger("connflood", "seconds", 0, true);
                maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
@@ -61,12 +60,12 @@ public:
                first = ServerInstance->Time();
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(User* user)
        {
                time_t next = ServerInstance->Time();
 
                if ((ServerInstance->startup_time + boot_wait) > next)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                /* time difference between first and latest connection */
                time_t tdiff = next - first;
@@ -80,12 +79,12 @@ public:
                        {
                                /* expire throttle */
                                throttled = 0;
-                               ServerInstance->SNO->WriteToSnoMask('a', "Connection throttle deactivated");
-                               return 0;
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
+                               return MOD_RES_PASSTHRU;
                        }
 
                        ServerInstance->Users->QuitUser(user, quitmsg);
-                       return 1;
+                       return MOD_RES_DENY;
                }
 
                if (tdiff <= seconds)
@@ -93,9 +92,9 @@ public:
                        if (conns >= maxconns)
                        {
                                throttled = 1;
-                               ServerInstance->SNO->WriteToSnoMask('a', "Connection throttle activated");
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
                                ServerInstance->Users->QuitUser(user, quitmsg);
-                               return 1;
+                               return MOD_RES_DENY;
                        }
                }
                else
@@ -103,10 +102,10 @@ public:
                        conns = 1;
                        first = next;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                InitConf();
        }