diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-03-03 13:30:57 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-03-03 13:31:01 -0300 |
| commit | d07bc322c58f13d62bb6416b22e29983ef75b02f (patch) | |
| tree | ef4dcb58a81c2c57367380f45ffc09288a8cba75 /etc/inc | |
| parent | bf36dafa261e33b7c6ed0fb8eebc59ff6ad26dd9 (diff) | |
| download | pfsense-d07bc322c58f13d62bb6416b22e29983ef75b02f.zip pfsense-d07bc322c58f13d62bb6416b22e29983ef75b02f.tar.gz | |
Remove broken 'dynamic6' gateway, we already have ipprotocol to tell us the IP version, leave it more simple using only 'dynamic'. It helps #3484
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/gwlb.inc | 12 | ||||
| -rw-r--r-- | etc/inc/system.inc | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 7f35030..2beaa9c 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -431,7 +431,7 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive continue; /* if the gateway is dynamic and we can find the IPv4, Great! */ - if (empty($gateway['gateway']) || $gateway['gateway'] == "dynamic" || $gateway['gateway'] == "dynamic6") { + if (empty($gateway['gateway']) || $gateway['gateway'] == "dynamic") { if ($gateway['ipprotocol'] == "inet") { /* we know which interfaces is dynamic, this should be made a function */ $gateway['gateway'] = get_interface_gateway($gateway['interface']); @@ -441,13 +441,13 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive $gateway['dynamic'] = true; } - /* if the gateway is dynamic6 and we can find the IPv6, Great! */ + /* if the gateway is dynamic and we can find the IPv6, Great! */ else if ($gateway['ipprotocol'] == "inet6") { /* we know which interfaces is dynamic, this should be made a function, and for v6 too */ $gateway['gateway'] = get_interface_gateway_v6($gateway['interface']); - /* no IPv6 address found, set to dynamic6 */ + /* no IPv6 address found, set to dynamic */ if (!is_ipaddrv6($gateway['gateway'])) - $gateway['gateway'] = "dynamic6"; + $gateway['gateway'] = "dynamic"; $gateway['dynamic'] = true; } } else { @@ -628,7 +628,7 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive /* Loopback dummy for dynamic interfaces without a IP */ if (!is_ipaddrv6($gateway['gateway']) && $gateway['dynamic'] == true) - $gateway['gateway'] = "dynamic6"; + $gateway['gateway'] = "dynamic"; /* automatically skip known static and dynamic gateways we have a array entry for */ foreach($gateways_arr as $gateway_item) { @@ -713,7 +713,7 @@ function fixup_default_gateway($ipprotocol, $gateways_status, $gateways_arr) { $dfltgwdown = true; } if ($dfltgwdown == true && !empty($upgw)) { - if (preg_match("/dynamic/i", $gateways_arr[$upgw]['gateway'])) + if ($gateways_arr[$upgw]['gateway'] == "dynamic") $gateways_arr[$upgw]['gateway'] = get_interface_gateway($gateways_arr[$upgw]['friendlyiface']); if (is_ipaddr($gateways_arr[$upgw]['gateway'])) { log_error("Default gateway down setting {$upgw} as default!"); diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 421abad..755eda6 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -400,8 +400,8 @@ function system_routing_configure($interface = "") { @file_put_contents("{$g['tmp_path']}/{$defaultif}_defaultgw", $gateway['gateway']); } $foundgw = true; - } else if ($gateway['ipprotocol'] == "inet6" && (is_ipaddrv6($gateway['gateway']) || $gateway['gateway'] == "dynamic6")) { - if ($gateway['gateway'] == "dynamic6") + } else if ($gateway['ipprotocol'] == "inet6" && (is_ipaddrv6($gateway['gateway']) || $gateway['gateway'] == "dynamic")) { + if ($gateway['gateway'] == "dynamic") $gateway['gateway'] = get_interface_gateway_v6($gateway['interface']); $gatewayipv6 = $gateway['gateway']; $interfacegwv6 = $gateway['interface']; |
