diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-16 12:27:37 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-16 12:27:37 -0300 |
| commit | ad9db2a956814c4e04188b177e37061e7b310472 (patch) | |
| tree | da8a82f3ffcd538dd8b0412997714e69f881ff83 /etc/inc/interfaces.inc | |
| parent | f14bd707b017d5c6325048c1ff72f7554f8f60bc (diff) | |
| parent | 97e6256f4d611b7edbfa12d3c03cf9b6cca9e3c1 (diff) | |
| download | pfsense-ad9db2a956814c4e04188b177e37061e7b310472.zip pfsense-ad9db2a956814c4e04188b177e37061e7b310472.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 455a527..74efd96 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3108,6 +3108,7 @@ function link_interface_to_gif($interface) { function find_interface_ip($interface, $flush = false) { global $interface_ip_arr_cache; + global $interface_sn_arr_cache; $interface = str_replace("\n", "", $interface); @@ -3118,6 +3119,7 @@ function find_interface_ip($interface, $flush = false) if (!isset($interface_ip_arr_cache[$interface]) or $flush) { $ifinfo = pfSense_get_interface_addresses($interface); $interface_ip_arr_cache[$interface] = $ifinfo['ipaddr']; + $interface_sn_arr_cache[$interface] = $ifinfo['subnetbits']; } return $interface_ip_arr_cache[$interface]; @@ -3126,6 +3128,7 @@ function find_interface_ip($interface, $flush = false) function find_interface_subnet($interface, $flush = false) { global $interface_sn_arr_cache; + global $interface_ip_arr_cache; $interface = str_replace("\n", "", $interface); if (does_interface_exist($interface) == false) @@ -3133,6 +3136,7 @@ function find_interface_subnet($interface, $flush = false) if (!isset($interface_sn_arr_cache[$interface]) or $flush) { $ifinfo = pfSense_get_interface_addresses($interface); + $interface_ip_arr_cache[$interface] = $ifinfo['ipaddr']; $interface_sn_arr_cache[$interface] = $ifinfo['subnetbits']; } |
