From a2ab96833d9764e34384120d9fa597336da88c77 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 7 Sep 2023 08:31:06 +0200
Subject: [PATCH] system: avoid plugin system for native dpinger scripts
 fetching dpinger_status() #6825

---
 src/opnsense/scripts/OPNsense/Monit/gateway_alert | 9 +++++----
 src/opnsense/scripts/routes/gateway_status.php    | 3 ++-
 src/opnsense/scripts/routes/gateway_watcher.php   | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/scripts/OPNsense/Monit/gateway_alert b/src/opnsense/scripts/OPNsense/Monit/gateway_alert
index d7282acf6..0f44ac463 100755
--- a/src/opnsense/scripts/OPNsense/Monit/gateway_alert
+++ b/src/opnsense/scripts/OPNsense/Monit/gateway_alert
@@ -27,9 +27,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once('config.inc');
-require_once('interfaces.inc');
-require_once('util.inc');
+require_once 'config.inc';
+require_once 'interfaces.inc';
+require_once 'util.inc';
+require_once 'plugins.inc.d/dpinger.inc';
 
 /**
  * @param string $status
@@ -50,7 +51,7 @@ function get_gateway_error(string $status, string $gwname, array $group)
     }
 }
 
-$gateways_status = return_gateways_status();
+$gateways_status = dpinger_status();
 $clean = true;
 
 if (isset($config['gateways']['gateway_group'])) {
diff --git a/src/opnsense/scripts/routes/gateway_status.php b/src/opnsense/scripts/routes/gateway_status.php
index 5f3d1b97a..a28ecc4c0 100755
--- a/src/opnsense/scripts/routes/gateway_status.php
+++ b/src/opnsense/scripts/routes/gateway_status.php
@@ -30,9 +30,10 @@
 require_once 'config.inc';
 require_once 'util.inc';
 require_once 'interfaces.inc';
+require_once 'plugins.inc.d/dpinger.inc';
 
 $result = [];
-$gateways_status = return_gateways_status();
+$gateways_status = dpinger_status();
 
 foreach ((new \OPNsense\Routing\Gateways())->gatewaysIndexedByName() as $gname => $gw) {
     $gatewayItem = ['name' => $gname];
diff --git a/src/opnsense/scripts/routes/gateway_watcher.php b/src/opnsense/scripts/routes/gateway_watcher.php
index 248650205..52d78f5af 100755
--- a/src/opnsense/scripts/routes/gateway_watcher.php
+++ b/src/opnsense/scripts/routes/gateway_watcher.php
@@ -30,6 +30,7 @@
 require_once 'config.inc';
 require_once 'util.inc';
 require_once 'interfaces.inc';
+require_once 'plugins.inc.d/dpinger.inc';
 
 function signalhandler($signal)
 {
@@ -56,7 +57,7 @@ sleep($wait);
 while (1) {
     pcntl_signal_dispatch();
 
-    $status = return_gateways_status();
+    $status = dpinger_status();
     $alarm = false;
 
     /* clear known gateways in first step to flush unknown in second step */