diff options
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift | 8 | ||||
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift | 57 |
2 files changed, 50 insertions, 15 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift b/WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift index c392233..02fbd4c 100644 --- a/WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift +++ b/WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift @@ -18,8 +18,12 @@ class ErrorNotifier { switch error { case .savedProtocolConfigurationIsInvalid: return ("Activation failure", "Could not retrieve tunnel information from the saved configuration") - case .dnsResolutionFailure: - return ("DNS resolution failure", "One or more endpoint domains could not be resolved") + case .dnsResolutionFailure(let tunnelName, let isActivateOnDemandEnabled): + if isActivateOnDemandEnabled { + return ("DNS resolution failure", "This tunnel has Activate On Demand enabled, so activation might be retried. You may turn off Activate On Demand in the WireGuard app by navigating to: '\(tunnelName)' > Edit") + } else { + return ("DNS resolution failure", "One or more endpoint domains could not be resolved") + } case .couldNotStartWireGuard: return ("Activation failure", "WireGuard backend could not be started") case .coultNotSetNetworkSettings: diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift index 12a2e43..9a3aede 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -8,7 +8,7 @@ import os.log enum PacketTunnelProviderError: Error { case savedProtocolConfigurationIsInvalid - case dnsResolutionFailure(hostnames: [String]) + case dnsResolutionFailure(tunnelName: String, isActivateOnDemandEnabled: Bool) case couldNotStartWireGuard case coultNotSetNetworkSettings } @@ -38,21 +38,22 @@ class PacketTunnelProvider: NEPacketTunnelProvider { configureLogger() - wg_log(.info, message: "Starting tunnel '\(tunnelConfiguration.interface.name)'") + let tunnelName = tunnelConfiguration.interface.name + wg_log(.info, message: "Starting tunnel '\(tunnelName)'") + + let isActivateOnDemandEnabled = tunnelProviderProtocol.isActivateOnDemandEnabled + if isActivateOnDemandEnabled { + wg_log(.info, staticMessage: "Tunnel has Activate On Demand enabled") + } else { + wg_log(.info, staticMessage: "Tunnel has Activate On Demand disabled") + } let endpoints = tunnelConfiguration.peers.map { $0.endpoint } - var resolvedEndpoints = [Endpoint?]() - do { - resolvedEndpoints = try DNSResolver.resolveSync(endpoints: endpoints) - } catch DNSResolverError.dnsResolutionFailed(let hostnames) { - wg_log(.error, staticMessage: "Starting tunnel failed: DNS resolution failure") - wg_log(.error, message: "Hostnames for which DNS resolution failed: \(hostnames.joined(separator: ", "))") - errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure(hostnames: hostnames)) - startTunnelCompletionHandler(PacketTunnelProviderError.dnsResolutionFailure(hostnames: hostnames)) + guard let resolvedEndpoints = resolveDomainNames(endpoints: endpoints, isActivateOnDemandEnabled: isActivateOnDemandEnabled) else { + let dnsError = PacketTunnelProviderError.dnsResolutionFailure(tunnelName: tunnelName, isActivateOnDemandEnabled: isActivateOnDemandEnabled) + errorNotifier.notify(dnsError) + startTunnelCompletionHandler(dnsError) return - } catch { - // There can be no other errors from DNSResolver.resolveSync() - fatalError() } assert(endpoints.count == resolvedEndpoints.count) @@ -143,6 +144,36 @@ class PacketTunnelProvider: NEPacketTunnelProvider { } } + private func resolveDomainNames(endpoints: [Endpoint?], isActivateOnDemandEnabled: Bool) -> [Endpoint?]? { + var resolvedEndpoints = [Endpoint?]() + let dnsResolutionAttemptsCount = isActivateOnDemandEnabled ? 10 : 1 + var isDNSResolved = false + + for attemptIndex in 0 ..< dnsResolutionAttemptsCount { + do { + resolvedEndpoints = try DNSResolver.resolveSync(endpoints: endpoints) + isDNSResolved = true + } catch DNSResolverError.dnsResolutionFailed(let hostnames) { + wg_log(.error, staticMessage: "Starting tunnel failed: DNS resolution failure") + wg_log(.error, message: "Hostnames for which DNS resolution failed: \(hostnames.joined(separator: ", "))") + } catch { + // There can be no other errors from DNSResolver.resolveSync() + fatalError() + } + if isDNSResolved { + break + } else { + let isLastAttempt = attemptIndex == dnsResolutionAttemptsCount - 1 + if !isLastAttempt { + Thread.sleep(forTimeInterval: 4 /* seconds */) + wg_log(.error, message: "Retrying DNS resolution (Attempt \(attemptIndex + 2))") + } + } + } + + return isDNSResolved ? resolvedEndpoints : nil + } + private func connect(interfaceName: String, settings: String, fileDescriptor: Int32) -> Int32 { return withStringsAsGoStrings(interfaceName, settings) { return wgTurnOn($0.0, $0.1, fileDescriptor) } } |