Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index c72e183906a5e5350a0705fe71569f84d16ef6bf..5f8cfeca7414871d135cd6caf13c0d5ebb0666af 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -26,7 +26,7 @@ enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
 /** Holds a CGI site's details
  */
-class CGIhost : public classbase
+class CGIhost
 {
 public:
        std::string hostmask;
@@ -61,11 +61,12 @@ class CommandWebirc : public Command
        LocalStringExt webirc_ip;
 
        CGIHostlist Hosts;
-       CommandWebirc(InspIRCd* Instance, Module* Creator, bool bnotify)
-               : Command(Instance, Creator, "WEBIRC", 0, 4, true), notify(bnotify),
+       CommandWebirc(Module* Creator, bool bnotify)
+               : Command(Creator, "WEBIRC", 4), notify(bnotify),
                  realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
                  webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
                {
+                       works_before_reg = true;
                        this->syntax = "password client hostname ip";
                }
                CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -105,8 +106,8 @@ class CGIResolver : public Resolver
        User* them;
        bool notify;
  public:
-       CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
-               : Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+       CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
+               : Resolver(source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
        virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
@@ -145,17 +146,17 @@ class ModuleCgiIRC : public Module
        CommandWebirc cmd;
        bool NotifyOpers;
 public:
-       ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(Me, this, NotifyOpers)
+       ModuleCgiIRC() : cmd(this, NotifyOpers)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmd);
-               Extensible::Register(&cmd.realhost);
-               Extensible::Register(&cmd.realip);
-               Extensible::Register(&cmd.webirc_hostname);
-               Extensible::Register(&cmd.webirc_ip);
+               ServerInstance->Extensions.Register(&cmd.realhost);
+               ServerInstance->Extensions.Register(&cmd.realip);
+               ServerInstance->Extensions.Register(&cmd.webirc_hostname);
+               ServerInstance->Extensions.Register(&cmd.webirc_ip);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
 
 
@@ -166,7 +167,7 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                cmd.Hosts.clear();
 
                NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed.
@@ -213,7 +214,7 @@ public:
                }
        }
 
-       virtual ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
                {
@@ -252,7 +253,7 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserConnect(User* user)
+       virtual void OnUserConnect(LocalUser* user)
        {
                std::string *webirc_hostname = cmd.webirc_hostname.get(user);
                std::string *webirc_ip = cmd.webirc_ip.get(user);
@@ -276,7 +277,7 @@ public:
                }
        }
 
-       bool CheckPass(User* user)
+       bool CheckPass(LocalUser* user)
        {
                if(IsValidHost(user->password))
                {
@@ -306,7 +307,7 @@ public:
                                {
 
                                        bool cached;
-                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+                                       CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
                                        ServerInstance->AddResolver(r, cached);
                                }
                                catch (...)
@@ -323,7 +324,7 @@ public:
                return false;
        }
 
-       bool CheckIdent(User* user)
+       bool CheckIdent(LocalUser* user)
        {
                const char* ident;
                int len = user->ident.length();
@@ -357,7 +358,7 @@ public:
                {
 
                        bool cached;
-                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
+                       CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
                        ServerInstance->AddResolver(r, cached);
                }
                catch (...)
@@ -433,7 +434,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
        }
 
 };