refactor: own killswitch teardown at daemon level

client/platforms/linux/daemon/linuxdaemon.cpp

@@ -17,6 +17,7 @@
 
 #include "leakdetector.h"
 #include "logger.h"
+#include "killswitch.h"
 
 namespace {
 Logger logger("LinuxDaemon");
@@ -50,3 +51,9 @@ LinuxDaemon* LinuxDaemon::instance() {
     Q_ASSERT(s_daemon);
     return s_daemon;
 }
+
+bool LinuxDaemon::deactivate(bool emitSignals) {
+    bool result = Daemon::deactivate(emitSignals);
+    KillSwitch::instance()->disableKillSwitch();
+    return result;
+}

client/platforms/linux/daemon/linuxdaemon.h

@@ -20,6 +20,8 @@ class LinuxDaemon final : public Daemon {
 
   static LinuxDaemon* instance();
 
+  bool deactivate(bool emitSignals = true) override;
+
  protected:
   WireguardUtils* wgutils() const override { return m_wgutils; }
   DnsUtils* dnsutils() override { return m_dnsutils; }

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -18,8 +18,6 @@
 #include "leakdetector.h"
 #include "logger.h"
 
-#include "killswitch.h"
-
 constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
 constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
 
@@ -198,8 +196,6 @@ bool WireguardUtilsLinux::deleteInterface() {
     QDir wgRuntimeDir(WG_RUNTIME_DIR);
     QFile::remove(wgRuntimeDir.filePath(m_ifname + ".name"));
 
-    // double-check + ensure our firewall is installed and enabled
-    KillSwitch::instance()->disableKillSwitch();
     return true;
 }
 

client/platforms/macos/daemon/macosdaemon.cpp

@@ -15,6 +15,7 @@
 #include <QTextStream>
 #include <QtGlobal>
 
+#include "killswitch.h"
 #include "leakdetector.h"
 #include "logger.h"
 
@@ -50,3 +51,9 @@ MacOSDaemon* MacOSDaemon::instance() {
   Q_ASSERT(s_daemon);
   return s_daemon;
 }
+
+bool MacOSDaemon::deactivate(bool emitSignals) {
+  bool result = Daemon::deactivate(emitSignals);
+  KillSwitch::instance()->disableKillSwitch();
+  return result;
+}

client/platforms/macos/daemon/macosdaemon.h

@@ -19,6 +19,8 @@ class MacOSDaemon final : public Daemon {
 
   static MacOSDaemon* instance();
 
+  bool deactivate(bool emitSignals = true) override;
+
  protected:
   WireguardUtils* wgutils() const override { return m_wgutils; }
   DnsUtils* dnsutils() override { return m_dnsutils; }

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -17,8 +17,6 @@
 #include "leakdetector.h"
 #include "logger.h"
 
-#include "killswitch.h"
-
 constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
 constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
 
@@ -193,9 +191,6 @@ bool WireguardUtilsMacos::deleteInterface() {
     m_tunnel.waitForFinished(WG_TUN_PROC_TIMEOUT);
   }
 
-  // double-check + ensure our firewall is installed and enabled
-  KillSwitch::instance()->disableKillSwitch();
-
   return true;
 }