Révision 23ba08fc
Ajouté par Ermal il y a plus de 9 ans
| etc/inc/vpn.inc | ||
|---|---|---|
| 610 | 610 |
$left_spec = $ep; |
| 611 | 611 |
|
| 612 | 612 |
$ipseclifetime = 0; |
| 613 |
$rightsourceip = NULL; |
|
| 614 | 613 |
$rightsubnet_spec = array(); |
| 615 | 614 |
$leftsubnet_spec = array(); |
| 616 | 615 |
$ealgoAHsp2arr = array(); |
| ... | ... | |
| 662 | 661 |
|
| 663 | 662 |
if (!isset($ph2ent['mobile'])) {
|
| 664 | 663 |
$rightsubnet_spec[] = ipsec_idinfo_to_cidr($ph2ent['remoteid'], false, $ph2ent['mode']); |
| 665 |
} else if (!empty($a_client['pool_address'])) {
|
|
| 664 |
} else if (!empty($a_client['pool_address'])) |
|
| 666 | 665 |
$rightsubnet_spec[] = "{$a_client['pool_address']}/{$a_client['pool_netbits']}";
|
| 667 |
$rightsourceip = "\trightsourceip={$a_client['pool_address']}/{$a_client['pool_netbits']}\n";
|
|
| 668 |
} |
|
| 669 | 666 |
} else {
|
| 670 | 667 |
$tunneltype = "type = transport"; |
| 671 | 668 |
|
| ... | ... | |
| 765 | 762 |
$ipsecconf .= "\t{$ikelifeline}\n";
|
| 766 | 763 |
if ($ipseclifetime > 0) |
| 767 | 764 |
$ipsecconf .= "\tlifetime = {$ipseclifetime}s\n";
|
| 768 |
if (!empty($rightsourceip)) |
|
| 769 |
$ipsecconf .= "{$rightsourceip}";
|
|
| 770 | 765 |
if (!empty($rightsubnet_spec)) |
| 771 | 766 |
$ipsecconf .= "\trightsubnet = " . join(",", $rightsubnet_spec) . "\n";
|
| 772 | 767 |
if (!empty($leftsubnet_spec)) |
Formats disponibles : Unified diff
Revert "Fix assignment of tunnel IPs to mobile clients."
This normally is not needed since the attr plugin deals with all this.
This reverts commit 00311d6a841c0f6fc162ea11da06569f10220f5e.