lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 11:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

(legacy) remove cache stuff from find_interface_ip

Browse Source
This commit is contained in:
Ad Schellevis 2015-11-04 15:46:56 +00:00
parent 6d916416cd
commit c73d86fe0b
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ EOD;
* the if block. So using $gateway['ipprotocol'] is the better option.
*/
if ($gateway['ipprotocol'] == "inet") { // This is an IPv4 gateway...
$gwifip = find_interface_ip($gateway['interface'], true);
$gwifip = find_interface_ip($gateway['interface']);
if (!is_ipaddrv4($gwifip))
continue; //Skip this target

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

@ -2839,7 +2839,7 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) {
function interface_configure($interface = 'wan', $reloadall = false, $linkupevent = false)
{
global $config;
global $interface_sn_arr_cache, $interface_ip_arr_cache;
global $interface_sn_arr_cache;
global $interface_snv6_arr_cache, $interface_ipv6_arr_cache;
$wancfg = $config['interfaces'][$interface];
@ -2956,7 +2956,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
}
/* invalidate interface/ip/sn cache */
unset($interface_ip_arr_cache[$realif]);
unset($interface_sn_arr_cache[$realif]);
unset($interface_ipv6_arr_cache[$realif]);
unset($interface_snv6_arr_cache[$realif]);
@ -4501,29 +4500,16 @@ function link_interface_to_gif($interface)
/*
* find_interface_ip($interface): return the interface ip (first found)
*/
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))
return;
/* Setup IP cache */
if (!isset($interface_ip_arr_cache[$interface]) or $flush) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['ipaddr'])) {
$interface_ip_arr_cache[$interface] = $ifinfo['ipaddr'];
} else {
return null;
function find_interface_ip($interface) {
$interface = trim($interface);
if (does_interface_exist($interface)) {
$ifinfo = pfSense_get_interface_addresses($interface);
if (isset($ifinfo['ipaddr'])) {
return $ifinfo['ipaddr'];
}
} else {
return null;
}
}
return $interface_ip_arr_cache[$interface];
}
/*

2
src/etc/rc.newwanip
View File

@ -76,7 +76,7 @@ if (is_array($config['interfaces'][$interface]) && !isset($config['interfaces'][
if (empty($argument)) {
$curwanip = get_interface_ip();
} else {
$curwanip = find_interface_ip($interface_real, true);
$curwanip = find_interface_ip($interface_real);
if(empty($curwanip)) {
$curwanip = get_interface_ip($interface);
}

2
src/www/carp_status.php
View File

@ -51,9 +51,7 @@ function interfaces_carp_set_maintenancemode($carp_maintenancemode)
}
unset($interface_arr_cache);
unset($carp_interface_count_cache);
unset($interface_ip_arr_cache);
$status = get_carp_status();
if ($_POST['carp_maintenancemode'] <> "") {