Of course, it DOES help to actually initialise the Mutex objects, and delete them...

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

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 2cbd8fb99268f501b7d99b0153434df84852ba37..d45c920ce2b54302dc36444bd07d393c0aeb4995 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "m_hash.h"
 
 /* $ModDesc: Provides masking of user hostnames */
@@ -39,7 +38,7 @@ class CloakUser : public ModeHandler
         * For example, if it is passed "svn.inspircd.org" it will return ".inspircd.org".
         * If it is passed "brainbox.winbot.co.uk" it will return ".co.uk",
         * and if it is passed "localhost.localdomain" it will return ".localdomain".
-        * 
+        *
         * This is used to ensure a significant part of the host is always cloaked (see Bug #216)
         */
        std::string LastTwoDomainParts(const std::string &host)
@@ -111,11 +110,11 @@ class CloakUser : public ModeHandler
                        }
                }
                else
-               {
+               {
                        if (dest->IsModeSet('x'))
                        {
-                               /* User is removing the mode, so just restore their real host
-                                * and make it match the displayed one.
+                               /* User is removing the mode, so just restore their real host
+                                * and make it match the displayed one.
                                 */
                                dest->ChangeDisplayedHost(dest->host.c_str());
                                dest->SetMode('x',false);
@@ -196,13 +195,13 @@ class CloakUser : public ModeHandler
                /* Stick them all together */
                return irc::stringjoiner(":", hashies, 0, hashies.size() - 1).GetJoined();
        }
-       
+
        void DoRehash()
        {
                ConfigReader Conf(ServerInstance);
                bool lowercase;
-               
-               /* These are *not* using the need_positive parameter of ReadInteger - 
+
+               /* These are *not* using the need_positive parameter of ReadInteger -
                 * that will limit the valid values to only the positive values in a
                 * signed int. Instead, accept any value that fits into an int and
                 * cast it to an unsigned int. That will, a bit oddly, give us the full
@@ -215,7 +214,7 @@ class CloakUser : public ModeHandler
                prefix = Conf.ReadValue("cloak","prefix",0);
                ipalways = Conf.ReadFlag("cloak", "ipalways", 0);
                lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
-               
+
                if (!lowercase)
                {
                        xtab[0] = "F92E45D871BCA630";
@@ -255,7 +254,7 @@ class CloakUser : public ModeHandler
 class ModuleCloaking : public Module
 {
  private:
-       
+
        CloakUser* cu;
        Module* HashModule;
 
@@ -314,7 +313,7 @@ class ModuleCloaking : public Module
                        snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), tofree->c_str());
                        for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
                        {
-                               if (match(mask,i->data))
+                               if (InspIRCd::Match(mask,i->data))
                                        return -1;
                        }
                }
@@ -339,19 +338,19 @@ class ModuleCloaking : public Module
                if (target_type == TYPE_USER)
                        OnUserDisconnect((User*)item);
        }
-       
+
        virtual ~ModuleCloaking()
        {
                ServerInstance->Modes->DelMode(cu);
                delete cu;
                ServerInstance->Modules->DoneWithInterface("HashRequest");
        }
-       
+
        virtual Version GetVersion()
        {
                // returns the version number of the module to be
                // listed in /MODULES
-               return Version(1,2,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
@@ -387,22 +386,22 @@ class ModuleCloaking : public Module
                                std::string hostcloak = cu->prefix + "-" + std::string(HashSumRequest(this, cu->HashProvider, dest->host.c_str()).Send()).substr(0,8) + a;
 
                                /* Fix by brain - if the cloaked host is > the max length of a host (64 bytes
-                                * according to the DNS RFC) then tough titty, they get cloaked as an IP. 
+                                * according to the DNS RFC) then tough titty, they get cloaked as an IP.
                                 * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
                                 * vhost.
                                 */
 #ifdef IPV6
                                in6_addr testaddr;
                                in_addr testaddr2;
-                               if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
+                               if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
                                        /* Invalid ipv6 address, and ipv6 user (resolved host) */
                                        b = hostcloak;
-                               else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host,&testaddr2) < 1) && (hostcloak.length() <= 64))
+                               else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
                                        /* Invalid ipv4 address, and ipv4 user (resolved host) */
                                        b = hostcloak;
                                else
                                        /* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
-                                       b = ((!strchr(dest->host,':')) ? cu->Cloak4(dest->host) : cu->Cloak6(dest->host));
+                                       b = ((!strchr(dest->host.c_str(),':')) ? cu->Cloak4(dest->host.c_str()) : cu->Cloak6(dest->host.c_str()));
 #else
                                in_addr testaddr;
                                if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))