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

Move duplicated code into a function; Include local ID on mobile tunnel key line in ipsec.secrets.

Browse Source
This commit is contained in:
jim-p 2014-05-15 13:34:21 -04:00
parent 25e2281c6d
commit 95589abda7
2 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
etc/inc/ipsec.inc
View File

@ -669,4 +669,57 @@ function ipsec_fixup_ip($ipaddr) {
return $ipaddr;
}
function ipsec_find_id(& $ph1ent, $side = "local", $rgmap = array()) {
if ($side == "local") {
$id_type = $ph1ent['myid_type'];
$id_data = $ph1ent['myid_data'];
$addr = ipsec_get_phase1_src($ph1ent);
if (!$addr)
return array();
} elseif ($side = "peer") {
$id_type = $ph1ent['peerid_type'];
$id_data = $ph1ent['peerid_data'];
if (isset($ph1ent['mobile']))
$addr = "%any";
else
$addr = $ph1ent['remote-gateway'];
} else {
return array();
}
$thisid_type = $id_type;
switch ($thisid_type) {
case "myaddress":
$thisid_type = "address";
$thisid_data = $addr;
break;
case "dyn_dns":
$thisid_type = "address";
$thisid_data = resolve_retry($id_data);
break;
case "peeraddress":
$thisid_type = "address";
$thisid_data = $rgmap[$ph1ent['remote-gateway']];
break;
case "address";
$thisid_data = $id_data;
break;
case "fqdn";
case "keyid tag";
case "user_fqdn";
case "asn1dn";
$thisid_data = $id_data;
if( $thisid_data )
$thisid_data = "{$thisid_data}";
break;
}
return array($thisid_type, $thisid_data);
}
?>

76
etc/inc/vpn.inc
View File

@ -467,28 +467,16 @@ EOD;
}
}
} else {
list ($myid_type, $myid_data) = ipsec_find_id($ph1ent, "local");
list ($peerid_type, $peerid_data) = ipsec_find_id($ph1ent, "peer", $rgmap);
$peerid_type = $ph1ent['peerid_type'];
if (empty($peerid_data))
continue;
switch ($peerid_type) {
case "peeraddress":
$peerid_type = "address";
$peerid_data = $rgmap[$ph1ent['remote-gateway']];
break;
case "address";
$peerid_data = $ph1ent['peerid_data'];
break;
case "fqdn";
case "keyid tag";
case "user_fqdn";
$peerid_data = $ph1ent['peerid_data'];
break;
}
if (!empty($peerid_data) && !empty($ph1ent['pre-shared-key']))
$pskconf .= trim($peerid_data) . " : PSK \"" . trim($ph1ent['pre-shared-key']) . "\"\n";
$myid = isset($ph1ent['mobile']) ? trim($myid_data) . " " : "";
$peerid = ($peerid_data != "allusers") ? trim($peerid_data) : "";
if (!empty($ph1ent['pre-shared-key']))
$pskconf .= $myid . $peerid . " : PSK \"" . trim($ph1ent['pre-shared-key']) . "\"\n";
}
}
}
@ -561,52 +549,8 @@ EOD;
if (!empty($ph1ent['iketype']) && $ph1ent['iketype'] != "ikev1")
$keyexchange = "ikev2";
$myid_type = $ph1ent['myid_type'];
switch ($myid_type) {
case "myaddress":
$myid_type = "address";
$myid_data = $ep;
break;
case "dyn_dns":
$myid_type = "address";
$myid_data = resolve_retry($ph1ent['myid_data']);
break;
case "address";
$myid_data = $ph1ent['myid_data'];
break;
case "fqdn";
case "keyid tag";
case "user_fqdn";
case "asn1dn";
$myid_data = $ph1ent['myid_data'];
if( $myid_data )
$myid_data = "{$myid_data}";
break;
}
$peerid_type = $ph1ent['peerid_type'];
switch ($peerid_type) {
case "peeraddress":
$peerid_type = "address";
$peerid_data = $rgip;
break;
case "address";
$peerid_data = $ph1ent['peerid_data'];
break;
case "fqdn";
case "keyid tag";
case "user_fqdn";
case "asn1dn";
$peerid_data = $ph1ent['peerid_data'];
if( $peerid_data )
$peerid_data = "{$peerid_data}";
break;
}
list ($myid_type, $myid_data) = ipsec_find_id($ph1ent, "local");
list ($peerid_type, $peerid_data) = ipsec_find_id($ph1ent, "peer", $rgmap);
/* Only specify peer ID if we are not dealing with a mobile PSK-only tunnel */
$peerid_spec = '';