PacketTunnelProvider: proper fix for 32073323

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2019-02-07 15:01:37 +01:00
parent 868fee0477
commit 394a0cbeb0
2 changed files with 7 additions and 15 deletions
@@ -442,21 +442,6 @@ class TunnelContainer: NSObject {
    }

    func refreshStatus() {
-        #if os(macOS)
-        // In macOS, we wait for a few seconds after deactivation to work around a system bug.
-        // If a tunnel gets activated in this time interval, it's stopped by the system automatically in ~25 seconds.
-        if self.status == .deactivating && tunnelProvider.connection.status == .disconnected {
-            self.deactivationTimer?.invalidate()
-            let deactivationTimer = Timer(timeInterval: 6 /* seconds */, repeats: false) { [weak self] _ in
-                guard let self = self else { return }
-                self.status = TunnelStatus(from: self.tunnelProvider.connection.status)
-                self.isActivateOnDemandEnabled = self.tunnelProvider.isOnDemandEnabled
-            }
-            self.deactivationTimer = deactivationTimer
-            RunLoop.main.add(deactivationTimer, forMode: .common)
-            return
-        }
-        #endif
        status = TunnelStatus(from: tunnelProvider.connection.status)
        isActivateOnDemandEnabled = tunnelProvider.isOnDemandEnabled
    }