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

Parse multiple "dhcp-option DOMAIN" lines

Browse Source
This commit is contained in:
Davide De Rosa 2019-10-25 17:21:34 +02:00
parent 645f65ccd0
commit 4e77f5b6b3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,7 @@ extension OpenVPN {
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 optSearchDomains: [String]?
var optHTTPProxy: Proxy? var optHTTPProxy: Proxy?
var optHTTPSProxy: Proxy? var optHTTPSProxy: Proxy?
var optProxyAutoConfigurationURL: URL? var optProxyAutoConfigurationURL: URL?
@ -531,7 +531,10 @@ extension OpenVPN {
guard $0.count == 2 else { guard $0.count == 2 else {
return return
} }
optSearchDomain = $0[1] if optSearchDomains == nil {
optSearchDomains = []
}
optSearchDomains?.append($0[1])
} }
Regex.proxy.enumerateArguments(in: line) { Regex.proxy.enumerateArguments(in: line) {
if $0.count == 2 { if $0.count == 2 {
@ -738,7 +741,7 @@ extension OpenVPN {
} }
sessionBuilder.dnsServers = optDNSServers sessionBuilder.dnsServers = optDNSServers
sessionBuilder.searchDomain = optSearchDomain sessionBuilder.searchDomains = optSearchDomains
sessionBuilder.httpProxy = optHTTPProxy sessionBuilder.httpProxy = optHTTPProxy
sessionBuilder.httpsProxy = optHTTPSProxy sessionBuilder.httpsProxy = optHTTPSProxy
sessionBuilder.proxyAutoConfigurationURL = optProxyAutoConfigurationURL sessionBuilder.proxyAutoConfigurationURL = optProxyAutoConfigurationURL