Fixes found by removing User inheritance from StreamSocket

[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 04fe456275d659b9a259c91a5dc8084318c096d8..d2738fe181431e670b0ac8e814b7838590c261c6 100644 (file)
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -24,12 +24,8 @@ private:
        time_t first;
        std::string quitmsg;
 
-       ConfigReader* conf;
-
-
 public:
-       ModuleConnFlood(InspIRCd* Me) : Module(Me)
-       {
+       ModuleConnFlood()       {
 
                InitConf();
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
@@ -42,26 +38,26 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("Connection throttle", VF_VENDOR,API_VERSION);
+               return Version("Connection throttle", VF_VENDOR);
        }
 
        void InitConf()
        {
                /* read configuration variables */
-               conf = new ConfigReader(ServerInstance);
+               ConfigReader conf;
                /* throttle configuration */
-               seconds = conf->ReadInteger("connflood", "seconds", 0, true);
-               maxconns = conf->ReadInteger("connflood", "maxconns", 0, true);
-               timeout = conf->ReadInteger("connflood", "timeout", 0, true);
-               quitmsg = conf->ReadValue("connflood", "quitmsg", 0);
+               seconds = conf.ReadInteger("connflood", "seconds", 0, true);
+               maxconns = conf.ReadInteger("connflood", "maxconns", 0, true);
+               timeout = conf.ReadInteger("connflood", "timeout", 0, true);
+               quitmsg = conf.ReadValue("connflood", "quitmsg", 0);
 
                /* seconds to wait when the server just booted */
-               boot_wait = conf->ReadInteger("connflood", "bootwait", 0, true);
+               boot_wait = conf.ReadInteger("connflood", "bootwait", 0, true);
 
                first = ServerInstance->Time();
        }
 
-       virtual ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                time_t next = ServerInstance->Time();