X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=5cedb5774fd3dd6ba2eba1f37cd1adfb8797b201;hb=c6a508a3da977041909f18f77d6e8fea942512cf;hp=4c2c56318c96e85072e986ad56544cc048ed067b;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 4c2c56318..5cedb5774 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -49,7 +49,7 @@ class CloakUser : public ModeHandler
 
 	CloakUser(Module* source)
 		: ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
-		ext("cloaked_host", source), debounce_ts(0), debounce_count(0)
+		ext("cloaked_host", ExtensionItem::EXT_USER, source), debounce_ts(0), debounce_count(0)
 	{
 	}
 
@@ -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)
@@ -99,7 +103,7 @@ class CloakUser : public ModeHandler
 			}
 			if (cloak)
 			{
-				user->ChangeDisplayedHost(cloak->c_str());
+				user->ChangeDisplayedHost(*cloak);
 				user->SetMode(this, true);
 				return MODEACTION_ALLOW;
 			}
@@ -192,7 +196,7 @@ class ModuleCloaking : public Module
 		input.append(1, '\0'); // null does not terminate a C++ string
 		input.append(item);
 
-		std::string rv = Hash->sum(input).substr(0,len);
+		std::string rv = Hash->GenerateRaw(input).substr(0,len);
 		for(int i=0; i < len; i++)
 		{
 			// this discards 3 bits per byte. We have an
@@ -253,19 +257,17 @@ class ModuleCloaking : public Module
 		}
 		else
 		{
-			char buf[50];
 			if (ip.sa.sa_family == AF_INET6)
 			{
-				snprintf(buf, 50, ".%02x%02x.%02x%02x%s",
+				rv.append(InspIRCd::Format(".%02x%02x.%02x%02x%s",
 					ip.in6.sin6_addr.s6_addr[2], ip.in6.sin6_addr.s6_addr[3],
-					ip.in6.sin6_addr.s6_addr[0], ip.in6.sin6_addr.s6_addr[1], suffix.c_str());
+					ip.in6.sin6_addr.s6_addr[0], ip.in6.sin6_addr.s6_addr[1], suffix.c_str()));
 			}
 			else
 			{
 				const unsigned char* ip4 = (const unsigned char*)&ip.in4.sin_addr;
-				snprintf(buf, 50, ".%d.%d%s", ip4[1], ip4[0], suffix.c_str());
+				rv.append(InspIRCd::Format(".%d.%d%s", ip4[1], ip4[0], suffix.c_str()));
 			}
-			rv.append(buf);
 		}
 		return rv;
 	}
@@ -301,7 +303,7 @@ class ModuleCloaking : public Module
 		if (u->IsModeSet(cu))
 		{
 			u->SetMode(cu, false);
-			u->WriteServ("MODE %s -%c", u->nick.c_str(), cu.GetModeChar());
+			u->WriteCommand("MODE", "-" + ConvToStr(cu.GetModeChar()));
 		}
 	}
 
@@ -345,11 +347,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);