From f3695f92d405c338535e9ff14306923474bf3cda Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 17 Oct 2023 08:21:13 +0200
Subject: [PATCH] net/wireguard: different approach to bootup handling

---
 net/wireguard/Makefile                        |  1 +
 .../src/etc/inc/plugins.inc.d/wireguard.inc   | 19 +++++++++++++++++--
 .../scripts/Wireguard/wg-service-control.php  |  9 +--------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 821184b80..dbf82fd5d 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		wireguard
 PLUGIN_VERSION=		2.3
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		WireGuard VPN service kernel implementation
 PLUGIN_DEPENDS=		wireguard-kmod
 PLUGIN_CONFLICTS=	wireguard-go
diff --git a/net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc b/net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc
index a24eb716f..ed933a375 100644
--- a/net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc
+++ b/net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc
@@ -122,8 +122,23 @@ function wireguard_devices()
 
 function wireguard_prepare($device)
 {
-    mwexecf('/sbin/ifconfig wg create name %s', $device);
-    mwexecf('/sbin/ifconfig %s group wireguard', $device);
+    foreach ((new OPNsense\Wireguard\Server())->servers->server->iterateItems() as $node) {
+        if ($device != (string)$node->interface) {
+            continue;
+        }
+
+        /* deleting the stat file marks the interface for eventual reconfiguration */
+        @unlink((string)$node->statFilename);
+
+        if (!does_interface_exist($device)) {
+            mwexecf('/sbin/ifconfig wg create name %s', $device);
+            mwexecf('/sbin/ifconfig %s group wireguard', $device);
+        }
+
+        return $device;
+    }
+
+    return null;
 }
 
 function wireguard_configure()
diff --git a/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php b/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
index e3ab3fc3b..0d58a729b 100755
--- a/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
+++ b/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
@@ -223,14 +223,7 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
                         wg_start($node, $statHandle, $carp_if_flag);
                         break;
                     case 'configure':
-                        if (
-                            @md5_file($node->cnfFilename) != get_stat_hash($statHandle)['file'] ||
-                            !isset($ifdetails[(string)$node->interface]) || (
-                                // Interface has been setup, but without configuration
-                                empty($ifdetails[(string)$node->interface]['ipv4']) &&
-                                empty($ifdetails[(string)$node->interface]['ipv6'])
-                            )
-                        ) {
+                        if (@md5_file($node->cnfFilename) != get_stat_hash($statHandle)['file']) {
                             if (get_stat_hash($statHandle)['interface'] != wg_reconfigure_hash($node)) {
                                 // Fluent reloading not supported for this instance, make sure the user is informed
                                 syslog(