From 2f52fcbebc4cdf02d3167f0320e8717223cf47dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Thu, 30 Apr 2015 22:48:54 +0200 Subject: Revert "Use a dirty hack to make IKEv1 with multiple phase2 to work correctly with one IKE SA for each subnet" This reverts commit 54dd568af28ebe7b4905fedd3cdf48269e63f001. --- etc/inc/vpn.inc | 3 --- 1 file changed, 3 deletions(-) (limited to 'etc/inc/vpn.inc') diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 193a867..31f907a 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1172,15 +1172,12 @@ EOD; if (!isset($ph1ent['mobile']) && $keyexchange == 'ikev1') { if (!empty($rightsubnet_spec)) { $ipsecfin = ''; - $keyingtries = 3; foreach ($rightsubnet_spec as $idx => $rsubnet) { $ipsecfin .= "\nconn con{$ph1ent['ikeid']}00{$idx}\n"; if (!empty($reqids[$idx])) { $ipsecfin .= "\treqid = " . $reqids[$idx] . "\n"; } $ipsecfin .= $ipsecconnect; - $ipsecfin .= "\tkeyingtries = {$keyingtries}\n"; - $keyingtries++; $ipsecfin .= "\trightsubnet = {$rsubnet}\n"; $ipsecfin .= "\tleftsubnet = " . $leftsubnet_spec[$idx] . "\n"; } -- cgit v1.1