diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-05-25 00:05:18 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-05-25 00:05:18 +0000 |
| commit | 3fceab6c8948caf7669b282abd4f00cd3ca934e7 (patch) | |
| tree | e75ec43d54294767927f4a20128d6780288a6b93 /etc/inc/interfaces.inc | |
| parent | 03aebc4c5075dfbb1537f9a78f8fe54c21e97082 (diff) | |
| download | pfsense-3fceab6c8948caf7669b282abd4f00cd3ca934e7.zip pfsense-3fceab6c8948caf7669b282abd4f00cd3ca934e7.tar.gz | |
CarpDEV fixes. It now works!!
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 9e85efd..4b86879 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -508,8 +508,8 @@ function interfaces_carp_configure() { mwexec("/sbin/ifconfig pfsync0 syncdev lo0 up"); } $fd = fopen("/tmp/carp.sh", "w"); + $viparr = &$config['virtualip']['vip']; if($config['virtualip']['vip']) { - $viparr = &$config['virtualip']['vip']; mwexec("/sbin/sysctl net.inet.carp.allow=1"); } else { $viparr = array(); @@ -1685,7 +1685,7 @@ function get_real_wan_interface() { $wanif = "pppoe0"; if ($wancfg['ipaddr'] == "pptp") $wanif = "pptp0"; - + return $wanif; } @@ -1696,8 +1696,8 @@ function get_current_wan_address($interface = "wan") { $interface = filter_translate_type_to_real_interface($interface); - if($wancfg['ipaddr'] == "carpdev-dhcp") - return "\${$interface}"; + if($wancfg['ipaddr'] == "carpdev-dhcp") + return "\$" . convert_real_interface_to_friendly_interface_name($interface); $ifinfo = ""; if(in_array($wancfg['ipaddr'], array('dhcp'))) { |
