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

luci-base: network.js: get low level device details from getifaddr() info

Browse source 
Fixes: #3078
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-18 07:19:18 +02:00
parent a67175cab1
commit 10880b565f
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1756,10 +1756,16 @@ Device = L.Class.extend({
this.network = network; this.network = network;
}, },
_ubus: function(field) { _devstate: function(/* ... */) {
var dump = _state.devices[this.ifname] || {}; var rv = this.dev;
return (field != null ? dump[field] : dump); for (var i = 0; i < arguments.length; i++)
if (L.isObject(rv))
rv = rv[arguments[i]];
else
return null;
return rv;
}, },
getName: function() { getName: function() {
@ -1767,24 +1773,21 @@ Device = L.Class.extend({
}, },
getMAC: function() { getMAC: function() {
var mac = (this.dev != null ? this.dev.macaddr : null); var mac = this._devstate('macaddr');
if (mac == null)
mac = this._ubus('macaddr');
return mac ? mac.toUpperCase() : null; return mac ? mac.toUpperCase() : null;
}, },
getMTU: function() { getMTU: function() {
return this.dev ? this.dev.mtu : null; return this._devstate('mtu');
}, },
getIPAddrs: function() { getIPAddrs: function() {
var addrs = (this.dev != null ? this.dev.ipaddrs : null); var addrs = this._devstate('ipaddrs');
return (Array.isArray(addrs) ? addrs : []); return (Array.isArray(addrs) ? addrs : []);
}, },
getIP6Addrs: function() { getIP6Addrs: function() {
var addrs = (this.dev != null ? this.dev.ip6addrs : null); var addrs = this._devstate('ip6addrs');
return (Array.isArray(addrs) ? addrs : []); return (Array.isArray(addrs) ? addrs : []);
}, },
@ -1874,7 +1877,7 @@ Device = L.Class.extend({
}, },
isUp: function() { isUp: function() {
var up = this._ubus('up'); var up = this._devstate('flags', 'up');
if (up == null) if (up == null)
up = (this.getType() == 'alias'); up = (this.getType() == 'alias');
@ -1887,26 +1890,26 @@ Device = L.Class.extend({
}, },
isBridgePort: function() { isBridgePort: function() {
return (this.dev != null && this.dev.bridge != null); return (this._devstate('bridge') != null);
}, },
getTXBytes: function() { getTXBytes: function() {
var stat = this._ubus('statistics'); var stat = this._devstate('stats');
return (stat != null ? stat.tx_bytes || 0 : 0); return (stat != null ? stat.tx_bytes || 0 : 0);
}, },
getRXBytes: function() { getRXBytes: function() {
var stat = this._ubus('statistics'); var stat = this._devstate('stats');
return (stat != null ? stat.rx_bytes || 0 : 0); return (stat != null ? stat.rx_bytes || 0 : 0);
}, },
getTXPackets: function() { getTXPackets: function() {
var stat = this._ubus('statistics'); var stat = this._devstate('stats');
return (stat != null ? stat.tx_packets || 0 : 0); return (stat != null ? stat.tx_packets || 0 : 0);
}, },
getRXPackets: function() { getRXPackets: function() {
var stat = this._ubus('statistics'); var stat = this._devstate('stats');
return (stat != null ? stat.rx_packets || 0 : 0); return (stat != null ? stat.rx_packets || 0 : 0);
}, },