summaryrefslogtreecommitdiffstats
path: root/etc/inc/vpn.inc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-04-30 22:48:54 +0200
committerErmal LUÇI <eri@pfsense.org>2015-04-30 22:49:10 +0200
commit2f52fcbebc4cdf02d3167f0320e8717223cf47dd (patch)
tree2c10c4964efd197fc5da24574a9a1f2a11d43102 /etc/inc/vpn.inc
parent626f2cbaf9a6855cd02b3027074c5861d146df3f (diff)
downloadpfsense-2f52fcbebc4cdf02d3167f0320e8717223cf47dd.zip
pfsense-2f52fcbebc4cdf02d3167f0320e8717223cf47dd.tar.gz
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.
Diffstat (limited to 'etc/inc/vpn.inc')
-rw-r--r--etc/inc/vpn.inc3
1 files changed, 0 insertions, 3 deletions
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";
}
OpenPOWER on IntegriCloud