vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow relaxed format (IP only) for host pool members. Cleanup duplicated code.

Browse source
This commit is contained in:
Alfredo Cardigliano 2024-06-17 11:05:41 +02:00
parent 50633c8fd9
commit f1e72ffddd
4 changed files with 63 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

51
scripts/lua/modules/lua_utils.lua
View file

@ -408,57 +408,6 @@ end
-- ##############################################
--
-- Fix member format (IP address to /32 CIDR and VLAN to default 0)
-- E.g. 192.168.1.10 -> 192.168.1.10/32@0
--
function fixPoolMemberFormat(member)
if isEmptyString(member) then
return nil
end
if isMacAddress(member) then
return member
end
-- VLAN
local vlan_id
local vlan_idx = string.find(member, "@")
if vlan_idx == nil then
vlan_id = 0
elseif vlan_idx == 1 then
return nil
else
local other = string.sub(member, 1, vlan_idx - 1)
vlan_id = tonumber(string.sub(member, vlan_idx + 1))
if vlan_id == nil or vlan_id < 0 then
return nil
end
member = other
end
-- prefix is mandatory here
local address, prefix = splitNetworkPrefix(member)
if address == nil then
return nil
elseif prefix == nil then
prefix = '32'
end
if isIPv4(address) and (tonumber(prefix) >= 0) and (tonumber(prefix) <= 32) then
-- ok
elseif isIPv6(address) and (tonumber(prefix) >= 0) and (tonumber(prefix) <= 128) then
-- ok
else
return nil
end
return address .. '/' .. prefix .. '@' .. vlan_id
end
-- ##############################################
function host2member(ip, vlan, prefix)
if prefix == nil then
if isIPv4(ip) then