Prevent using invalid UIDs and enforce UID/SID matching

[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 95c40d65e27037ebe1da5c71adddaa1b7673788f..20c7e5bc21b731d485448557c84bcaecfc471361 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,13 +12,12 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */
 
 /** Holds information on a host set by m_hostchange
  */
-class Host : public classbase
+class Host
 {
  public:
        std::string action;
@@ -37,10 +36,9 @@ class ModuleHostChange : public Module
        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);
        }
@@ -57,13 +55,13 @@ class ModuleHostChange : public Module
        void Prioritize()
        {
                Module* cloak = ServerInstance->Modules->Find("m_cloaking.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &cloak);
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &cloak);
        }
 
 
-       virtual void OnRehash(User* 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);
@@ -90,14 +88,14 @@ class ModuleHostChange : public Module
        {
                // returns the version number of the module to be
                // listed in /MODULES
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR);
        }
 
-       virtual void OnUserConnect(User* user)
+       virtual void OnUserConnect(LocalUser* user)
        {
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       if (((match(user->MakeHost(), i->first, true)) || (match(user->MakeHostIP(), i->first))))
+                       if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first))))
                        {
                                Host* h = i->second;
 
@@ -108,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)