Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index cf85a3900f3037969c61ac147ba570de1599ac79..cb5ab6925396ad4530239f1c88ca5b1cc32063ec 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */
 
@@ -35,42 +34,40 @@ class ModuleHostChange : public Module
        std::string MySuffix;
        std::string MyPrefix;
        std::string MySeparator;
-        
+
  public:
-       ModuleHostChange(InspIRCd* Me)
-               : Module(Me)
-       {
-               OnRehash(NULL,"");
+       ModuleHostChange()
+                       {
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       
+
        virtual ~ModuleHostChange()
        {
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       DELETE(i->second);
+                       delete i->second;
                }
                hostchanges.clear();
        }
 
-       Priority Prioritize()
+       void Prioritize()
        {
-               return (Priority)ServerInstance->PriorityAfter("m_cloaking.so");
+               Module* cloak = ServerInstance->Modules->Find("m_cloaking.so");
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &cloak);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserConnect] = 1;
-       }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                MySuffix = Conf.ReadValue("host","suffix",0);
                MyPrefix = Conf.ReadValue("host","prefix","",0);
                MySeparator = Conf.ReadValue("host","separator",".",0);
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       DELETE(i->second);
+                       delete i->second;
                }
                hostchanges.clear();
                for (int index = 0; index < Conf.Enumerate("hostchange"); index++)
@@ -86,19 +83,19 @@ class ModuleHostChange : public Module
                        hostchanges[mask] = x;
                }
        }
-       
+
        virtual Version GetVersion()
        {
                // returns the version number of the module to be
                // listed in /MODULES
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR, API_VERSION);
        }
-       
-       virtual void OnUserConnect(userrec* user)
+
+       virtual void OnUserConnect(User* user)
        {
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       if (((match(user->MakeHost(),i->first.c_str(),true)) || (match(user->MakeHostIP(),i->first.c_str()))))
+                       if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first))))
                        {
                                Host* h = i->second;
 
@@ -109,7 +106,7 @@ class ModuleHostChange : public Module
                                        bool foundany = false;
 
                                        while ((portno = portrange.GetToken()))
-                                               if (portno == user->GetPort())
+                                               if (portno == user->GetServerPort())
                                                        foundany = true;
 
                                        if (!foundany)
@@ -143,7 +140,7 @@ class ModuleHostChange : public Module
                                        }
                                        if (complete.empty())
                                                complete = "i-have-a-lame-nick";
-                                               
+
                                        if (!MyPrefix.empty())
                                                newhost = MyPrefix + MySeparator + complete;
                                        else