vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes VLAN tags when showing host names

Browse source 
Fixes #5647
Fixes #5632
This commit is contained in:
Simone Mainardi 2021-07-09 10:57:22 +02:00
parent 4258637dc9
commit 69f82c7f76
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1591,7 +1591,7 @@ local function label2formattedlabel(alt_name, host_info, show_vlan)
local vlan = tonumber(host_info["vlan"])
if vlan and vlan > 0 then
local full_vlan_name = getFullVlanName(vlan)
local full_vlan_name = getFullVlanName(vlan, true --[[ Compact --]])
res = string.format("%s@%s", res, full_vlan_name)
end
@ -2072,14 +2072,17 @@ end
-- ##############################################
function getFullVlanName(vlan_id)
function getFullVlanName(vlan_id, compact)
local alias = getVlanAlias(vlan_id)
if not isEmptyString(alias) then
alias = shortenString(alias)
if not isEmptyString(alias) and alias ~= tostring(vlan_id) then
return string.format("%u [%s]", vlan_id, alias)
if compact then
alias = shortenString(alias)
return string.format("%s", alias)
else
return string.format("%u [%s]", vlan_id, alias)
end
end
end