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

Merge local and remote DNS servers 

- Local first
- Remote last
This commit is contained in:
Davide De Rosa 2019-04-17 16:23:01 +02:00
parent 82394e0433
commit 1d3660459e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -573,12 +573,12 @@ extension TunnelKitProvider: SessionProxyDelegate {
}
var dnsSettings: NEDNSSettings?
var cfgDNSServers = cfg.sessionConfiguration.dnsServers
if cfgDNSServers?.isEmpty ?? true {
cfgDNSServers = reply.options.dnsServers
var dnsServers = cfg.sessionConfiguration.dnsServers ?? []
if let replyDNSServers = reply.options.dnsServers {
dnsServers.append(contentsOf: replyDNSServers)
}
// FIXME: default to DNS servers from current network instead
if let dnsServers = cfgDNSServers, !dnsServers.isEmpty {
if !dnsServers.isEmpty {
dnsSettings = NEDNSSettings(servers: dnsServers)
if let searchDomain = cfg.sessionConfiguration.searchDomain ?? reply.options.searchDomain {
dnsSettings?.domainName = searchDomain