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 alert vlan tags (#5632 #5629)

Browse source
This commit is contained in:
MatteoBiscosi 2021-07-06 15:18:35 +02:00
parent 3db1597a2c
commit a6a07b4ecb
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1312,14 +1312,14 @@ end
-- #################################
function hostVisualization(ip, name, vlan)
function hostVisualization(ip, name, vlan, short_version)
if (ip ~= name) then
if isIPv6(ip) then
name = name.." [IPv6]"
end
else
if vlan ~= nil and tonumber(vlan) > 0 then
name = name.."@"..getFullVlanName(vlan)
name = name .. "@" .. getFullVlanName(vlan, short_version)
end
end
@ -2068,11 +2068,15 @@ end
-- ##############################################
function getFullVlanName(vlan_id)
function getFullVlanName(vlan_id, short_version)
local alias = getVlanAlias(vlan_id)
if (tostring(alias)) ~= (tostring(vlan_id)) then
return string.format("%s [%s]", alias, vlan_id)
if not short_version then
return string.format("%s [%s]", alias, vlan_id)
else
return alias
end
end
return vlan_id