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

Fix for #417

Browse source
This commit is contained in:
Luca Deri 2016-02-24 19:34:13 +01:00
parent 670edfe644
commit 27945e797d
6 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/lua/get_hosts_data.lua
View file

@ -99,9 +99,9 @@ to_skip = (currentPage-1) * perPage
if(sortOrder == "desc") then sOrder = false else sOrder = true end
if((mac ~= nil) or (antenna_mac ~= nil) or (mode == "local")) then
hosts_stats = interface.getLocalHostsInfo(false, sortColumn, perPage, to_skip, sOrder) -- false = little details
else
hosts_stats = interface.getHostsInfo(false, sortColumn, perPage, to_skip, sOrder) -- false = little details
hosts_stats = interface.getLocalHostsInfo(false, sortColumn, perPage, to_skip, sOrder, country) -- false = little details
else
hosts_stats = interface.getHostsInfo(false, sortColumn, perPage, to_skip, sOrder, country) -- false = little details
end
hosts_stats,total = aggregateHostsStats(hosts_stats)
@ -279,7 +279,7 @@ for _key, _value in pairsByKeys(vals, funct) do
if(num > 0) then print ",\n" end
print ('{ ')
print ('\"key\" : \"'..hostinfo2jqueryid(hosts_stats[key])..'\",')
print ("\"column_ip\" : \"<A HREF='")
if(sort_mode == "network") then
@ -313,18 +313,18 @@ for _key, _value in pairsByKeys(vals, funct) do
print("\"column_name\" : \"")
if(value["name"] == nil) then
if(value["name"] == nil) then
value["name"] = ntop.getResolvedAddress(key)
end
if(value["name"] == "") then
if(value["name"] == "") then
value["name"] = key
end
if(long_names) then
print(value["name"])
else
print(shortHostName(value["name"]))
print(shortHostName(value["name"]))
end
if(value["ip"] ~= nil) then
@ -366,7 +366,7 @@ for _key, _value in pairsByKeys(vals, funct) do
end
end
print(", \"column_since\" : \"" .. secondsToTime(now-value["seen.first"]+1) .. "\", ")
print("\"column_last\" : \"" .. secondsToTime(now-value["seen.last"]+1) .. "\", ")