aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2018-12-19 15:38:00 +0530
committerRoopesh Chander <roop@roopc.net>2018-12-19 15:38:00 +0530
commitfa51e3f1d1636374341b7bf07967626af9e97b91 (patch)
treed12d7c0e6599ef37ea5d405e99d2f4dac77f8397 /WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
parentNE: No need for two startTunnel() methods (diff)
downloadwireguard-apple-fa51e3f1d1636374341b7bf07967626af9e97b91.tar.xz
wireguard-apple-fa51e3f1d1636374341b7bf07967626af9e97b91.zip
NE: Handle bad domain names and Activate On Demand
This combination causes iOS to keep trying to bring up the tunnel, leading to a lot of displayMessage() alerts. In this fix, if we get a DNS resolution error in an Activate On Demand enabled tunnel, we silently retry 9 times (with a 4-second delay before each retry) and then show the displayMessage() alert. Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r--WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift57
1 files changed, 44 insertions, 13 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 12a2e436..9a3aede0 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) }
}