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

Fix custom alias in case of vlan

Browse source
This commit is contained in:
Alfredo Cardigliano 2020-08-25 18:41:28 +02:00
parent b31a209e73
commit ea0bd4d71a
2 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1380,16 +1380,43 @@ end
-- ##############################################
function getHostAltNamesKey(ip)
return "ntopng.cache.host_labels."..ip
function getHostAltNamesKey(host_key)
return "ntopng.cache.host_labels."..host_key
end
function getHostAltName(host_ip)
return ntop.getCache(getHostAltNamesKey(host_ip))
function getHostAltName(host_info)
local host_key
if type(host_info) == "table" then
host_key = host_info["host"]
else
host_key = host_info
end
local alt_name = ntop.getCache(getHostAltNamesKey(host_key))
if isEmptyString(alt_name) and type(host_info) == "table" and host_info["vlan"] then
-- Check if there is an alias for the host@vlan
host_key = hostinfo2hostkey(host_info)
alt_name = ntop.getCache(getHostAltNamesKey(host_key))
end
return alt_name
end
function setHostAltName(host_ip, alt_name)
ntop.setCache(getHostAltNamesKey(host_ip), alt_name)
function setHostAltName(host_info, alt_name)
local host_key
if type(host_info) == "table" then
-- Note: we are not using hostinfo2hostkey which includes the
-- vlan for backward compatibility, compatibility with
-- the backend, and compatibility with the vpn plugins
host_key = host_info["host"] -- hostinfo2hostkey(host_info)
else
host_key = host_info
end
ntop.setCache(getHostAltNamesKey(host_key), alt_name)
end
-- ##############################################