lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: make this easier to read

Browse Source
This commit is contained in:
Franco Fichtner 2021-02-26 00:43:11 +01:00 committed by Ad Schellevis
parent 1cbee54644
commit 1bafebe861
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/inc/interfaces.inc
View File

@ -2458,12 +2458,10 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
switch ($wancfg['ipaddrv6']) {
case 'slaac':
case 'dhcp6':
/* XXX why not tell the function... */
if (isset($wancfg['dhcp6usev4iface'])) {
break;
if (!isset($wancfg['dhcp6usev4iface'])) {
interface_dhcpv6_prepare($interface, $wancfg);
interface_dhcpv6_configure($interface, $wancfg);
}
interface_dhcpv6_prepare($interface, $wancfg);
interface_dhcpv6_configure($interface, $wancfg);
break;
case '6rd':
interface_6rd_configure($interface, $wancfg);
@ -2475,11 +2473,9 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
interface_track6_configure($interface, $wancfg, $reload || $linkupevent);
break;
default:
/* XXX why not tell the function... */
if (isset($wancfg['dhcp6usev4iface'])) {
break;
if (!isset($wancfg['dhcp6usev4iface'])) {
interface_static6_configure($interface, $wancfg);
}
interface_static6_configure($interface, $wancfg);
break;
}
}

12
src/etc/rc.newwanip
View File

@ -114,17 +114,15 @@ if (isset($config['interfaces'][$interface]['ipaddrv6'])) {
break;
case 'dhcp6':
case 'slaac':
if (!isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
break;
if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
interface_dhcpv6_prepare($interface, $config['interfaces'][$interface]);
interface_dhcpv6_configure($interface, $config['interfaces'][$interface]);
}
interface_dhcpv6_prepare($interface, $config['interfaces'][$interface]);
interface_dhcpv6_configure($interface, $config['interfaces'][$interface]);
break;
default:
if (!isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
break;
if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
interface_static6_configure($interface, $config['interfaces'][$interface]);
}
interface_static6_configure($interface, $config['interfaces'][$interface]);
break;
}
}