mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the generation of the config for mobile tunnels as well

Browse Source
This commit is contained in:
Ermal 2014-03-06 21:38:02 +01:00
parent 8c3cba99f0
commit d60eea555e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/inc/vpn.inc
View File

@ -661,12 +661,10 @@ EOD;
$localid_type = $ph2ent['localid']['type'];
$localid_data = ipsec_idinfo_to_cidr($ph2ent['localid'], false, $ph2ent['mode']);
/* Do not print localid in some cases, such as a pure-psk or psk/xauth single phase2 mobile tunnel */
if (($localid_type == "none" || $localid_type == "mobile") ||
(($ph1ent['authentication_method'] == "xauth_psk_server") ||
($ph1ent['authentication_method'] == "pre_shared_key"))
if (($localid_type == "none" || $localid_type == "mobile")
&& isset($ph1ent['mobile'])
&& (ipsec_get_number_of_phase2($ikeid)==1))
$localid_spec = "%mobile";
$localid_spec = "%any";
else {
if ($localid_type != "address") {
$localid_type = "subnet";
@ -677,6 +675,7 @@ EOD;
continue;
}
$localid_spec = $ep;
/* XXX: To be finished */
if (0 && !empty($ph2ent['natlocalid'])) {
$natlocalid_data = ipsec_idinfo_to_cidr($ph2ent['natlocalid'], false, $ph2ent['mode']);
if ($ph2ent['natlocalid']['type'] != "address") {