TunnelsManager: Deactivate only when the status becomes 'connected'

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 7c4fe9a8a6c1c2141d5d23828dc78cc2c765e5bb..8003208652e8695e00bdb43bf217ed6e7789af34 100644 (file)
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -260,7 +260,7 @@ class TunnelsManager {
             tunnelWaitingForActivation = (tunnel, completionHandler)
             os_log("Tunnel '%{public}@' is waiting for deactivation of '%{public}@' (status: %{public}@)",
                    log: OSLog.default, type: .debug, tunnel.name, tunnelInOperation.name, "\(tunnelInOperation.status)")
-            if (tunnelInOperation.status != .deactivating) {
+            if (tunnelInOperation.status == .active) {
                 tunnelBeingActivated = nil
                 startDeactivation(of: tunnelInOperation)
             }
@@ -301,6 +301,9 @@ class TunnelsManager {
                 guard let tunnel = self?.tunnels.first(where: { $0.tunnelProvider == tunnelProvider }) else { return }
                 guard let s = self else { return }
 
+                os_log("Tunnel '%{public}@' connection status changed to '%{public}@'",
+                       log: OSLog.default, type: .debug, tunnel.name, "\(tunnel.tunnelProvider.connection.status)")
+
                 // In case our attempt to start the tunnel, didn't succeed
                 if (tunnel == s.tunnelBeingActivated) {
                     if (session.status == .disconnected) {
@@ -328,8 +331,13 @@ class TunnelsManager {
                 tunnel.refreshStatus()
 
                 // In case some other tunnel is waiting on this tunnel's deactivation
-                if (tunnel.status == .inactive) {
-                    if let (waitingTunnel, waitingTunnelCompletionHandler) = s.tunnelWaitingForActivation {
+
+                if let (waitingTunnel, waitingTunnelCompletionHandler) = s.tunnelWaitingForActivation {
+                    if (tunnel.status == .active) {
+                        os_log("Deactivating tunnel '%{public}@' because tunnel '%{public}@' is waiting for activation",
+                               log: OSLog.default, type: .debug, tunnel.name, waitingTunnel.name)
+                        tunnel.startDeactivation()
+                    } else if (tunnel.status == .inactive) {
                         os_log("Activating waiting tunnel '%{public}@' after deactivation of '%{public}@'",
                                log: OSLog.default, type: .debug, waitingTunnel.name, tunnel.name)
                         precondition(waitingTunnel.status == .waiting)