X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=a236300f18404bf623e7ad73a12b738862dd4530;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=58de93da9d305fbe9cb3f19951f7e6ad4b10ab32;hpb=73de881eafbd3d201ce4be472bd35349773d74bd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 58de93da9..a236300f1 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -160,11 +160,6 @@ class CloakUser : public ModeHandler
 
 	std::string Cloak6(const char* ip)
 	{
-		/* Theyre using 4in6 (YUCK). Translate as ipv4 cloak */
-		if (!strncmp(ip, "0::ffff:", 8))
-			return Cloak4(ip + 8);
-
-		/* If we get here, yes it really is an ipv6 ip */
 		unsigned int iv[] = { key1, key2, key3, key4 };
 		std::vector<std::string> hashies;
 		std::string item;
@@ -255,16 +250,14 @@ class CloakUser : public ModeHandler
 class ModuleCloaking : public Module
 {
  private:
-
  	CloakUser* cu;
-	Module* HashModule;
 
  public:
 	ModuleCloaking(InspIRCd* Me)
 		: Module(Me)
 	{
 		/* Attempt to locate the md5 service provider, bail if we can't find it */
-		HashModule = ServerInstance->Modules->Find("m_md5.so");
+		Module* HashModule = ServerInstance->Modules->Find("m_md5.so");
 		if (!HashModule)
 			throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
 
@@ -272,7 +265,7 @@ class ModuleCloaking : public Module
 
 		try
 		{
-			OnRehash(NULL,"");
+			OnRehash(NULL);
 		}
 		catch (ModuleException &e)
 		{
@@ -337,11 +330,11 @@ class ModuleCloaking : public Module
  	void Prioritize()
 	{
 		/* Needs to be after m_banexception etc. */
-		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIO_LAST);
+		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
 
 		/* but before m_conn_umodes, so host is generated ready to apply */
 		Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &um);
+		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &um);
 	}
 
 	virtual void OnUserDisconnect(User* user)
@@ -374,7 +367,7 @@ class ModuleCloaking : public Module
 		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		cu->DoRehash();
 	}
@@ -415,37 +408,21 @@ class ModuleCloaking : public Module
 				 * 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.c_str(),&testaddr) < 1) &&
-					(inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
-					/* Invalid ipv4/ipv6 address, and ipv6 user (resolved host) */
-					b = hostcloak;
-				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.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))
-					/* Invalid ipv4 address, and ipv4 user (resolved host) */
+				std::string testaddr;
+				int testport;
+				if (!irc::sockets::satoap(&dest->client_sa, testaddr, testport) && (hostcloak.length() <= 64))
+					/* not a valid address, must have been a host, so cloak as a host */
 					b = hostcloak;
+				else if (dest->client_sa.sa.sa_family == AF_INET6)
+					b = cu->Cloak6(dest->GetIPString());
 				else
-					/* Valid ipv4 address (not resolved) ipv4 user */
-					b = cu->Cloak4(dest->host.c_str());
-#endif
+					b = cu->Cloak4(dest->GetIPString());
 			}
 			else
 			{
-#ifdef IPV6
-				if (dest->GetProtocolFamily() == AF_INET6)
+				if (dest->client_sa.sa.sa_family == AF_INET6)
 					b = cu->Cloak6(dest->GetIPString());
-#endif
-				if (dest->GetProtocolFamily() == AF_INET)
+				else
 					b = cu->Cloak4(dest->GetIPString());
 			}