X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=cb3fdac1a1a565646523bfab457c2091eeaa656e;hb=bb4aa10ed82612624da45d0c9592ddf7f2f51ab5;hp=890c799f2b2b55d2e96b4c099db9bdc1163a9f75;hpb=51014dffc9ec51c4a4f3d2887c03404dbaa793bc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 890c799f2..cb3fdac1a 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -89,6 +89,10 @@ class CloakUser : public ModeHandler
 
 		if (adding)
 		{
+			// assume this is more correct
+			if (user->registered != REG_ALL && user->host != user->dhost)
+				return MODEACTION_DENY;
+
 			std::string* cloak = ext.get(user);
 
 			if (!cloak)
@@ -139,7 +143,6 @@ class ModuleCloaking : public Module
 	std::string prefix;
 	std::string suffix;
 	std::string key;
-	const char* xtab[4];
 	dynamic_reference<HashProvider> Hash;
 
 	ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5")
@@ -286,7 +289,7 @@ class ModuleCloaking : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		/* Needs to be after m_banexception etc. */
 		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
@@ -343,11 +346,14 @@ class ModuleCloaking : public Module
 	{
 		std::string chost;
 
+		irc::sockets::sockaddrs hostip;
+		bool host_is_ip = irc::sockets::aptosa(host, ip.port(), hostip) && hostip == ip;
+
 		switch (mode)
 		{
 			case MODE_HALF_CLOAK:
 			{
-				if (ipstr != host)
+				if (!host_is_ip)
 					chost = prefix + SegmentCloak(host, 1, 6) + LastTwoDomainParts(host);
 				if (chost.empty() || chost.length() > 50)
 					chost = SegmentIP(ip, false);