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

Fixes for supporting ifSpeed on non Linux platforms

Browse source 
Fixed speed conversion to use 1000 instead of 1024 as rate
This commit is contained in:
Luca Deri 2015-08-15 11:36:37 +02:00
parent 30819fa111
commit 44deca8b60
10 changed files with 77 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,10 +382,10 @@ end
-- Convert bits to human readable format
function bitsToSize(bits)
precision = 2
kilobit = 1024;
megabit = kilobit * 1024;
gigabit = megabit * 1024;
terabit = gigabit * 1024;
kilobit = 1000;
megabit = kilobit * 1000;
gigabit = megabit * 1000;
terabit = gigabit * 1000;
if((bits >= kilobit) and (bits < megabit)) then
return round(bits / kilobit, precision) .. ' Kbit/s';
@ -1581,12 +1581,18 @@ function maxRateToString(max_rate)
if(max_rate == 0) then
return("Drop All Traffic")
else
if(max_rate < 1024) then
return(max_rate.." Kbps")
if(max_rate < 1000) then
return(max_rate.." Kbit/s")
else
local mr
mr = round(max_rate / 1024, 2)
return(mr.." Mbps")
mr = round(max_rate / 1000, 2)
if(mr < 1000) then
return(mr.." Mbit/s")
else
gbit = mr /1000
return(gbit.." Gbit/s")
end
end
end
end