Correct the functions for returning tunnel status to use strongswan status reports

1 files changed, 3 insertions, 4 deletions

diff --git a/usr/local/www/diag_ipsec_xml.php b/usr/local/www/diag_ipsec_xml.php
index b2c2ad6..2d74c1b 100644
--- a/usr/local/www/diag_ipsec_xml.php
+++ b/usr/local/www/diag_ipsec_xml.php
@@ -50,15 +50,14 @@ $ipsec_status = array();
 
 $a_phase2 = &$config['ipsec']['phase2'];
 
-$spd = ipsec_dump_spd();
-$sad = ipsec_dump_sad();
+$status = ipsec_smp_dump_status();
 
-if(is_array($a_phase2)) {
+if (is_array($status['query']) && $status['query']['ikesalist'] && $status['query']['ikesalist']['ikesa'])) {
 	foreach ($a_phase2 as $ph2ent) {
 		ipsec_lookup_phase1($ph2ent,$ph1ent);
 		$tunnel = array();
 		if (!isset($ph2ent['disabled']) && !isset($ph1ent['disabled'])) {
-			if(ipsec_phase2_status($spd,$sad,$ph1ent,$ph2ent))
+			if(ipsec_phase1_status($status['query']['ikesalist']['ikesa'], $ph1ent['ikeid']))
 				$tunnel['state'] = "up";
 			elseif(!isset($config['ipsec']['enable']))
 				$tunnel['state'] = "disabled";