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

(legacy) fixing cleanups

Browse Source
This commit is contained in:
Ad Schellevis 2015-07-15 12:41:44 +00:00
parent f93caed4c6
commit 1f70bc5914
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/etc/inc/interfaces.inc
View File

@ -4574,6 +4574,10 @@ function link_interface_to_gif($interface)
function find_interface_ip($interface, $flush = false) {
global $interface_ip_arr_cache;
if (!isset($interface_ip_arr_cache) || !is_array($interface_ip_arr_cache)) {
$interface_ip_arr_cache = array() ;
}
$interface = str_replace("\n", "", $interface);
if (!does_interface_exist($interface))
@ -4597,9 +4601,12 @@ function find_interface_ip($interface, $flush = false) {
*/
function find_interface_ipv6($interface, $flush = false) {
global $interface_ipv6_arr_cache;
global $interface_snv6_arr_cache;
global $config;
if (!isset($interface_ipv6_arr_cache) || !is_array($interface_ipv6_arr_cache)) {
$interface_ipv6_arr_cache = array();
}
$interface = trim($interface);
$interface = get_real_interface($interface);
@ -4611,11 +4618,12 @@ function find_interface_ipv6($interface, $flush = false) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['ipaddr6'])) {
$interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6'];
$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6'];
} else {
return null;
}
return $interface_ipv6_arr_cache[$interface];
}
return;
return $interface_ipv6_arr_cache[$interface];
}
/*
@ -4649,37 +4657,47 @@ function find_interface_ipv6_ll($interface, $flush = false) {
function find_interface_subnet($interface, $flush = false) {
global $interface_sn_arr_cache;
if (!isset($interface_sn_arr_cache) || !is_array($interface_sn_arr_cache)){
$interface_sn_arr_cache = array();
}
$interface = str_replace("\n", "", $interface);
if (does_interface_exist($interface) == false)
return;
if (!isset($interface_sn_arr_cache[$interface]) || $flush) {
if (!isset($interface_sn_arr_cache[$interface]['subnetbits']) || $flush) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['subnetbits'])) {
$interface_sn_arr_cache[$interface] = $ifinfo['subnetbits'];
return $interface_sn_arr_cache[$interface];
} else {
return null;
}
}
return;
return $interface_sn_arr_cache[$interface];
}
function find_interface_subnetv6($interface, $flush = false) {
global $interface_snv6_arr_cache;
global $interface_ipv6_arr_cache;
if (!isset($interface_snv6_arr_cache) || !is_array($interface_snv6_arr_cache)) {
$interface_snv6_arr_cache = array();
}
$interface = str_replace("\n", "", $interface);
if (does_interface_exist($interface) == false)
return;
if (!isset($interface_snv6_arr_cache[$interface]) or $flush) {
if (!isset($interface_snv6_arr_cache[$interface]['subnetbits6']) || $flush) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['ipaddr6'])) {
$interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6'];
if (isset($ifinfo['subnetbits6'])) {
$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6'];
return $interface_snv6_arr_cache[$interface];
} else {
return null ;
}
}
return;
return $interface_snv6_arr_cache[$interface];
}
function ip_in_interface_alias_subnet($interface, $ipalias) {