Fix memory leak and invalid vtable location on unload of m_sslinfo

[user/henk/code/inspircd.git] / src / modules / m_nickflood.cpp

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 1ed30f767d1f69fe9e54d7a36639f3c48be7171b..17f3a35f09d01b0ed94fc2cc24d9729e2765b185 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -90,7 +90,7 @@ class nickfloodsettings : public classbase
 class NickFlood : public ModeHandler
 {
  public:
-       NickFlood(InspIRCd* Instance) : ModeHandler(Instance, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       NickFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
@@ -101,13 +101,7 @@ class NickFlood : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
-       {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
-       }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                nickfloodsettings* dummy;
 
@@ -211,7 +205,7 @@ class ModuleNickFlood : public Module
  public:
 
        ModuleNickFlood(InspIRCd* Me)
-               : Module(Me), jf(Me)
+               : Module(Me), jf(Me, this)
        {
                if (!ServerInstance->Modes->AddMode(&jf))
                        throw ModuleException("Could not add new modes!");
@@ -219,10 +213,10 @@ class ModuleNickFlood : public Module
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual int OnUserPreNick(User* user, const std::string &newnick)
+       virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
        {
                if (isdigit(newnick[0])) /* allow switches to UID */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
@@ -237,7 +231,7 @@ class ModuleNickFlood : public Module
                                if (f->islocked())
                                {
                                        user->WriteNumeric(447, "%s :%s has been locked for nickchanges for 60 seconds because there have been more than %d nick changes in %d seconds", user->nick.c_str(), channel->name.c_str(), f->nicks, f->secs);
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
 
                                if (f->shouldlock())
@@ -245,12 +239,12 @@ class ModuleNickFlood : public Module
                                        f->clear();
                                        f->lock();
                                        channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :No nick changes are allowed for 60 seconds because there have been more than %d nick changes in %d seconds.", channel->name.c_str(), f->nicks, f->secs);
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        /*