OpenWrt/openwrt-luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci synced 2025-01-08 12:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-network: follow-up fix for 7235072315

Browse Source 
add a null-check before parsing networks
loop through available networks on all interfaces except loopback

Closes #7047

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
Paul Donald 2024-04-07 03:30:56 +02:00
parent 4ca87f6576
commit 7fa789a13a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
View File

@ -996,15 +996,19 @@ return view.extend({
for(var x of uci.get('system', 'ntp', 'server') || '') {
so.value(x);
}
var lan_net = this.networks.filter(function(n) { return n.getName() == 'lan' })[0];
// If ntpd is set up, suggest our IP(v6) also
if(uci.get('system', 'ntp', 'enable_server')) {
lan_net.getIPAddrs().forEach(function(i4) {
so.value(i4.split('/')[0]);
});
lan_net.getIP6Addrs().forEach(function(i6) {
so.value(i6.split('/')[0]);
});
var local_nets = this.networks.filter(function(n) { return n.getName() != 'loopback' });
if(local_nets) {
// If ntpd is set up, suggest our IP(v6) also
if(uci.get('system', 'ntp', 'enable_server')) {
local_nets.forEach(function(n){
n.getIPAddrs().forEach(function(i4) {
so.value(i4.split('/')[0]);
});
n.getIP6Addrs().forEach(function(i6) {
so.value(i6.split('/')[0]);
});
});
}
}
so.optional = true;
so.rmempty = true;