lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

routing, gateways. add function to return "down" gateways and remove now unused validate_address_family(), for https://github.com/opnsense/core/issues/2279

Browse Source
This commit is contained in:
Ad Schellevis 2019-04-10 18:05:57 +02:00
parent e40b64d5ba
commit dde1180b51
1 changed files with 11 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/etc/inc/gwlb.inc
View File

@ -613,6 +613,17 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
return $gateways_arr;
}
function return_down_gateways()
{
$result = array();
foreach (return_gateways_status() as $gwname => $stat) {
if (strpos($stat['status'], 'down') !== false) {
$result[] = $gwname;
}
}
return $result ;
}
function fixup_default_gateway()
{
$gateways_status = return_gateways_status();
@ -893,67 +904,6 @@ function get_interface_gateway_v6($wanif, &$dynamic = false)
return $gw;
}
/*
* Check an IP address against a gateway IP
* or name to verify its address family
*/
function validate_address_family($ipaddr, $gwname)
{
$v4ip = false;
$v6ip = false;
$v4gw = false;
$v6gw = false;
if (is_ipaddrv4($ipaddr)) {
$v4ip = true;
}
if (is_ipaddrv6($ipaddr)) {
$v6ip = true;
}
if (is_ipaddrv4($gwname)) {
$v4gw = true;
}
if (is_ipaddrv6($gwname)) {
$v6gw = true;
}
if ($v4ip && $v4gw) {
return true;
}
if ($v6ip && $v6gw) {
return true;
}
/* still no match, carry on, lookup gateways */
if (is_ipaddrv4(lookup_gateway_ip_by_name($gwname))) {
$v4gw = true;
}
if (is_ipaddrv6(lookup_gateway_ip_by_name($gwname))) {
$v6gw = true;
}
$gw_array = return_gateways_array();
if (is_array($gw_array[$gwname])) {
switch ($gw_array[$gwname]['ipprotocol']) {
case "inet":
$v4gw = true;
break;
case "inet6":
$v6gw = true;
break;
}
}
if ($v4ip && $v4gw) {
return true;
}
if ($v6ip && $v6gw) {
return true;
}
return false;
}
function running_dpinger_processes()
{
$result = array();