(legacy) remove cache stuff from find_interface_subnetv6

src/etc/inc/interfaces.inc

@@ -2839,7 +2839,6 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) {
 function interface_configure($interface = 'wan', $reloadall = false, $linkupevent = false)
 {
 	global $config;
-	global $interface_snv6_arr_cache;
 
 	$wancfg = $config['interfaces'][$interface];
 
@@ -2954,9 +2953,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
 		legacy_interface_flags($realhwif, interface_override_flags());
 	}
 
-	/* invalidate interface/ip/sn cache */
-	unset($interface_snv6_arr_cache[$realif]);
-
 	$tunnelif = substr($realif, 0, 3);
 	switch ($wancfg['ipaddr']) {
 	case 'dhcp':
@@ -3151,7 +3147,6 @@ function interface_track6_configure($interface = 'lan', $wancfg, $linkupevent =
 function interface_track6_6rd_configure($interface = 'lan', $lancfg)
 {
 	global $config;
-	global $interface_snv6_arr_cache;
 
 	if (!is_array($lancfg))
 		return;
@@ -3201,7 +3196,6 @@ function interface_track6_6rd_configure($interface = 'lan', $lancfg)
 	$oip = find_interface_ipv6($lanif);
 	if (is_ipaddrv6($oip))
 		mwexec("/sbin/ifconfig {$lanif} inet6 {$oip} delete");
-	unset($interface_snv6_arr_cache[$lanif]);
 	log_error("rd6 {$interface} with ipv6 address {$rd6lan} based on {$lancfg['track6-interface']} ipv4 {$ip4address}");
 	mwexec("/sbin/ifconfig {$lanif} inet6 {$rd6lan} prefixlen 64");
 
@@ -3211,7 +3205,6 @@ function interface_track6_6rd_configure($interface = 'lan', $lancfg)
 function interface_track6_6to4_configure($interface = 'lan', $lancfg)
 {
 	global $config;
-	global $interface_snv6_arr_cache;
 
 	if (!is_array($lancfg))
 		return;
@@ -3257,7 +3250,6 @@ function interface_track6_6to4_configure($interface = 'lan', $lancfg)
 	$oip = find_interface_ipv6($lanif);
 	if (is_ipaddrv6($oip))
 		mwexec("/sbin/ifconfig {$lanif} inet6 {$oip} delete");
-	unset($interface_snv6_arr_cache[$lanif]);
 	log_error("sixto4 {$interface} with ipv6 address {$sixto4lan} based on {$lancfg['track6-interface']} ipv4 {$ip4address}");
 	mwexec("/sbin/ifconfig {$lanif} inet6 {$sixto4lan} prefixlen 64");
 
@@ -4549,27 +4541,15 @@ function find_interface_subnet($interface) {
 		return null;
 }
 
-function find_interface_subnetv6($interface, $flush = false) {
-	global $interface_snv6_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]['subnetbits6']) || $flush) {
+function find_interface_subnetv6($interface) {
+		$interface = trim($interface);
+		if (does_interface_exist($interface)) {
 				$ifinfo = pfSense_get_interface_addresses($interface);
 				if (isset($ifinfo['subnetbits6'])) {
-			$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6'];
-		} else {
-			return null ;
+						return $ifinfo['subnetbits6'];
 				}
 		}
-
-	return $interface_snv6_arr_cache[$interface];
+		return null;
 }
 
 function ip_in_interface_alias_subnet($interface, $ipalias) {