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 issues with long interface names

Browse source 
Fixes #1717
This commit is contained in:
Simone Mainardi 2018-04-04 16:01:22 +02:00
parent 7cabd032c1
commit 730b881b1a
10 changed files with 28 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2231,28 +2231,6 @@ function tablePreferences(key, value, force_set)
end
end
function getInterfaceNameAlias(interface_name, max_len)
if(interface_name == nil) then return("") end
-- io.write(debug.traceback().."\n")
local label = ntop.getCache('ntopng.prefs.'..interface_name..'.name')
if((label == nil) or (label == "")) then
if(string.contains(interface_name, "{")) then -- Windows
-- attempt to print the description
local _ifstats = interface.getStats()
local nm = _ifstats.description
if tonumber(max_len) ~= nil and tonumber(max_len) > 0 then
nm = shortenString(_ifstats.description, tonumber(max_len))
end
return(nm)
else
return(interface_name)
end
else
return(label)
end
end
function getInterfaceSpeed(ifstats)
local ifspeed = ntop.getCache('ntopng.prefs.'..ifstats.name..'.speed')
if not isEmptyString(ifspeed) and tonumber(ifspeed) ~= nil then
@ -2332,8 +2310,8 @@ function getHumanReadableInterfaceName(interface_name)
local key = 'ntopng.prefs.'..interface_name..'.name'
local custom_name = ntop.getCache(key)
if((custom_name ~= nil) and (custom_name ~= "")) then
return(custom_name)
if not isEmptyString(custom_name) then
return(shortenString(custom_name))
else
interface.select(interface_name)
local _ifstats = interface.getStats()
@ -2344,7 +2322,7 @@ function getHumanReadableInterfaceName(interface_name)
end
-- print(interface_name.."=".._ifstats.name)
return(nm)
return(shortenString(nm or ''))
end
end