lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: default gateway disappears, needs more refactoring for clarity

Browse Source 
PR: https://github.com/opnsense/core/issues/2164
This commit is contained in:
Franco Fichtner 2018-02-03 20:01:29 +01:00
parent 64ad42d349
commit f09eaf7f3a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,13 +457,13 @@ function system_routing_configure($interface = '', $verbose = false)
$foundgwv6 = false;
$fargw = false;
/* XXX eventually this file-based workaround must be removed */
foreach (glob('/tmp/*_defaultgw{,v6}', GLOB_BRACE) as $to_delete) {
@unlink($to_delete);
}
/* tack on all the hard defined gateways as well */
if (isset($config['gateways']['gateway_item'])) {
/* XXX eventually this file-based workaround must be removed */
foreach (glob('/tmp/*_defaultgw{,v6}', GLOB_BRACE) as $to_delete) {
@unlink($to_delete);
}
foreach ($config['gateways']['gateway_item'] as $gateway) {
if (isset($gateway['defaultgw'])) {
if ($gateway['ipprotocol'] != "inet6" && (is_ipaddrv4($gateway['gateway']) || $gateway['gateway'] == "dynamic")) {
@ -498,9 +498,6 @@ function system_routing_configure($interface = '', $verbose = false)
$foundgwv6 = true;
}
}
if ($foundgw === true && $foundgwv6 === true) {
break;
}
}
}
@ -510,6 +507,7 @@ function system_routing_configure($interface = '', $verbose = false)
$gatewayip = get_interface_gateway("wan");
@touch("/tmp/{$defaultif}_defaultgw");
}
if (!$foundgwv6) {
$defaultifv6 = get_real_interface("wan");
$interfacegwv6 = "wan";