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

Win Fixes

Browse source
This commit is contained in:
Simone Mainardi 2017-05-24 12:09:29 +02:00
parent ef0910c363
commit b50c287768
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1989,9 +1989,16 @@ end
function getInterfaceNameAlias(interface_name)
if(interface_name == nil) then return("") end
-- io.write(debug.traceback().."\n")
label = ntop.getCache('ntopng.prefs.'..interface_name..'.name')
local label = ntop.getCache('ntopng.prefs.'..interface_name..'.name')
if((label == nil) or (label == "")) then
return(interface_name)
if(string.contains(interface_name, "{")) then -- Windows
-- attempt to print the description
local _ifstats = interface.getStats()
local nm = shortenString(_ifstats.description, 16)
return(nm)
else
return(interface_name)
end
else
return(label)
end
@ -2032,17 +2039,22 @@ function setInterfaceRegreshRate(ifid, refreshrate)
end
function getHumanReadableInterfaceName(interface_name)
key = 'ntopng.prefs.'..interface_name..'.name'
custom_name = ntop.getCache(key)
local key = 'ntopng.prefs.'..interface_name..'.name'
local custom_name = ntop.getCache(key)
if((custom_name ~= nil) and (custom_name ~= "")) then
return(custom_name)
else
interface.select(interface_name)
_ifstats = interface.getStats()
local _ifstats = interface.getStats()
local nm = _ifstats.name
if(string.contains(nm, "{")) then -- Windows
nm = shortenString(_ifstats.description, 16)
end
-- print(interface_name.."=".._ifstats.name)
return(_ifstats.name)
return(nm)
end
end