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

TunnelsManager: do not change back to inactive if we are resolving the endpoint

This commit is contained in:
Jason A. Donenfeld 2018-11-03 06:09:07 +01:00
parent 929470c693
commit 8bbc49015c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ class TunnelsManager {
for tunnel in tunnels { for tunnel in tunnels {
if (tunnel.status != .inactive) { if (tunnel.status != .inactive) {
currentTunnel = tunnel currentTunnel = tunnel
break
} }
} }
self.tunnels = tunnels self.tunnels = tunnels
@ -439,6 +440,10 @@ class TunnelContainer: NSObject {
} }
return 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) s.status = TunnelStatus(from: connection.status)
if (s.status == .inactive) { if (s.status == .inactive) {
s.stopObservingTunnelStatus() s.stopObservingTunnelStatus()