Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f65b89ccf407326341d6f55a0271afc8e1cb7e86..43359c28a04c4bfce40bd3e969d65cbd57c6e75c 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -21,7 +21,8 @@ class Shun : public XLine
 public:
        std::string matchtext;
 
-       Shun(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *shunmask) : XLine(Instance, s_time, d, src, re, "SHUN")
+       Shun(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string shunmask)
+               : XLine(Instance, s_time, d, src, re, "SHUN")
        {
                this->matchtext = shunmask;
        }
@@ -32,6 +33,10 @@ public:
 
        bool Matches(User *u)
        {
+               // E: overrides shun
+               if (u->exempt)
+                       return false;
+
                if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext))
                        return true;
 
@@ -52,7 +57,8 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
+               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)",
+                       this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
        }
 
        const char* Displayable()
@@ -70,7 +76,7 @@ class ShunFactory : public XLineFactory
 
        /** Generate a shun
        */
-       XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
        {
                return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
        }
@@ -81,9 +87,8 @@ class ShunFactory : public XLineFactory
 class CommandShun : public Command
 {
  public:
-       CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3)
+       CommandShun(InspIRCd* Me, Module* Creator) : Command(Me, Creator, "SHUN", "o", 1, 3)
        {
-               this->source = "m_shun.so";
                this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
        }
 
@@ -170,42 +175,39 @@ class CommandShun : public Command
 
 class ModuleShun : public Module
 {
-       CommandShun* mycommand;
-       ShunFactory *f;
+       CommandShun cmd;
+       ShunFactory f;
        std::set<std::string> ShunEnabledCommands;
        bool NotifyOfShun;
        bool affectopers;
 
  public:
-       ModuleShun(InspIRCd* Me) : Module(Me)
+       ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me, this), f(Me)
        {
-               f = new ShunFactory(ServerInstance);
-               ServerInstance->XLines->RegisterFactory(f);
-
-               mycommand = new CommandShun(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->XLines->RegisterFactory(&f);
+               ServerInstance->AddCommand(&cmd);
 
                Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 4);
-               OnRehash(NULL, "");
+               OnRehash(NULL);
        }
 
        virtual ~ModuleShun()
        {
                ServerInstance->XLines->DelAll("SHUN");
-               ServerInstance->XLines->UnregisterFactory(f);
+               ServerInstance->XLines->UnregisterFactory(&f);
        }
 
-       virtual int OnStats(char symbol, User* user, string_list& out)
+       virtual ModResult OnStats(char symbol, User* user, string_list& out)
        {
                if (symbol != 'S')
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
-               return 1;
+               return MOD_RES_DENY;
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader MyConf(ServerInstance);
                std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
@@ -244,21 +246,21 @@ class ModuleShun : public Module
                }
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
        {
                if (validated)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (!ServerInstance->XLines->MatchesLine("SHUN", user))
                {
                        /* Not shunned, don't touch. */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                if (!affectopers && IS_OPER(user))
                {
                        /* Don't do anything if the user is an operator and affectopers isn't set */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
@@ -267,7 +269,7 @@ class ModuleShun : public Module
                {
                        if (NotifyOfShun)
                                user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
-                       return 1;
+                       return MOD_RES_DENY;
                }
 
                if (command == "QUIT")
@@ -282,7 +284,7 @@ class ModuleShun : public Module
                }
 
                /* if we're here, allow the command. */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()