Revert "Use a dirty hack to make IKEv1 with multiple phase2 to work correctly with one IKE SA for each subnet"

This reverts commit 7d5add01e4.
This commit is contained in:
Ermal LUÇI 2015-04-30 22:50:12 +02:00
parent 6bc6a72766
commit 1e92a236f4

View File

@ -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";
}