diff options
author | Renato Botelho <renato@netgate.com> | 2015-07-18 14:36:05 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-07-18 14:36:05 -0300 |
commit | 117948fdaa89fe78327eea9d914fe8474743f9fb (patch) | |
tree | fa1748dce8ccb301693302ac55c7e85ec21b4057 /etc/inc | |
parent | 2353f74c7af235637cda1a774455ffb5665d61d2 (diff) | |
parent | 205178aa8277442587aae5db76ff5510ebdcc5c9 (diff) | |
download | pfsense-117948fdaa89fe78327eea9d914fe8474743f9fb.zip pfsense-117948fdaa89fe78327eea9d914fe8474743f9fb.tar.gz |
Merge pull request #1738 from phil-davis/Static-Routes
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/gwlb.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 0627cb3..9880cdc 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -1033,9 +1033,9 @@ function dhclient_update_gateway_groups_defaultroute($interface = "wan") { } } -function lookup_gateway_ip_by_name($name) { +function lookup_gateway_ip_by_name($name, $disabled = false) { - $gateways_arr = return_gateways_array(false, true); + $gateways_arr = return_gateways_array($disabled, true); foreach ($gateways_arr as $gname => $gw) { if ($gw['name'] === $name || $gname === $name) { return $gw['gateway']; @@ -1141,7 +1141,7 @@ function get_interface_gateway_v6($interface, &$dynamic = false) { /* Check a IP address against a gateway IP or name * to verify it's address family */ -function validate_address_family($ipaddr, $gwname) { +function validate_address_family($ipaddr, $gwname, $disabled = false) { $v4ip = false; $v6ip = false; $v4gw = false; @@ -1168,10 +1168,10 @@ function validate_address_family($ipaddr, $gwname) { } /* still no match, carry on, lookup gateways */ - if (is_ipaddrv4(lookup_gateway_ip_by_name($gwname))) { + if (is_ipaddrv4(lookup_gateway_ip_by_name($gwname, $disabled))) { $v4gw = true; } - if (is_ipaddrv6(lookup_gateway_ip_by_name($gwname))) { + if (is_ipaddrv6(lookup_gateway_ip_by_name($gwname, $disabled))) { $v6gw = true; } |