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

TunnelsManager: Deactivate only when the status becomes 'connected' 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-12-11 01:58:40 +05:30
parent 4d63a3e9bd
commit e59dbe6364
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
WireGuard/WireGuard/VPN/TunnelsManager.swift
View File

@ -260,7 +260,7 @@ class TunnelsManager {
tunnelWaitingForActivation = (tunnel, completionHandler) tunnelWaitingForActivation = (tunnel, completionHandler)
os_log("Tunnel '%{public}@' is waiting for deactivation of '%{public}@' (status: %{public}@)", os_log("Tunnel '%{public}@' is waiting for deactivation of '%{public}@' (status: %{public}@)",
log: OSLog.default, type: .debug, tunnel.name, tunnelInOperation.name, "\(tunnelInOperation.status)") log: OSLog.default, type: .debug, tunnel.name, tunnelInOperation.name, "\(tunnelInOperation.status)")
if (tunnelInOperation.status != .deactivating) { if (tunnelInOperation.status == .active) {
tunnelBeingActivated = nil tunnelBeingActivated = nil
startDeactivation(of: tunnelInOperation) startDeactivation(of: tunnelInOperation)
} }
@ -301,6 +301,9 @@ class TunnelsManager {
guard let tunnel = self?.tunnels.first(where: { $0.tunnelProvider == tunnelProvider }) else { return } guard let tunnel = self?.tunnels.first(where: { $0.tunnelProvider == tunnelProvider }) else { return }
guard let s = self 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 // In case our attempt to start the tunnel, didn't succeed
if (tunnel == s.tunnelBeingActivated) { if (tunnel == s.tunnelBeingActivated) {
if (session.status == .disconnected) { if (session.status == .disconnected) {
@ -328,8 +331,13 @@ class TunnelsManager {
tunnel.refreshStatus() tunnel.refreshStatus()
// In case some other tunnel is waiting on this tunnel's deactivation // 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}@'", os_log("Activating waiting tunnel '%{public}@' after deactivation of '%{public}@'",
log: OSLog.default, type: .debug, waitingTunnel.name, tunnel.name) log: OSLog.default, type: .debug, waitingTunnel.name, tunnel.name)
precondition(waitingTunnel.status == .waiting) precondition(waitingTunnel.status == .waiting)