Commit c10fb545 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) remove cache stuff from find_interface_subnet

parent 8da32378
...@@ -2839,7 +2839,6 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) { ...@@ -2839,7 +2839,6 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) {
function interface_configure($interface = 'wan', $reloadall = false, $linkupevent = false) function interface_configure($interface = 'wan', $reloadall = false, $linkupevent = false)
{ {
global $config; global $config;
global $interface_sn_arr_cache;
global $interface_snv6_arr_cache; global $interface_snv6_arr_cache;
$wancfg = $config['interfaces'][$interface]; $wancfg = $config['interfaces'][$interface];
...@@ -2956,7 +2955,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven ...@@ -2956,7 +2955,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
} }
/* invalidate interface/ip/sn cache */ /* invalidate interface/ip/sn cache */
unset($interface_sn_arr_cache[$realif]);
unset($interface_snv6_arr_cache[$realif]); unset($interface_snv6_arr_cache[$realif]);
$tunnelif = substr($realif, 0, 3); $tunnelif = substr($realif, 0, 3);
...@@ -4540,27 +4538,15 @@ function find_interface_ipv6_ll($interface) { ...@@ -4540,27 +4538,15 @@ function find_interface_ipv6_ll($interface) {
return null; return null;
} }
function find_interface_subnet($interface, $flush = false) { function find_interface_subnet($interface) {
global $interface_sn_arr_cache; $interface = trim($interface);
if (does_interface_exist($interface)) {
if (!isset($interface_sn_arr_cache) || !is_array($interface_sn_arr_cache)){ $ifinfo = pfSense_get_interface_addresses($interface);
$interface_sn_arr_cache = array(); if (isset($ifinfo['subnetbits'])) {
} return $ifinfo['subnetbits'];
}
$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;
} }
} return null;
return $interface_sn_arr_cache[$interface];
} }
function find_interface_subnetv6($interface, $flush = false) { function find_interface_subnetv6($interface, $flush = false) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment