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

Various flow dump improvements and bug fixes

Browse source
This commit is contained in:
Luca Deri 2015-08-17 10:57:17 +02:00
parent 4945f5c902
commit 2a5baca948
15 changed files with 148 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -388,13 +388,13 @@ function bitsToSize(bits)
terabit = gigabit * 1000;
if((bits >= kilobit) and (bits < megabit)) then
return round(bits / kilobit, precision) .. ' Kbit/s';
return round(bits / kilobit, precision) .. ' Kbit';
elseif((bits >= megabit) and (bits < gigabit)) then
return round(bits / megabit, precision) .. ' Mbit/s';
return round(bits / megabit, precision) .. ' Mbit';
elseif((bits >= gigabit) and (bits < terabit)) then
return round(bits / gigabit, precision) .. ' Gbit/s';
return round(bits / gigabit, precision) .. ' Gbit';
elseif(bits >= terabit) then
return round(bits / terabit, precision) .. ' Tbit/s';
return round(bits / terabit, precision) .. ' Tbit';
else
return round(bits, precision) .. ' bps';
end
@ -843,17 +843,11 @@ end
-- Flow Utils --
function flowinfo2hostname(flow_info, host_type, show_vlan)
local name
local orig_name
function host2name(name, vlan)
local orig_name = name
name = flow_info[host_type..".host"]
if((name == "") or (name == nil)) then
name = flow_info[host_type..".ip"]
end
vlan = tonumber(vlan or "0")
orig_name = name
name = getHostAltName(name)
if(name == orig_name) then
@ -863,18 +857,30 @@ function flowinfo2hostname(flow_info, host_type, show_vlan)
name = rname
end
end
-- io.write(host_type.. " / " .. flow_info[host_type..".host"].." / "..name.."\n")
if(show_vlan and (flow_info["vlan"] > 0)) then
name = name .. '@' .. flow_info["vlan"]
if(vlan > 0) then
name = name .. '@' .. vlan
end
return name
end
-- Url Util --
function flowinfo2hostname(flow_info, host_type, vlan)
local name
local orig_name
name = flow_info[host_type..".host"]
if((name == "") or (name == nil)) then
name = flow_info[host_type..".ip"]
end
return(host2name(name, flow_info["vlan"]))
end
-- URL Util --
--
-- Split the host key (ip@vlan) creating a new lua table.