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

util.ip: Remove ip.bits and related code, switch to more efficient strbitop

Browse source 
100,000 iterations of match() on my laptop from 3.5s -> 0.5s.
This commit is contained in:
Matthew Wild 2024-02-23 12:14:51 +00:00
parent 965d69763c
commit f4d2d7a3a3
1 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
util/ip.lua
View file

@ -6,7 +6,7 @@
-- --
local net = require "prosody.util.net"; local net = require "prosody.util.net";
local hex = require "prosody.util.hex"; local strbit = require "prosody.util.strbitop";
local ip_methods = {}; local ip_methods = {};
@ -28,13 +28,6 @@ ip_mt.__eq = function (ipA, ipB)
return ipA.packed == ipB.packed; return ipA.packed == ipB.packed;
end end
local hex2bits = {
["0"] = "0000", ["1"] = "0001", ["2"] = "0010", ["3"] = "0011",
["4"] = "0100", ["5"] = "0101", ["6"] = "0110", ["7"] = "0111",
["8"] = "1000", ["9"] = "1001", ["A"] = "1010", ["B"] = "1011",
["C"] = "1100", ["D"] = "1101", ["E"] = "1110", ["F"] = "1111",
};
local function new_ip(ipStr, proto) local function new_ip(ipStr, proto)
local zone; local zone;
if (not proto or proto == "IPv6") and ipStr:find('%', 1, true) then if (not proto or proto == "IPv6") and ipStr:find('%', 1, true) then
@ -66,27 +59,18 @@ function ip_methods:normal()
return net.ntop(self.packed); return net.ntop(self.packed);
end end
function ip_methods.bits(ip) -- Returns the longest packed representation, i.e. IPv4 will be mapped
return hex.encode(ip.packed):upper():gsub(".", hex2bits); function ip_methods.packed_full(ip)
end
function ip_methods.bits_full(ip)
if ip.proto == "IPv4" then if ip.proto == "IPv4" then
ip = ip.toV4mapped; ip = ip.toV4mapped;
end end
return ip.bits; return ip.packed;
end end
local match; local match;
local function commonPrefixLength(ipA, ipB) local function commonPrefixLength(ipA, ipB)
ipA, ipB = ipA.bits_full, ipB.bits_full; return strbit.common_prefix_bits(ipA.packed_full, ipB.packed_full);
for i = 1, 128 do
if ipA:sub(i,i) ~= ipB:sub(i,i) then
return i-1;
end
end
return 128;
end end
-- Instantiate once -- Instantiate once
@ -238,7 +222,7 @@ function match(ipA, ipB, bits)
bits = bits + (128 - 32); bits = bits + (128 - 32);
end end
end end
return ipA.bits:sub(1, bits) == ipB.bits:sub(1, bits); return strbit.common_prefix_bits(ipA.packed, ipB.packed) >= bits;
end end
local function is_ip(obj) local function is_ip(obj)