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

Add VLAN in host IP visualization if any (fix #3107)

Browse source
This commit is contained in:
Alfredo Cardigliano 2019-12-20 16:23:16 +01:00
parent b106c57728
commit f2b8d12b0a
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1093,9 +1093,15 @@ end
-- #################################
function hostVisualization(ip, name)
if (ip ~= name) and isIPv6(ip) then
return name.." [IPv6]"
function hostVisualization(ip, name, vlan)
if (ip ~= name) then
if isIPv6(ip) then
name = name.." [IPv6]"
end
else
if vlan ~= nil and tonumber(vlan) > 0 then
name = name.."@"..vlan
end
end
return name
end
@ -1114,7 +1120,7 @@ function resolveAddress(hostinfo, allow_empty)
return getResolvedAddress(hostinfo)
end
end
return hostVisualization(hostinfo["host"], hostname)
return hostVisualization(hostinfo["host"], hostname, hostinfo["vlan"])
end
-- #################################
@ -1122,7 +1128,7 @@ end
-- NOTE: use host2name when possible
function getResolvedAddress(hostinfo)
local hostname = ntop.getResolvedName(hostinfo["host"])
return hostVisualization(hostinfo["host"], hostname)
return hostVisualization(hostinfo["host"], hostname, hostinfo["vlan"])
end
-- #################################