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

Consider last appearing DOMAIN option

This commit is contained in:
Davide De Rosa 2020-12-15 13:57:57 +01:00
parent 7535458339
commit 6b8d88fef5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
View File

@ -531,15 +531,10 @@ extension OpenVPN {
optDNSServers?.append($0[1])
}
Regex.domain.enumerateArguments(in: line) {
guard $0.count == 2, optDomain == nil else {
guard $0.count == 2 else {
return
}
optDomain = $0[1]
if optSearchDomains == nil {
optSearchDomains = [optDomain!]
} else {
optSearchDomains?.insert(optDomain!, at: 0)
}
}
Regex.domainSearch.enumerateArguments(in: line) {
guard $0.count == 2 else {
@ -763,6 +758,15 @@ extension OpenVPN {
)
}
// prepend search domains with main domain (if set)
if let domain = optDomain {
if optSearchDomains == nil {
optSearchDomains = [domain]
} else {
optSearchDomains?.insert(domain, at: 0)
}
}
sessionBuilder.dnsServers = optDNSServers
sessionBuilder.searchDomains = optSearchDomains
sessionBuilder.httpProxy = optHTTPProxy