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

(legacy) remove cache stuff from find_interface_subnet

Browse Source
This commit is contained in:
Ad Schellevis 2015-11-04 16:42:04 +00:00
parent 8da3237894
commit c10fb5458b
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2839,7 +2839,6 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) {
function interface_configure($interface = 'wan', $reloadall = false, $linkupevent = false)
{
global $config;
global $interface_sn_arr_cache;
global $interface_snv6_arr_cache;
$wancfg = $config['interfaces'][$interface];
@ -2956,7 +2955,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
}
/* invalidate interface/ip/sn cache */
unset($interface_sn_arr_cache[$realif]);
unset($interface_snv6_arr_cache[$realif]);
$tunnelif = substr($realif, 0, 3);
@ -4540,27 +4538,15 @@ function find_interface_ipv6_ll($interface) {
return null;
}
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]['subnetbits']) || $flush) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['subnetbits'])) {
$interface_sn_arr_cache[$interface] = $ifinfo['subnetbits'];
} else {
return null;
function find_interface_subnet($interface) {
$interface = trim($interface);
if (does_interface_exist($interface)) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['subnetbits'])) {
return $ifinfo['subnetbits'];
}
}
}
return $interface_sn_arr_cache[$interface];
return null;
}
function find_interface_subnetv6($interface, $flush = false) {