diff --git a/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift b/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift index 83e3fef..6152ac8 100644 --- a/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift +++ b/TunnelKit/Sources/AppExtension/TunnelKitProvider.swift @@ -560,7 +560,10 @@ extension TunnelKitProvider: SessionProxyDelegate { ipv6Settings?.excludedRoutes = [] } - let dnsServers = cfg.sessionConfiguration.dnsServers ?? reply.options.dnsServers + var dnsServers = cfg.sessionConfiguration.dnsServers + if dnsServers?.isEmpty ?? true { + dnsServers = reply.options.dnsServers + } let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain let dnsSettings = NEDNSSettings(servers: dnsServers ?? []) dnsSettings.domainName = searchDomain diff --git a/TunnelKit/Sources/Core/ConfigurationParser.swift b/TunnelKit/Sources/Core/ConfigurationParser.swift index 390ac20..fbfe683 100644 --- a/TunnelKit/Sources/Core/ConfigurationParser.swift +++ b/TunnelKit/Sources/Core/ConfigurationParser.swift @@ -199,7 +199,7 @@ public class ConfigurationParser { var optGateway4Arguments: [String]? var optRoutes4: [(String, String, String?)] = [] // address, netmask, gateway var optRoutes6: [(String, UInt8, String?)] = [] // destination, prefix, gateway - var optDNSServers: [String] = [] + var optDNSServers: [String]? var optSearchDomain: String? var optHTTPProxy: Proxy? var optHTTPSProxy: Proxy? @@ -482,7 +482,10 @@ public class ConfigurationParser { guard $0.count == 2 else { return } - optDNSServers.append($0[1]) + if optDNSServers == nil { + optDNSServers = [] + } + optDNSServers?.append($0[1]) } Regex.domain.enumerateArguments(in: line) { guard $0.count == 2 else {