Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 40a007c2c8da0c2790c94e001a5f7f1a67896004..180d583769b864c30ec629f560022a4413c2f7bd 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,19 +19,17 @@
  */
 class joinfloodsettings : public classbase
 {
+ private:
+       InspIRCd* ServerInstance;
  public:
-
        int secs;
        int joins;
        time_t reset;
        time_t unlocktime;
        int counter;
        bool locked;
-       InspIRCd* ServerInstance;
-
-       joinfloodsettings() : secs(0), joins(0) {};
 
-       joinfloodsettings(int b, int c) : secs(b), joins(c)
+       joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c)
        {
                reset = ServerInstance->Time() + secs;
                counter = 0;
@@ -88,7 +86,7 @@ class joinfloodsettings : public classbase
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       JoinFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
@@ -99,13 +97,7 @@ class JoinFlood : 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)
        {
                joinfloodsettings* dummy;
 
@@ -144,10 +136,9 @@ class JoinFlood : public ModeHandler
                                        if (!channel->GetExt("joinflood", dummy))
                                        {
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-                                               joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
+                                               joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins);
                                                channel->Extend("joinflood", f);
-                                               channel->SetMode('j', true);
-                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                               channel->SetModeParam('j', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -167,11 +158,10 @@ class JoinFlood : public ModeHandler
                                                                joinfloodsettings* f;
                                                                channel->GetExt("joinflood", f);
                                                                delete f;
-                                                               f = new joinfloodsettings(nsecs,njoins);
+                                                               f = new joinfloodsettings(ServerInstance, nsecs, njoins);
                                                                channel->Shrink("joinflood");
                                                                channel->Extend("joinflood", f);
-                                                               channel->SetModeParam('j', cur_param.c_str(), false);
-                                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                                               channel->SetModeParam('j', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -196,7 +186,7 @@ class JoinFlood : public ModeHandler
                                channel->GetExt("joinflood", f);
                                delete f;
                                channel->Shrink("joinflood");
-                               channel->SetMode('j', false);
+                               channel->SetModeParam('j', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -207,22 +197,21 @@ class JoinFlood : public ModeHandler
 class ModuleJoinFlood : public Module
 {
 
-       JoinFlood* jf;
+       JoinFlood jf;
 
  public:
 
        ModuleJoinFlood(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), jf(Me, this)
        {
 
-               jf = new JoinFlood(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(jf))
+               if (!ServerInstance->Modes->AddMode(&jf))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
@@ -232,14 +221,14 @@ class ModuleJoinFlood : public Module
                                if (f->islocked())
                                {
                                        user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
        {
                joinfloodsettings *f;
 
@@ -273,8 +262,7 @@ class ModuleJoinFlood : public Module
 
        virtual ~ModuleJoinFlood()
        {
-               ServerInstance->Modes->DelMode(jf);
-               delete jf;
+               ServerInstance->Modes->DelMode(&jf);
        }
 
        virtual Version GetVersion()