From 0558d48493a477ac4a06d0d9a45deb34ae4a54d6 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 20 Oct 2023 17:57:51 +0200
Subject: [PATCH] net/wireguard - import
 https://github.com/opnsense/core/commit/c2d07aeef6965a22d4119f815b7afc6bb9d1db09
 and
 https://github.com/opnsense/core/commit/4bef809bd031f0aa3d55963e57a82d988fd2d45a
 from core

---
 .../OPNsense/Wireguard/Api/ServiceController.php       | 10 +---------
 .../opnsense/scripts/Wireguard/wg-service-control.php  |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
index 1812f83fb..eab399815 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
@@ -46,15 +46,6 @@ class ServiceController extends ApiMutableServiceControllerBase
     protected static $internalServiceEnabled = 'enabled';
     protected static $internalServiceName = 'wireguard';
 
-    /**
-     * hook group interface registration on reconfigure
-     * @return bool
-     */
-    protected function invokeInterfaceRegistration()
-    {
-        return true;
-    }
-
     /**
      * @return array
      */
@@ -66,6 +57,7 @@ class ServiceController extends ApiMutableServiceControllerBase
 
         $this->sessionClose();
         $backend = new Backend();
+        $backend->configdRun('interface invoke registration');
         $backend->configdRun('template reload ' . escapeshellarg(static::$internalServiceTemplate));
         $backend->configdpRun('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 0d58a729b..79835fa93 100755
--- a/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
+++ b/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
@@ -29,6 +29,7 @@
 
 require_once('script/load_phalcon.php');
 require_once('util.inc');
+require_once('config.inc');
 require_once('interfaces.inc');
 
 /**
@@ -121,6 +122,7 @@ function wg_start($server, $fhandle, $ifcfgflag = 'up')
     ftruncate($fhandle, 0);
     fwrite($fhandle, @md5_file($server->cnfFilename) . "|" . wg_reconfigure_hash($server));
     syslog(LOG_NOTICE, "Wireguard interface {$server->name} ({$server->interface}) started");
+    interfaces_restart_by_device(false, [(string)$server->interface], false);
 }
 
 /**
@@ -263,6 +265,5 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
             }
         }
     }
-    mwexecf('/usr/local/etc/rc.routing_configure');
 }
 closelog();