Révision b4ad5b1c
Ajouté par Ermal il y a presque 10 ans
| etc/inc/vpn.inc | ||
|---|---|---|
| 541 | 541 |
|
| 542 | 542 |
$ikeid = $ph1ent['ikeid']; |
| 543 | 543 |
|
| 544 |
/* Only specify peer ID if we are not dealing with a mobile PSK-only tunnel */ |
|
| 545 |
$peerid_spec = ''; |
|
| 546 |
if (!(($ph1ent['authentication_method'] == "pre_shared_key") && !isset($ph1ent['mobile']))) {
|
|
| 547 |
$peerid_spec = $peerid_data; |
|
| 548 |
} |
|
| 549 |
|
|
| 550 |
if ($ph1ent['mode'] == "aggressive") |
|
| 551 |
$aggressive = "yes"; |
|
| 552 |
else |
|
| 553 |
$aggressive = "no"; |
|
| 554 |
|
|
| 544 | 555 |
$ep = ipsec_get_phase1_src($ph1ent); |
| 545 | 556 |
if (!$ep) |
| 546 | 557 |
continue; |
| ... | ... | |
| 637 | 648 |
if ($ph1ent['lifetime']) |
| 638 | 649 |
$lifeline = "ikelifetime = {$ph1ent['lifetime']}s";
|
| 639 | 650 |
|
| 640 |
/* Only specify peer ID if we are not dealing with a mobile PSK-only tunnel */ |
|
| 641 |
$peerid_spec = ''; |
|
| 642 |
if (!(($ph1ent['authentication_method'] == "pre_shared_key") && isset($ph1ent['mobile']))) {
|
|
| 643 |
$peerid_spec = $peerid_data; |
|
| 644 |
} |
|
| 645 |
|
|
| 646 |
if ($ph1ent['mode'] == "aggressive") |
|
| 647 |
$aggressive = "yes"; |
|
| 648 |
else |
|
| 649 |
$aggressive = "no"; |
|
| 650 |
|
|
| 651 | 651 |
if (($ph2ent['mode'] == 'tunnel') or ($ph2ent['mode'] == 'tunnel6')) {
|
| 652 | 652 |
$tunneltype = "type = tunnel"; |
| 653 | 653 |
|
Formats disponibles : Unified diff
Correct sense of match and move the code up to since it makes more sense