upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup HA/CARP safety checks for PPP links patch

Browse source 
Proper indentation and better comment for HA/CARP safety checks for PPP links
This commit is contained in:
Patrick Monfette 2026-03-05 00:40:44 -05:00 committed by GitHub
parent 517671ce4c
commit 052a37494f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/etc/inc/interfaces.inc
View file

@ -1339,36 +1339,36 @@ EOD;
}
/*
* HA/CARP safety for PPP links:
* If "Disconnect dialup interfaces" is enabled, only allow PPP startup
* when at least one underlying parent interface is currently CARP MASTER.
* In HA mode with disconnectppps enabled, only start PPP when at least
* one underlying parent interface is currently CARP MASTER.
*
* This prevents a rebooted BACKUP node from starting PPPoE later in boot
* after the CARP hook has already tried (too early) to suspend it.
* During boot, the CARP hook may already have processed a BACKUP event
* before the PPP pseudo-interface exists. Without this guard, the later
* normal startup path can still start PPP on a BACKUP node.
*/
if (!empty($config['hasync']['disconnectppps'])) {
$carp_master = false;
$carp_master = false;
foreach ($ports as $port) {
$ifconfig_out = shell_exec('/sbin/ifconfig ' . escapeshellarg($port) . ' 2>/dev/null');
if (!is_string($ifconfig_out)) {
continue;
foreach ($ports as $port) {
$ifconfig_out = shell_exec('/sbin/ifconfig ' . escapeshellarg($port) . ' 2>/dev/null');
if (!is_string($ifconfig_out)) {
continue;
}
if (preg_match('/\bcarp:\s+MASTER\b/m', $ifconfig_out)) {
$carp_master = true;
break;
}
}
if (preg_match('/\bcarp:\s+MASTER\b/m', $ifconfig_out)) {
$carp_master = true;
break;
if (!$carp_master) {
log_msg(
"interface_ppps_configure() skipped for {$interface} " .
"(disconnectppps enabled, no parent interface is CARP MASTER)",
LOG_NOTICE
);
return;
}
}
if (!$carp_master) {
log_msg(
"interface_ppps_configure() skipped for {$interface} " .
"(disconnectppps enabled, no parent interface is CARP MASTER)",
LOG_NOTICE
);
return;
}
}
/* precaution for post-start 'up' check */