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

Fixed lua code where some shared variables created issues with some reports.

Browse source 
Minor c++ code fixes
This commit is contained in:
Luca Deri 2015-09-13 23:03:06 +02:00
parent 9a5101e399
commit c7de08f89c
8 changed files with 119 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,9 +10,9 @@ function getInterfaceName(interface_id)
interface_id = tonumber(interface_id)
for _,if_name in pairs(ifnames) do
interface.select(if_name)
ifstats = interface.getStats()
if(ifstats.id == interface_id) then
return(ifstats.name)
_ifstats = interface.getStats()
if(_ifstats.id == interface_id) then
return(_ifstats.name)
end
end
@ -726,8 +726,8 @@ function getInterfaceId(interface_name)
for _,if_name in pairs(ifnames) do
interface.select(if_name)
ifstats = interface.getStats()
if(ifstats.name == interface_name) then return(ifstats.id) end
_ifstats = interface.getStats()
if(_ifstats.name == interface_name) then return(_ifstats.id) end
end
return(-1)
@ -1404,14 +1404,14 @@ function getHumanReadableInterfaceName(interface_id)
return(custom_name)
else
interface.select(interface_id)
ifstats = interface.getStats()
_ifstats = interface.getStats()
-- print(interface_id.."="..ifstats.name)
-- print(interface_id.."=".._ifstats.name)
if((interface_id ~= ifstats.description) and (ifstats.description ~= "PF_RING")) then
return(ifstats.description)
if((interface_id ~= _ifstats.description) and (_ifstats.description ~= "PF_RING")) then
return(_ifstats.description)
else
return(ifstats.name)
return(_ifstats.name)
end
end
end
@ -1464,9 +1464,9 @@ function harvestJSONTopTalkers(days)
ifnames = interface.getIfNames()
for _,ifname in pairs(ifnames) do
interface.select(ifname)
local ifstats = interface.getStats()
local _ifstats = interface.getStats()
local dirs = ntop.getDirs()
local basedir = fixPath(dirs.workingdir .. "/" .. ifstats.id)
local basedir = fixPath(dirs.workingdir .. "/" .. _ifstats.id)
harvestUnusedDir(fixPath(basedir .. "/top_talkers"), when)
harvestUnusedDir(fixPath(basedir .. "/flows"), when)