Fix IPsec on CARP IPs, broken when fixing IPsec with gateway groups and VIPs.

1 files changed, 9 insertions, 5 deletions

diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc
index a611fff..24a3aef 100644
--- a/etc/inc/ipsec.inc
+++ b/etc/inc/ipsec.inc
@@ -190,12 +190,16 @@ function ipsec_get_phase1_src(& $ph1ent) {
 
 	if ($ph1ent['interface']) {
 		if (!is_ipaddr($ph1ent['interface'])) {
+                    if (strpos($ph1ent['interface'], '_vip')) {
+                        $if = $ph1ent['interface'];
+                    } else {
                         $if = get_failover_interface($ph1ent['interface']);
-			if ($ph1ent['protocol'] == "inet6") {
-				$interfaceip = get_interface_ipv6($if);
-			} else {
-				$interfaceip = get_interface_ip($if);
-			}
+                    }
+                    if ($ph1ent['protocol'] == "inet6") {
+			$interfaceip = get_interface_ipv6($if);
+                    } else {
+			$interfaceip = get_interface_ip($if);
+		    }
 		} else {
 			$interfaceip=$ph1ent['interface'];
 		}