lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: refactor a bit for PPP

Browse Source
This commit is contained in:
Franco Fichtner 2024-09-16 08:50:43 +02:00
parent af62c482e2
commit 0176a47c36
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1038,15 +1038,14 @@ function interface_ppps_configure($interface)
return;
}
$ipv4_mode = false;
$ipv6_mode = false;
$ipv4_mode = $ipv6_mode = 'disable';
switch ($ifcfg['ipaddr'] ?? 'none') {
case 'ppp':
case 'pppoe':
case 'pptp':
case 'l2tp':
$ipv4_mode = true;
$ipv4_mode = 'enable';
break;
default:
break;
@ -1056,20 +1055,16 @@ function interface_ppps_configure($interface)
case 'dhcp6':
case 'pppoev6':
case 'slaac':
$ipv6_mode = true;
$ipv6_mode = 'enable';
break;
default:
break;
}
if (!$ipv4_mode && !$ipv6_mode) {
if ($ipv4_mode != 'enable' && $ipv6_mode != 'enable') {
return;
}
/* we need the mode to render in the configuration */
$ipv4_mode = $ipv4_mode ? 'enable' : 'disable';
$ipv6_mode = $ipv6_mode ? 'enable' : 'disable';
$ppp = null;
$idx = 0;
@ -1081,12 +1076,6 @@ function interface_ppps_configure($interface)
}
}
/* XXX since interface_ppps_capable() verified this it is likely spurious to check */
if (empty($ppp)) {
log_msg("interface_ppps_configure() cannot find PPP config for device {$ifcfg['if']}", LOG_ERR);
return;
}
$ports = explode(',', $ppp['ports']);
if ($ppp['type'] != "ppp") {
foreach ($ports as $pid => $port) {