From 924876a80f9ac94a0e7b59b381312d0ffd186755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Wed, 22 Apr 2009 09:19:00 +0000 Subject: * 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. --- etc/inc/ipsec.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'etc/inc/ipsec.inc') 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; } -- cgit v1.1