Only call pfSense_ipsec_list_sa() when IPsec is enabled

3 files changed, 16 insertions, 3 deletions

diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc
index ec2b592..b60dd49 100644
--- a/src/etc/inc/ipsec.inc
+++ b/src/etc/inc/ipsec.inc
@@ -427,6 +427,19 @@ function ipsec_phase2_status(&$ipsec_status, &$phase2) {
 }
 
 /*
+ * Wrapper to call pfSense_ipsec_list_sa() when IPsec is enabled
+ */
+function ipsec_list_sa() {
+	global $config;
+
+	if (isset($config['ipsec']['enable'])) {
+		return pfSense_ipsec_list_sa();
+	}
+
+	return array();
+}
+
+/*
  * Return dump of SPD table
  */
 function ipsec_dump_spd() {
diff --git a/src/usr/local/www/diag_ipsec.php b/src/usr/local/www/diag_ipsec.php
index ffe5b12..f3c37ac 100644
--- a/src/usr/local/www/diag_ipsec.php
+++ b/src/usr/local/www/diag_ipsec.php
@@ -118,7 +118,7 @@ if (!is_array($config['ipsec']['phase1'])) {
 
 $a_phase1 = &$config['ipsec']['phase1'];
 
-$status = pfSense_ipsec_list_sa();
+$status = ipsec_list_sa();
 
 $tab_array = array();
 $tab_array[] = array(gettext("Overview"), true, "diag_ipsec.php");
diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php
index 1a94e64..57c3c10 100644
--- a/src/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -70,7 +70,7 @@ if (isset($config['ipsec']['phase1'])) {
 	$spd = ipsec_dump_spd();
 	$sad = ipsec_dump_sad();
 	$mobile = ipsec_dump_mobile();
-	$ipsec_status = pfSense_ipsec_list_sa();
+	$ipsec_status = ipsec_list_sa();
 
 	$activecounter = 0;
 	$inactivecounter = 0;
@@ -278,4 +278,4 @@ function changeTabDIV(selectedDiv) {
 	}
 }
 //]]>
-</script>
\ No newline at end of file
+</script>