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

Allow overriding DNS servers 

Fall back to those in PUSH_REPLY.
This commit is contained in:
Davide De Rosa 2019-01-05 22:25:38 +01:00
parent 650f0d5456
commit 13c41d80e7
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
View File

@ -64,7 +64,8 @@ extension TunnelKitProvider {
tlsWrap: nil, tlsWrap: nil,
keepAliveInterval: nil, keepAliveInterval: nil,
renegotiatesAfter: nil, renegotiatesAfter: nil,
usesPIAPatches: nil usesPIAPatches: nil,
dnsServers: nil
), ),
shouldDebug: false, shouldDebug: false,
debugLogKey: nil, debugLogKey: nil,

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

@ -499,7 +499,7 @@ extension TunnelKitProvider: SessionProxyDelegate {
ipv6Settings?.excludedRoutes = [] ipv6Settings?.excludedRoutes = []
} }
let dnsSettings = NEDNSSettings(servers: reply.dnsServers) let dnsSettings = NEDNSSettings(servers: cfg.sessionConfiguration.dnsServers ?? reply.dnsServers)
let newSettings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: remoteAddress) let newSettings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: remoteAddress)
newSettings.ipv4Settings = ipv4Settings newSettings.ipv4Settings = ipv4Settings

14
TunnelKit/Sources/Core/SessionProxy+Configuration.swift
View File

@ -165,6 +165,9 @@ extension SessionProxy {
/// Server is patched for the PIA VPN provider. /// Server is patched for the PIA VPN provider.
public var usesPIAPatches: Bool? public var usesPIAPatches: Bool?
/// Optionally override the server DNS entries.
public var dnsServers: [String]?
/// :nodoc: /// :nodoc:
public init(ca: CryptoContainer) { public init(ca: CryptoContainer) {
cipher = .aes128cbc cipher = .aes128cbc
@ -177,6 +180,7 @@ extension SessionProxy {
keepAliveInterval = nil keepAliveInterval = nil
renegotiatesAfter = nil renegotiatesAfter = nil
usesPIAPatches = false usesPIAPatches = false
dnsServers = nil
} }
/** /**
@ -195,7 +199,8 @@ extension SessionProxy {
tlsWrap: tlsWrap, tlsWrap: tlsWrap,
keepAliveInterval: keepAliveInterval, keepAliveInterval: keepAliveInterval,
renegotiatesAfter: renegotiatesAfter, renegotiatesAfter: renegotiatesAfter,
usesPIAPatches: usesPIAPatches usesPIAPatches: usesPIAPatches,
dnsServers: dnsServers
) )
} }
} }
@ -233,6 +238,9 @@ extension SessionProxy {
/// - Seealso: `SessionProxy.ConfigurationBuilder.usesPIAPatches` /// - Seealso: `SessionProxy.ConfigurationBuilder.usesPIAPatches`
public let usesPIAPatches: Bool? public let usesPIAPatches: Bool?
/// - Seealso: `SessionProxy.ConfigurationBuilder.dnsServers`
public let dnsServers: [String]?
/** /**
Returns a `SessionProxy.ConfigurationBuilder` to use this configuration as a starting point for a new one. Returns a `SessionProxy.ConfigurationBuilder` to use this configuration as a starting point for a new one.
@ -249,6 +257,7 @@ extension SessionProxy {
builder.keepAliveInterval = keepAliveInterval builder.keepAliveInterval = keepAliveInterval
builder.renegotiatesAfter = renegotiatesAfter builder.renegotiatesAfter = renegotiatesAfter
builder.usesPIAPatches = usesPIAPatches builder.usesPIAPatches = usesPIAPatches
builder.dnsServers = dnsServers
return builder return builder
} }
@ -265,7 +274,8 @@ extension SessionProxy {
(lhs.compressionFraming == rhs.compressionFraming) && (lhs.compressionFraming == rhs.compressionFraming) &&
(lhs.keepAliveInterval == rhs.keepAliveInterval) && (lhs.keepAliveInterval == rhs.keepAliveInterval) &&
(lhs.renegotiatesAfter == rhs.renegotiatesAfter) && (lhs.renegotiatesAfter == rhs.renegotiatesAfter) &&
(lhs.usesPIAPatches == rhs.usesPIAPatches) (lhs.usesPIAPatches == rhs.usesPIAPatches) &&
(lhs.dnsServers == rhs.dnsServers)
} }
} }
} }