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

interfaces: clean this up more

Browse Source 
Explicit checks on IPv6 on PPP types, except the PPP itself
since it works on a device node instead and has no visible
parent device.
This commit is contained in:
Franco Fichtner 2023-01-16 09:37:47 +01:00
parent f7dafda837
commit c991075d95
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3467,30 +3467,31 @@ function get_real_interface($interface = 'wan', $family = 'all')
}
if ($family == 'inet6') {
switch ($cfg['ipaddrv6'] ?? '') {
case 'pppoev6':
break;
switch ($cfg['ipaddrv6'] ?? 'none') {
case '6rd':
case '6to4':
$realif = "{$interface}_stf";
break;
default:
/* XXX integration is still suboptimal making wild assumptions with "default" label */
switch ($cfg['ipaddr'] ?? '') {
case 'dhcp6':
case 'slaac':
case 'staticv6':
if (isset($cfg['dhcp6usev4iface'])) {
/* keep preset as requested */
break;
}
switch ($cfg['ipaddr'] ?? 'none') {
case 'l2tp':
case 'ppp':
case 'pppoe':
case 'pptp':
$parent = get_ppp_parent($realif);
if (!isset($cfg['dhcp6usev4iface']) && strpos($parent, '/') !== 0) {
/* deliver parent on request as long as it is not a device node */
$realif = $parent;
}
/* except for "ppp" all have parent interfaces */
$realif = get_ppp_parent($realif);
break;
default:
break;
}
break;
default:
break;
}
}
break;