Revision d6bc3091
Added by Chris Buechler over 9 years ago
| etc/inc/vpn.inc | ||
|---|---|---|
| 771 | 771 |
if ($ph1ent['iketype'] == "ikev2") {
|
| 772 | 772 |
$keyexchange = "ikev2"; |
| 773 | 773 |
//$passive = "start"; |
| 774 |
} |
|
| 774 |
} else if ($ph1ent['iketype'] == "auto") {
|
|
| 775 |
$keyexchange = "ike"; |
|
| 776 |
} |
|
| 775 | 777 |
} |
| 776 | 778 |
|
| 777 | 779 |
if (isset($ph1ent['mobile'])) {
|
| usr/local/www/vpn_ipsec_phase1.php | ||
|---|---|---|
| 332 | 332 |
$input_errors[] = gettext("A numeric value must be specified for DPD retries.");
|
| 333 | 333 |
} |
| 334 | 334 |
|
| 335 |
if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2") |
|
| 336 |
$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2");
|
|
| 335 |
if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2" && $pconfig['iketype'] != "auto")
|
|
| 336 |
$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2 or auto");
|
|
| 337 | 337 |
|
| 338 | 338 |
if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) {
|
| 339 | 339 |
if ($config['system']['crypto_hardware'] == "glxsb") {
|
| ... | ... | |
| 625 | 625 |
<td width="78%" class="vtable"> |
| 626 | 626 |
<select name="iketype" class="formselect" onchange='iketype_change()'> |
| 627 | 627 |
<?php |
| 628 |
$keyexchange = array("ikev1" => "V1", "ikev2" => "V2");
|
|
| 628 |
$keyexchange = array("ikev1" => "V1", "ikev2" => "V2", "auto" => "Auto");
|
|
| 629 | 629 |
foreach ($keyexchange as $kidx => $name): |
| 630 | 630 |
?> |
| 631 | 631 |
<option value="<?=$kidx;?>" <?php if ($kidx == $pconfig['iketype']) echo "selected=\"selected\""; ?>> |
Also available in: Unified diff
Bring this back, I'll fix issues afterwards. Revert "Remove "auto", it's just a synonym for IKEv2. Ticket #4873"
This reverts commit 47f802694a1e1dfbbd011d7ec431c0948358b5c3.