From 9e9898f17d2c61e22e4fd144bf44cc2f6572beb2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 3 Nov 2018 06:09:07 +0100 Subject: TunnelsManager: do not change back to inactive if we are resolving the endpoint Signed-off-by: Jason A. Donenfeld --- WireGuard/WireGuard/VPN/TunnelsManager.swift | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'WireGuard/WireGuard/VPN') diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift index 925b5ce..eb69ccd 100644 --- a/WireGuard/WireGuard/VPN/TunnelsManager.swift +++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift @@ -48,6 +48,7 @@ class TunnelsManager { for tunnel in tunnels { if (tunnel.status != .inactive) { currentTunnel = tunnel + break } } self.tunnels = tunnels @@ -439,6 +440,10 @@ class TunnelContainer: NSObject { } return } + if (s.status == .resolvingEndpointDomains && connection.status == .disconnected) { + // Don't change to .inactive if we're still resolving endpoints + return + } s.status = TunnelStatus(from: connection.status) if (s.status == .inactive) { s.stopObservingTunnelStatus() -- cgit v1.2.3-59-g8ed1b