summaryrefslogtreecommitdiffstats
path: root/etc/inc/interfaces.inc
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-06-25 16:01:17 +0000
committerErmal Luçi <eri@pfsense.org>2008-06-25 16:01:17 +0000
commit16d0ed50354bef458f7772ed28a8db4577db6a71 (patch)
treefa089f95299debc68dfb1a22f7510e35d1c22f79 /etc/inc/interfaces.inc
parentaef4dc741774c2d232af10e33b7576037d415430 (diff)
downloadpfsense-16d0ed50354bef458f7772ed28a8db4577db6a71.zip
pfsense-16d0ed50354bef458f7772ed28a8db4577db6a71.tar.gz
Missed interface improvements commit.
Diffstat (limited to 'etc/inc/interfaces.inc')
-rw-r--r--etc/inc/interfaces.inc8
1 files changed, 1 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index d4c91b4..5f80761 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -537,14 +537,8 @@ function interfaces_carp_configure() {
$vip_password = str_replace(" ", "", $vip_password);
/* ensure CARP IP really exists prior to loading up */
$found = false;
- $iflist = array("lan", "wan");
- for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
- $iflist['opt' . $i] = 'opt' . $i;
+ $iflist = get_configured_interface_list();
foreach($iflist as $if) {
- /* ignore down or "disabled" interfaces */
- if($if <> "lan" and $if <> "wan")
- if (!isset($config['interfaces'][$if]['enable']))
- continue;
$ww_subnet_ip = $config['interfaces'][$if]['ipaddr'];
$ww_subnet_bits = $config['interfaces'][$if]['subnet'];
if (ip_in_subnet($vip['subnet'], gen_subnet($ww_subnet_ip, $ww_subnet_bits) . "/" . $ww_subnet_bits))
OpenPOWER on IntegriCloud