diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-05-25 03:44:06 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-05-25 03:44:06 +0000 |
| commit | 499994ff94210eefdbdede7b347bdc928334bb7e (patch) | |
| tree | 055813c2aba948c57df14dea459d06ad3114d525 /etc/inc/filter.inc | |
| parent | 93ca4555dd7fda77073c5693150c03f5c05db8d7 (diff) | |
| download | pfsense-499994ff94210eefdbdede7b347bdc928334bb7e.zip pfsense-499994ff94210eefdbdede7b347bdc928334bb7e.tar.gz | |
CarpDEV-DHCP fixes
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 26917c5..f586d99 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -335,7 +335,7 @@ function filter_generate_aliases() { if($config['interfaces']['lan']) $aliases .= "lan = \"{ {$config['interfaces']['lan']['if']}{$lan_aliases} }\"\n"; - $wanif = $config['interfaces']['wan']['if']; + $wanif = get_real_wan_interface(); /* carpdev support on WAN */ if($config['interfaces']['wan']['ipaddr'] == "carpdev-dhcp") { @@ -344,7 +344,7 @@ function filter_generate_aliases() { foreach ($viparr as $vip) { if ($vip['mode'] == "carpdev-dhcp") { if($vip['interface'] == "wan") - $wanif = " carp{$counter}"; + $wanif = "carp{$counter}"; $counter++; } } @@ -357,7 +357,7 @@ function filter_generate_aliases() { $aliases .= "pptp0 = \"{ " . $wanif . " " . get_real_wan_interface() . " }\" \n"; $aliases .= "wan = \"{ " . $wanif . "{$wan_aliases} pptp0 }\"\n"; } else { - $aliases .= "wan = \"{ " . get_real_wan_interface() . "{$wan_aliases} }\"\n"; + $aliases .= "wan = \"{ " . $wanif . "{$wan_aliases} }\"\n"; } $aliases .= "enc0 = \"{ enc0 }\"\n"; |
