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

Skip DNS settings if no servers are provided

This commit is contained in:
Davide De Rosa 2019-04-05 12:58:05 +02:00
parent 4ce2d78c5a
commit 82394e0433
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,16 +571,19 @@ extension TunnelKitProvider: SessionProxyDelegate {
ipv6Settings?.includedRoutes = routes
ipv6Settings?.excludedRoutes = []
}
var dnsServers = cfg.sessionConfiguration.dnsServers
if dnsServers?.isEmpty ?? true {
dnsServers = reply.options.dnsServers
var dnsSettings: NEDNSSettings?
var cfgDNSServers = cfg.sessionConfiguration.dnsServers
if cfgDNSServers?.isEmpty ?? true {
cfgDNSServers = reply.options.dnsServers
}
// FIXME: default to DNS servers from current network instead
let dnsSettings = NEDNSSettings(servers: dnsServers ?? [])
if let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain {
dnsSettings.domainName = searchDomain
dnsSettings.searchDomains = [searchDomain]
if let dnsServers = cfgDNSServers, !dnsServers.isEmpty {
dnsSettings = NEDNSSettings(servers: dnsServers)
if let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain {
dnsSettings?.domainName = searchDomain
dnsSettings?.searchDomains = [searchDomain]
}
}
var proxySettings: NEProxySettings?