Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: network.js: prefer netifd traffic stats over getifaddrs() ones

Browse source 
Overwrite the traffic statistics reported by getifaddrs() with the ones
reported by the network.device/status procedure if available as the
getifaddr() stats are limited to 32bit counters.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-10-17 09:19:03 +02:00
parent 5f54983ad0
commit 51b519e55e
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/luci-base/htdocs/luci-static/resources/network.js
View file

@ -438,14 +438,19 @@ function initNetworkState(refresh) {
getHostHints(), getProtocolHandlers(), getHostHints(), getProtocolHandlers(),
uci.load('network'), uci.load('wireless'), uci.load('luci') uci.load('network'), uci.load('wireless'), uci.load('luci')
]).then(function(data) { ]).then(function(data) {
var board = data[2], ifaddrs = data[3], devices = data[4]; var netifd_ifaces = data[0],
netifd_devs = data[1],
board_json = data[2],
luci_ifaddrs = data[3],
luci_devs = data[4];
var s = { var s = {
isTunnel: {}, isBridge: {}, isSwitch: {}, isWifi: {}, isTunnel: {}, isBridge: {}, isSwitch: {}, isWifi: {},
ifaces: data[0], devices: data[1], radios: data[5], ifaces: netifd_ifaces, radios: data[5], hosts: data[6],
hosts: data[6], netdevs: {}, bridges: {}, switches: {} netdevs: {}, bridges: {}, switches: {}
}; };
for (var i = 0, a; (a = ifaddrs[i]) != null; i++) { for (var i = 0, a; (a = luci_ifaddrs[i]) != null; i++) {
var name = a.name.replace(/:.+$/, ''); var name = a.name.replace(/:.+$/, '');
if (isVirtualIfname(name)) if (isVirtualIfname(name))
@ -477,8 +482,21 @@ function initNetworkState(refresh) {
} }
} }
for (var devname in devices) { /* override getifaddr() stats with netifd device status stats as
var dev = devices[devname]; the former are limited to 32bit counters only */
for (var devname in netifd_devs) {
if (!s.netdevs.hasOwnProperty(devname))
continue;
if (!L.isObject(netifd_devs[devname]))
continue;
s.netdevs[devname].stats = Object.assign({},
s.netdevs[devname].stats, netifd_devs[devname].statistics);
}
for (var devname in luci_devs) {
var dev = luci_devs[devname];
if (dev.bridge) { if (dev.bridge) {
var b = { var b = {
@ -512,9 +530,9 @@ function initNetworkState(refresh) {
} }
} }
if (L.isObject(board.switch)) { if (L.isObject(board_json.switch)) {
for (var switchname in board.switch) { for (var switchname in board_json.switch) {
var layout = board.switch[switchname], var layout = board_json.switch[switchname],
netdevs = {}, netdevs = {},
nports = {}, nports = {},
ports = [], ports = [],
@ -576,8 +594,8 @@ function initNetworkState(refresh) {
} }
} }
if (L.isObject(board.dsl) && L.isObject(board.dsl.modem)) { if (L.isObject(board_json.dsl) && L.isObject(board_json.dsl.modem)) {
s.hasDSLModem = board.dsl.modem; s.hasDSLModem = board_json.dsl.modem;
} }
_init = null; _init = null;