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

luci-mod-network: fix loading ra_mtu and ra_hoplimit options

Browse source 
Fixes: #5565
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d19d717de2)
This commit is contained in:
Jo-Philipp Wich 2021-12-01 23:08:19 +01:00
parent ecc3c03e25
commit 5091496ea3
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
View file

@ -835,15 +835,17 @@ return view.extend({
so.depends('ra', 'server');
so.depends({ ra: 'hybrid', master: '0' });
so.load = function(section_id) {
var dev = ifc.getL3Device();
var dev = ifc.getL3Device(),
path = dev ? "/proc/sys/net/ipv6/conf/%s/mtu".format(dev.getName()) : null;
if (dev) {
var path = "/proc/sys/net/ipv6/conf/%s/mtu".format(dev.getName());
return Promise.all([
dev ? L.resolveDefault(fs.read(path), dev.getMTU()) : null,
this.super('load', [section_id])
]).then(L.bind(function(res) {
this.placeholder = +res[0];
return L.resolveDefault(fs.read(path), dev.getMTU()).then(L.bind(function(data) {
this.placeholder = data;
}, this));
}
return res[1];
}, this));
};
so = ss.taboption('ipv6-ra', form.Value, 'ra_hoplimit', _('<abbr title="Router Advertisement">RA</abbr> Hop Limit'), _('The maximum hops to be published in <abbr title="Router Advertisement">RA</abbr> messages. Maximum is 255 hops.'));
@ -852,15 +854,17 @@ return view.extend({
so.depends('ra', 'server');
so.depends({ ra: 'hybrid', master: '0' });
so.load = function(section_id) {
var dev = ifc.getL3Device();
var dev = ifc.getL3Device(),
path = dev ? "/proc/sys/net/ipv6/conf/%s/hop_limit".format(dev.getName()) : null;
if (dev) {
var path = "/proc/sys/net/ipv6/conf/%s/hop_limit".format(dev.getName());
return Promise.all([
dev ? L.resolveDefault(fs.read(path), 64) : null,
this.super('load', [section_id])
]).then(L.bind(function(res) {
this.placeholder = +res[0];
return L.resolveDefault(fs.read(path), 64).then(L.bind(function(data) {
this.placeholder = data;
}, this));
}
return res[1];
}, this));
};