mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kim Alvefur 2017-12-01 03:29:25 +01:00
parent a4aa61fdb1
commit 7d1d1be98e
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
util/ip.lua
View file

@ -228,11 +228,20 @@ local function parse_cidr(cidr)
end end
function match(ipA, ipB, bits) 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
return true;
end end
return common_bits >= (bits or 128); 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 end
return { return {