TunnelsManager: initialize observer on correct thread

Because of the callback recursion, this function needs to always be called from the right thread

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 2aa415a774cd78926b99aadfd96a7eb2609597a3..f38ca88c4a973ce920ec6c6a7b25699cffba177a 100644 (file)
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -399,13 +399,14 @@ class TunnelContainer: NSObject {
     }
 
     private func startObservingTunnelStatus() {
-        if (statusObservationToken != nil) { return }
-        let connection = tunnelProvider.connection
-        statusObservationToken = NotificationCenter.default.addObserver(
+        DispatchQueue.main.async { [weak self] in
+        guard let s = self else { return }
+        if (s.statusObservationToken != nil) { return }
+        let connection = s.tunnelProvider.connection
+        s.statusObservationToken = NotificationCenter.default.addObserver(
             forName: .NEVPNStatusDidChange,
             object: connection,
-            queue: nil) { [weak self] (_) in
-                guard let s = self else { return }
+            queue: nil) { (_) in
                 if ((s.status == .restarting) && (connection.status == .disconnected || connection.status == .disconnecting)) {
                     // Don't change s.status when disconnecting for a restart
                     if (connection.status == .disconnected) {
@@ -421,6 +422,7 @@ class TunnelContainer: NSObject {
                 if (s.status == .inactive) {
                     s.stopObservingTunnelStatus()
                 }
+            }
         }
     }