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

Do not count twice the phase2 entries

Browse Source
This commit is contained in:
Ermal LUÇI 2015-01-09 23:12:21 +01:00
parent 7f48765aab
commit 9c0ec56ea8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr/local/www/widgets/widgets/ipsec.widget.php
View File

@ -67,31 +67,35 @@ if (isset($config['ipsec']['phase1'])) { ?>
$ipsec_status['query']['ikesalist']['ikesa'] = array();
$ipsec_detail_array = array();
$ikev1num = array();
$ikenum = array();
if (isset($config['ipsec']['phase2'])) {
foreach ($config['ipsec']['phase2'] as $ph2ent) {
if (!ipsec_lookup_phase1($ph2ent,$ph1ent))
continue;
if ($ph2ent['remoteid']['type'] == "mobile" || isset($ph1ent['mobile'])))
if ($ph2ent['remoteid']['type'] == "mobile" || isset($ph1ent['mobile']))
continue;
if (isset($ph1ent['disabled']) || isset($ph2ent['disabled']))
continue;
if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == 'ikev1') {
if (!isset($ikev1num[$ph1ent['ikeid']]))
$ikev1num[$ph1ent['ikeid']] = 0;
$ikenum[$ph1ent['ikeid']] = 0;
else
$ikev1num[$ph1ent['ikeid']]++;
$ikenum[$ph1ent['ikeid']]++;
$ikeid = "con{$ph1ent['ikeid']}00" . $ikev1num[$ph1ent['ikeid']];
} else
} else {
if (isset($ikenum[$ph1ent['ikeid']]))
continue;
$ikeid = "con{$ph1ent['ikeid']}";
$ikenum[$ph1ent['ikeid']] = true;
}
$found = false;
foreach ($ipsec_status['query']['ikesalist']['ikesa'] as $ikesa) {
if ($ikeid == $ikesa['peerconfig']) {
$found = true;
if (ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ikesa['id'])) {
if ($ikesa['status'] == 'established') {
/* tunnel is up */
$iconfn = "true";
$activecounter++;