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

system: refactor route creation for exec_safe() use

Browse Source 
While here ignore all return values consistently.  Most of them are
ignored, some of them already on the add case.  Makes little sense
to report errors on a fraction of operations and adding the same route
will unfortunately yield an error anyway so it's not helpful in the
bulk of cases either.
This commit is contained in:
Franco Fichtner 2025-01-08 11:54:20 +01:00
parent 7c1caf1a11
commit 0dd857bf03
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/etc/inc/system.inc
View File

@ -735,46 +735,52 @@ function system_routing_configure($verbose = false, $interface_map = null, $moni
continue;
}
$interfacegw = $gateway['if'];
$gatewayip = $gateway['gateway'] ?? '';
$fargw = !empty($gateway['fargw']) && $gateway['ipprotocol'] != 'inet6';
$blackhole = '';
$cmd = [exec_safe('-%s', $ipproto)];
switch ($rtent['gateway']) {
case 'Null4':
case 'Null6':
$blackhole = '-blackhole';
$cmd[] = '-blackhole';
break;
default:
break;
}
/* XXX some day we might want to convert to safer mwexecf() */
$cmd = " -{$ipproto} {$blackhole} " . escapeshellarg($rtent['network']) . " ";
$cmd[] = exec_safe('%s', $rtent['network']);
if (!empty($rtent['disabled'])) {
mwexec("/sbin/route delete {$cmd}", true);
mwexec('/sbin/route delete ' . join(' ', $cmd), true);
continue;
}
$gatewayip = $gateway['gateway'] ?? '';
$interfacegw = $gateway['if'];
if (is_ipaddr($gatewayip)) {
mwexec("/sbin/route delete {$cmd}", true);
mwexec('/sbin/route delete ' . join(' ', $cmd), true);
if (ipproto == 'inet' && is_ipaddrv6($gatewayip)) {
/* RFC 5549: gateway protocol differs */
$cmd .= ' -inet6 ';
$cmd[] = '-inet6'; /* RFC 5549: gateway protocol differs */
}
if ($fargw) {
if (!empty($gateway['fargw']) && $gateway['ipprotocol'] != 'inet6') {
mwexecf('/sbin/route delete -%s %s -interface %s ', [$ipproto, $gatewayip, $interfacegw], true);
mwexecf('/sbin/route add -%s %s -interface %s', [$ipproto, $gatewayip, $interfacegw]);
mwexecf('/sbin/route add -%s %s -interface %s', [$ipproto, $gatewayip, $interfacegw], true);
} elseif (is_linklocal($gatewayip) && strpos($gatewayip, '%') === false) {
$gatewayip .= "%{$interfacegw}";
}
mwexec("/sbin/route add" . $cmd . escapeshellarg($gatewayip));
$cmd = exec_safe('%s', $gatewayip);
mwexec('/sbin/route add ' . join(' ', $cmd), true);
} elseif (!empty($interfacegw)) {
mwexec("/sbin/route delete" . $cmd . "-interface " . escapeshellarg($interfacegw), true);
mwexec("/sbin/route add" . $cmd . "-interface " . escapeshellarg($interfacegw));
$cmd[] = '-interface';
$cmd[] = exec_safe('%s', $interfacegw);
mwexec('/sbin/route delete ' . join(' ', $cmd), true);
}
mwexec('/sbin/route add ' . join(' ', $cmd), true);
}
}