diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-04-22 09:19:00 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-04-22 09:21:26 +0000 |
| commit | 924876a80f9ac94a0e7b59b381312d0ffd186755 (patch) | |
| tree | bfe75b77356217269c5ce54ad5bbcd18af5a807f /etc/inc/ipsec.inc | |
| parent | 03d92c4034e721bd292b4738f0d6f543dba4f4fa (diff) | |
| download | pfsense-924876a80f9ac94a0e7b59b381312d0ffd186755.zip pfsense-924876a80f9ac94a0e7b59b381312d0ffd186755.tar.gz | |
* Fix ipsec over carp handling.
* do not useinterface in Upper case when working on the backends.
* Do not print Configuring IPSec during bootup if there is nothing configured.
Diffstat (limited to 'etc/inc/ipsec.inc')
| -rw-r--r-- | etc/inc/ipsec.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index 3d0c120..043a886 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -122,10 +122,12 @@ function ipsec_get_phase1_src(& $ph1ent) { if ($ph1ent['interface']) $if = $ph1ent['interface']; else - $if = "WAN"; + $if = "wan"; - $realinterface = convert_friendly_interface_to_real_interface_name($if); - $interfaceip = find_interface_ip($realinterface); + if (preg_match("/^carp/i", $ph1ent['interface'])) + find_interface_ip($if); + else + $interfaceip = get_interface_ip($if); return $interfaceip; } |
