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

Fixes symbolic names sometimes duplicated

Browse source 
Fixes #5653
This commit is contained in:
Simone Mainardi 2021-07-09 17:17:02 +02:00
parent af5ded3231
commit 55679d6b66
2 changed files with 20 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1579,11 +1579,11 @@ local function label2formattedlabel(alt_name, host_info, show_vlan)
if not isEmptyString(alt_name) then
local ip = host_info["ip"] or host_info["host"]
-- Make it shorter
local res = shortenString(alt_name)
local res = alt_name
-- Add the ipv6 suffix
if isIPv6(ip) then
res = res .. " [v6]"
-- Special shorting function for IP addresses
if res ~= ip then
res = shortHostName(res)
end
-- Adding the vlan if requested
@ -1619,17 +1619,12 @@ local function hostinfo2label_resolved(host_info, show_vlan)
end
if isEmptyString(res) then
-- Use any user-configured custom name
res = getHostAltName(ip)
-- Try and get the resolved name
res = ntop.getResolvedName(ip)
if isEmptyString(res) then
-- Try and get the resolved name
res = ntop.getResolvedName(ip)
if isEmptyString(res) then
-- Nothing found, just fallback to the IP address
res = ip
end
-- Nothing found, just fallback to the IP address
res = ip
end
end
@ -1656,14 +1651,19 @@ function hostinfo2label(host_info, show_vlan)
local res = host_info.label
if isEmptyString(res) then
-- Read what is found inside host `name`, e.g., name as found by dissected traffic such as DHCP
res = host_info["name"]
-- Use any user-configured custom name
-- This goes first as a label set by the user MUST take precedance over any other possibly available label
res = getHostAltName(ip)
if isEmptyString(res) then
return hostinfo2label_resolved(host_info, show_vlan)
-- Read what is found inside host `name`, e.g., name as found by dissected traffic such as DHCP
res = host_info["name"]
if isEmptyString(res) then
return hostinfo2label_resolved(host_info, show_vlan)
end
end
end
return label2formattedlabel(res, host_info, show_vlan)
end