mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix adding interface to bridge

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-03 11:12:55 +01:00
parent 0e78dd8e17
commit 2045e47c77
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -502,7 +502,35 @@ return view.extend({
ifname_multi.optional = true; ifname_multi.optional = true;
ifname_multi.network = ifc.getName(); ifname_multi.network = ifc.getName();
ifname_multi.display_size = 6; ifname_multi.display_size = 6;
ifname_multi.write = ifname_multi.remove = function() {}; ifname_multi.write = ifname_multi.remove = function(section_id, value) {
var old_ifnames = [],
devs = ifc.getDevices() || L.toArray(ifc.getDevice());
for (var i = 0; i < devs.length; i++)
old_ifnames.push(devs[i].getName());
var new_ifnames = L.toArray(value);
if (!value)
new_ifnames.length = Math.max(new_ifnames.length, 1);
old_ifnames.sort();
new_ifnames.sort();
for (var i = 0; i < Math.max(old_ifnames.length, new_ifnames.length); i++) {
if (old_ifnames[i] != new_ifnames[i]) {
// backup_ifnames()
for (var j = 0; j < old_ifnames.length; j++)
ifc.deleteDevice(old_ifnames[j]);
for (var j = 0; j < new_ifnames.length; j++)
ifc.addDevice(new_ifnames[j]);
break;
}
}
};
ifname_single.cfgvalue = ifname_multi.cfgvalue = function(section_id) { ifname_single.cfgvalue = ifname_multi.cfgvalue = function(section_id) {
var devs = ifc.getDevices() || L.toArray(ifc.getDevice()), var devs = ifc.getDevices() || L.toArray(ifc.getDevice()),
@ -839,7 +867,7 @@ return view.extend({
else if (ifname_master.isActive('_new_')) { else if (ifname_master.isActive('_new_')) {
uci.set('network', section_id, 'type', 'macvlan'); uci.set('network', section_id, 'type', 'macvlan');
uci.set('network', section_id, 'ifname', section_id); uci.set('network', section_id, 'ifname', section_id);
uci.set('network', section_id, 'masterintf', L.toArray(ifname_multi.formvalue('_new_')).join(' ')); uci.set('network', section_id, 'masterintf', L.toArray(ifname_master.formvalue('_new_')).join(' '));
} }
}).then(L.bind(m.children[0].renderMoreOptionsModal, m.children[0], nameval)); }).then(L.bind(m.children[0].renderMoreOptionsModal, m.children[0], nameval));