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 missing VLAN display

Browse source
This commit is contained in:
Simone Mainardi 2017-09-25 14:26:10 +02:00
parent 41cb13a280
commit 0af70b39b7
7 changed files with 16 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/lua/modules/flow_utils.lua
View file

@ -1130,17 +1130,12 @@ end
-- #######################
function getFlowLabel(flow, show_macs, add_hyperlinks, show_vlans)
function getFlowLabel(flow, show_macs, add_hyperlinks)
if flow == nil then return "" end
local cli_name = shortenString(flowinfo2hostname(flow, "cli"))
local srv_name = shortenString(flowinfo2hostname(flow, "srv"))
if show_vlans == false then
cli_name = stripVlan(cli_name)
srv_name = stripVlan(srv_name)
end
local cli_port
local srv_port
if flow["cli.port"] > 0 then cli_port = flow["cli.port"] end
@ -1158,26 +1153,14 @@ function getFlowLabel(flow, show_macs, add_hyperlinks, show_vlans)
if add_hyperlinks then
cli_name = "<A HREF=\""..ntop.getHttpPrefix().."/lua/host_details.lua?"..hostinfo2url(flow,"cli") .. "\">"
if show_vlans then
cli_name = cli_name..shortenString(flowinfo2hostname(flow,"cli"))
else
cli_name = cli_name..shortenString(stripVlan(flowinfo2hostname(flow,"cli")))
end
cli_name = cli_name..shortenString(flowinfo2hostname(flow,"cli"))
if(flow["cli.systemhost"] == true) then
cli_name = cli_name.." <i class='fa fa-flag' aria-hidden='true'></i>"
end
cli_name = cli_name.."</A>"
srv_name = "<A HREF=\""..ntop.getHttpPrefix().."/lua/host_details.lua?"..hostinfo2url(flow,"srv") .. "\">"
if show_vlans then
srv_name = srv_name..shortenString(flowinfo2hostname(flow,"srv"))
else
srv_name = srv_name..shortenString(stripVlan(flowinfo2hostname(flow,"srv")))
end
srv_name = srv_name..shortenString(flowinfo2hostname(flow,"srv"))
if(flow["srv.systemhost"] == true) then
srv_name = srv_name.." <i class='fa fa-flag' aria-hidden='true'></i>"
end