diff options
author | Roopesh Chander <roop@roopc.net> | 2018-12-21 19:23:16 +0530 |
---|---|---|
committer | Roopesh Chander <roop@roopc.net> | 2018-12-21 19:24:22 +0530 |
commit | a21c569e9f84c7b831395ba5a9f738742a748062 (patch) | |
tree | a36b7df30d0ad14f62ea3c1f7b6d914855e2df3a /WireGuard/WireGuardNetworkExtension/DNSResolver.swift | |
parent | Localize all the things (diff) | |
download | wireguard-apple-a21c569e9f84c7b831395ba5a9f738742a748062.tar.xz wireguard-apple-a21c569e9f84c7b831395ba5a9f738742a748062.zip |
NE: Simplify DNS resolution
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard/WireGuardNetworkExtension/DNSResolver.swift')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/DNSResolver.swift | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/DNSResolver.swift b/WireGuard/WireGuardNetworkExtension/DNSResolver.swift index 32cbf78..3929862 100644 --- a/WireGuard/WireGuardNetworkExtension/DNSResolver.swift +++ b/WireGuard/WireGuardNetworkExtension/DNSResolver.swift @@ -4,10 +4,6 @@ import Network import Foundation -enum DNSResolverError: Error { - case dnsResolutionFailed(hostnames: [String]) -} - class DNSResolver { static func isAllEndpointsAlreadyResolved(endpoints: [Endpoint?]) -> Bool { @@ -20,7 +16,7 @@ class DNSResolver { return true } - static func resolveSync(endpoints: [Endpoint?]) throws -> [Endpoint?] { + static func resolveSync(endpoints: [Endpoint?]) -> [Endpoint?]? { let dispatchGroup = DispatchGroup() if isAllEndpointsAlreadyResolved(endpoints: endpoints) { @@ -56,7 +52,8 @@ class DNSResolver { } } if !hostnamesWithDnsResolutionFailure.isEmpty { - throw DNSResolverError.dnsResolutionFailed(hostnames: hostnamesWithDnsResolutionFailure) + wg_log(.error, message: "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure.joined(separator: ", "))") + return nil } return resolvedEndpoints } |