diff options
author | Renato Botelho <renato@netgate.com> | 2015-10-30 16:02:21 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-10-30 16:02:21 -0200 |
commit | 90056c8719f815e49e5133eab020b47560eaddc0 (patch) | |
tree | edb11116eb11b92f5b2180544d324fad2a7e2a4b | |
parent | 63253e044b4be147a947029ac0f6e4ded4fdb96c (diff) | |
download | pfsense-90056c8719f815e49e5133eab020b47560eaddc0.zip pfsense-90056c8719f815e49e5133eab020b47560eaddc0.tar.gz |
Rework ipsec widget to use VICI
-rw-r--r-- | usr/local/www/widgets/widgets/ipsec.widget.php | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php index d53adf8..2838cd0 100644 --- a/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/usr/local/www/widgets/widgets/ipsec.widget.php @@ -51,21 +51,11 @@ if (isset($config['ipsec']['phase1'])) { ?> $spd = ipsec_dump_spd(); $sad = ipsec_dump_sad(); $mobile = ipsec_dump_mobile(); - $ipsec_status = ipsec_smp_dump_status(); + $ipsec_status = pfSense_ipsec_list_sa(); $activecounter = 0; $inactivecounter = 0; - if (!is_array($ipsec_status['query'])) { - $ipsec_status['query'] = array(); - $ipsec_status['query']['ikesalist'] = array(); - $ipsec_status['query']['ikesalist']['ikesa'] = array(); - } else if (!is_array($ipsec_status['query']['ikesalist'])) { - $ipsec_status['query']['ikesalist'] = array(); - $ipsec_status['query']['ikesalist']['ikesa'] = array(); - } else if (!is_array($ipsec_status['query']['ikesalist']['ikesa'])) - $ipsec_status['query']['ikesalist']['ikesa'] = array(); - $ipsec_detail_array = array(); $ikenum = array(); if (isset($config['ipsec']['phase2'])) { @@ -92,20 +82,20 @@ if (isset($config['ipsec']['phase1'])) { ?> } $found = false; - foreach ($ipsec_status['query']['ikesalist']['ikesa'] as $ikesa) { - if (isset($ikesa['childsalist']) && isset($ikesa['childsalist']['childsa'])) { - foreach($ikesa['childsalist']['childsa'] as $childsa) { - if ($ikeid == $childsa['childconfig']) { + foreach ($ipsec_status as $id => $ikesa) { + if (isset($ikesa['child-sas'])) { + foreach($ikesa['child-sas'] as $childid =>$childsa) { + if ($ikeid == $childid) { $found = true; break; } } - } else if ($ikeid == $ikesa['peerconfig']) { + } else if ($ikeid == $id) { $found = true; } if ($found === true) { - if ($ikesa['status'] == 'established') { + if ($ikesa['state'] == 'ESTABLISHED') { /* tunnel is up */ $iconfn = "true"; $activecounter++; |