From 1fe104dce6c192d89820ded66a68f2dae7a5776e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 31 Dec 2023 13:34:55 +0100
Subject: [PATCH] Wireguard / OpenVPN [client] - handle disabled carp vhid's by
 initialising to 'DISABLED' (same as
 https://github.com/opnsense/plugins/commit/9ff64a3e41428a2b23ae55846a5b92d498d47245)

---
 src/opnsense/scripts/Wireguard/wg-service-control.php | 1 +
 src/opnsense/scripts/openvpn/ovpn_service_control.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/opnsense/scripts/Wireguard/wg-service-control.php b/src/opnsense/scripts/Wireguard/wg-service-control.php
index 0e09a98a6..b0cd9c13d 100755
--- a/src/opnsense/scripts/Wireguard/wg-service-control.php
+++ b/src/opnsense/scripts/Wireguard/wg-service-control.php
@@ -43,6 +43,7 @@ function get_vhid_status()
     foreach ((new OPNsense\Interfaces\Vip())->vip->iterateItems() as $id => $item) {
         if ($item->mode == 'carp') {
             $uuids[(string)$item->vhid] =  $id;
+            $vhids[$id] = ['status' => 'DISABLED', 'vhid' => (string)$item->vhid];
         }
     }
     foreach (legacy_interfaces_details() as $ifdata) {
diff --git a/src/opnsense/scripts/openvpn/ovpn_service_control.php b/src/opnsense/scripts/openvpn/ovpn_service_control.php
index 6fdd2b8ba..4fcde8d97 100755
--- a/src/opnsense/scripts/openvpn/ovpn_service_control.php
+++ b/src/opnsense/scripts/openvpn/ovpn_service_control.php
@@ -100,6 +100,7 @@ function get_vhid_status()
     foreach ((new OPNsense\Interfaces\Vip())->vip->iterateItems() as $id => $item) {
         if ($item->mode == 'carp') {
             $uuids[(string)$item->vhid] =  $id;
+            $vhids[$id] = 'DISABLED';
         }
     }
     foreach (legacy_interfaces_details() as $ifdata) {