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

Alt name cleanup

Browse source
This commit is contained in:
Alfredo Cardigliano 2020-06-11 10:20:53 +02:00
parent f6567a5758
commit 5caac80fcb
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1347,6 +1347,14 @@ function getHostAltNamesKey()
return "ntopng.host_labels"
end
function getHostAltName(host_ip)
return ntop.getHashCache(getHostAltNamesKey(), host_ip)
end
function setHostAltName(host_ip, alt_name)
ntop.setHashCache(getHostAltNamesKey(), host_ip, alt_name)
end
-- ##############################################
function getDhcpNameKey(ifid, mac)
@ -1369,14 +1377,14 @@ function hostinfo2label(host_info)
-- If local broadcast domain host and DHCP, try to get the label associated
-- to the MAC address
if host_info["mac"] and (host_info["broadcast_domain_host"] ~= false) and (host_info["dhcpHost"] ~= false) then
alt_name = ntop.getHashCache(getHostAltNamesKey(), host_info["mac"])
alt_name = getHostAltName(host_info["mac"])
if not isEmptyString(alt_name) then
return(alt_name)
end
end
alt_name = ntop.getHashCache(getHostAltNamesKey(), ip)
alt_name = getHostAltName(ip)
if not isEmptyString(alt_name) then
return(alt_name)
@ -1409,7 +1417,7 @@ end
-- ##############################################
function mac2label(mac)
local alt_name = ntop.getHashCache(getHostAltNamesKey(), mac)
local alt_name = getHostAltName(mac)
if not isEmptyString(alt_name) and (alt_name ~= mac) then
return(alt_name)
@ -1427,10 +1435,6 @@ end
-- ##############################################
function setHostAltName(host_ip, alt_name)
ntop.setHashCache(getHostAltNamesKey(), host_ip, alt_name)
end
-- Mac Addresses --
-- A function to give a useful device name