summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-04-30 22:50:12 +0200
committerErmal LUÇI <eri@pfsense.org>2015-04-30 22:50:12 +0200
commit1e92a236f4e61a4fef97d35ba0107a54c06ac65a (patch)
tree8d288a47b77c9a6e071110f1495a795ab4b1e9bc /etc
parent6bc6a72766035231e24efa67e36e2da876b72b36 (diff)
downloadpfsense-1e92a236f4e61a4fef97d35ba0107a54c06ac65a.zip
pfsense-1e92a236f4e61a4fef97d35ba0107a54c06ac65a.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 7d5add01e48bab8d82d5a5699325fa7b6aeb4e5c.
Diffstat (limited to 'etc')
-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 c4b8670..3e60e1a 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1074,14 +1074,11 @@ 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