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

luci-base: network.js: consider uci config for Device.getType()/getParent()

Browse source 
For network devices declared in uci but not yet created by netifd, the
runtime status information will be unavailable, causing methods such as
`getType()` to assume plain ethernet interfaces and `getParent()` to fail
resolving parent devices.

Fall back to infer the information from uci configuration settings in such
cases to give accurate type hints to callers.

In particular, this prevents LuCI from turning wireless target networks
containing a to-be-created bridge device into bridges themselves.

Fixes: https://github.com/openwrt/packages/issues/18768
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2022-06-16 09:47:47 +02:00
parent dae17ede36
commit 8effea58d7
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2852,6 +2852,15 @@ Device = baseclass.extend(/** @lends LuCI.network.Device.prototype */ {
this.device = this.device || device; this.device = this.device || device;
this.dev = Object.assign({}, _state.netdevs[this.device]); this.dev = Object.assign({}, _state.netdevs[this.device]);
this.network = network; this.network = network;
var conf;
uci.sections('network', 'device', function(s) {
if (s.name == device)
conf = s;
});
this.config = Object.assign({}, conf);
}, },
_devstate: function(/* ... */) { _devstate: function(/* ... */) {
@ -2946,6 +2955,10 @@ Device = baseclass.extend(/** @lends LuCI.network.Device.prototype */ {
return 'vlan'; return 'vlan';
else if (this.dev.devtype == 'dsa' || _state.isSwitch[this.device]) else if (this.dev.devtype == 'dsa' || _state.isSwitch[this.device])
return 'switch'; return 'switch';
else if (this.config.type == '8021q' || this.config.type == '8021ad')
return 'vlan';
else if (this.config.type == 'bridge')
return 'bridge';
else else
return 'ethernet'; return 'ethernet';
}, },
@ -3245,7 +3258,13 @@ Device = baseclass.extend(/** @lends LuCI.network.Device.prototype */ {
* ordinary ethernet interfaces. * ordinary ethernet interfaces.
*/ */
getParent: function() { getParent: function() {
return this.dev.parent ? Network.prototype.instantiateDevice(this.dev.parent) : null; if (this.dev.parent)
return Network.prototype.instantiateDevice(this.dev.parent);
if ((this.config.type == '8021q' || this.config.type == '802ad') && typeof(this.config.ifname) == 'string')
return Network.prototype.instantiateDevice(this.config.ifname);
return null;
} }
}); });