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 ipsec status page to make connect button work

Browse Source
This commit is contained in:
Ermal LUÇI 2014-12-22 17:20:44 +01:00
parent 432dee2db2
commit fe2e680bdb
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/inc/ipsec.inc
View File

@ -571,6 +571,22 @@ function ipsec_get_descr($ikeid) {
return $descr;
}
function ipsec_get_phase1($ikeid) {
global $config;
if (!isset($config['ipsec']['phase1']) ||
!is_array($config['ipsec']['phase1']))
return '';
$a_phase1 = $config['ipsec']['phase1'];
foreach ($a_phase1 as $p1) {
if ($p1['ikeid'] == $ikeid) {
return $p1;
}
}
unset($a_phase1);
}
function ipsec_fixup_ip($ipaddr) {
if (is_ipaddrv6($ipaddr) || is_subnetv6($ipaddr))
return Net_IPv6::compress(Net_IPv6::uncompress($ipaddr));

16
usr/local/www/diag_ipsec.php
View File

@ -55,8 +55,20 @@ require("ipsec.inc");
if ($_GET['act'] == 'connect') {
if (ctype_digit($_GET['ikeid'])) {
mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
mwexec("/usr/local/sbin/ipsec up con" . escapeshellarg($_GET['ikeid']));
$ph1ent = ipsec_get_phase1($_GET['ikeid']);
if (!empty($ph1ent)) {
if ($ph1ent['iketype'] == 'ikev1') {
$ph2entries = ipsec_get_number_of_phase2($_GET['ikeid']);
for ($i = 0; $i < $ph2entries; $i++) {
$connid = escapeshellarg("con{$_GET['ikeid']}00{$i}");
mwexec("/usr/local/sbin/ipsec down {$connid}");
mwexec("/usr/local/sbin/ipsec up {$connid}");
}
} else {
mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
mwexec("/usr/local/sbin/ipsec up con" . escapeshellarg($_GET['ikeid']));
}
}
}
} else if ($_GET['act'] == 'ikedisconnect') {
if (ctype_digit($_GET['ikeid'])) {