passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: Delay .deactivated status to workaround system bug 

For some time after it's connection status becomes .disconnected,
if a tunnel gets started, it gets automatically killed by the system
after ~25 seconds.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2019-01-25 18:14:48 +05:30
parent eabeb8ff05
commit 6ad3487a9d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
WireGuard/WireGuard/Tunnel/TunnelsManager.swift
View File

@ -388,6 +388,7 @@ class TunnelContainer: NSObject {
}
var activationAttemptId: String?
var activationTimer: Timer?
var deactivationTimer: Timer?
fileprivate var tunnelProvider: NETunnelProviderManager
@ -426,8 +427,22 @@ class TunnelContainer: NSObject {
}
func refreshStatus() {
let status = TunnelStatus(from: tunnelProvider.connection.status)
self.status = status
#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: 5 /* 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: .default)
return
}
#endif
status = TunnelStatus(from: tunnelProvider.connection.status)
isActivateOnDemandEnabled = tunnelProvider.isOnDemandEnabled
}