prosody-hg: util/ip.lua comparison

util.ip: Do CIDR matching by comparing all bits at once instead of using O(n) function

comparison

equal deleted inserted replaced

-:ab9ddfb03d4d
+:021129f7b0a3
 	end
 	return new_ip(cidr), bits;
 end
 function match(ipA, ipB, bits)
-	local common_bits = commonPrefixLength(ipA, ipB);
+	if not bits then
-	if bits and ipB.proto == "IPv4" then
+		return ipA == ipB;
-		common_bits = common_bits - 96; -- v6 mapped addresses always share these bits
+	elseif bits < 1 then
-	end
+		return true;
-	return common_bits >= (bits or 128);
+	end
+	if ipA.proto ~= ipB.proto then
+		if ipA.proto == "IPv4" then
+			ipA = ipA.toV4mapped;
+		elseif ipB.proto == "IPv4" then
+			ipB = ipA.toV4mapped;
+			bits = bits + (128 - 32);
+		end
+	end
+	return ipA.bits:sub(1, bits) == ipB.bits:sub(1, bits);
 end
 return {
 	new_ip = new_ip,
 	commonPrefixLength = commonPrefixLength,

Mercurial > prosody-hg