passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85 from keeshux/dns-inconsistency-issues 

DNS inconsistency issues
This commit is contained in:
Davide De Rosa 2019-04-17 09:23:27 +02:00 committed by GitHub
parent 537b733130 233aa02169
commit 0c3a4235aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TunnelKit/Sources/AppExtension/TunnelKitProvider.swift
View File

@ -560,11 +560,14 @@ extension TunnelKitProvider: SessionProxyDelegate {
ipv6Settings?.excludedRoutes = [] ipv6Settings?.excludedRoutes = []
} }
let dnsServers = cfg.sessionConfiguration.dnsServers ?? reply.options.dnsServers var dnsServers = cfg.sessionConfiguration.dnsServers
let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain if dnsServers?.isEmpty ?? true {
dnsServers = reply.options.dnsServers
}
// FIXME: default to DNS servers from current network instead
let dnsSettings = NEDNSSettings(servers: dnsServers ?? []) let dnsSettings = NEDNSSettings(servers: dnsServers ?? [])
dnsSettings.domainName = searchDomain if let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain {
if let searchDomain = searchDomain { dnsSettings.domainName = searchDomain
dnsSettings.searchDomains = [searchDomain] dnsSettings.searchDomains = [searchDomain]
} }

7
TunnelKit/Sources/Core/ConfigurationParser.swift
View File

@ -199,7 +199,7 @@ public class ConfigurationParser {
var optGateway4Arguments: [String]? var optGateway4Arguments: [String]?
var optRoutes4: [(String, String, String?)] = [] // address, netmask, gateway var optRoutes4: [(String, String, String?)] = [] // address, netmask, gateway
var optRoutes6: [(String, UInt8, String?)] = [] // destination, prefix, gateway var optRoutes6: [(String, UInt8, String?)] = [] // destination, prefix, gateway
var optDNSServers: [String] = [] var optDNSServers: [String]?
var optSearchDomain: String? var optSearchDomain: String?
var optHTTPProxy: Proxy? var optHTTPProxy: Proxy?
var optHTTPSProxy: Proxy? var optHTTPSProxy: Proxy?
@ -482,7 +482,10 @@ public class ConfigurationParser {
guard $0.count == 2 else { guard $0.count == 2 else {
return return
} }
optDNSServers.append($0[1]) if optDNSServers == nil {
optDNSServers = []
}
optDNSServers?.append($0[1])
} }
Regex.domain.enumerateArguments(in: line) { Regex.domain.enumerateArguments(in: line) {
guard $0.count == 2 else { guard $0.count == 2 else {