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

Infer serverAddress from sessionConfiguration

This commit is contained in:
Davide De Rosa 2019-04-09 20:41:48 +02:00
parent 14567ac50f
commit 914864c31a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,16 +461,15 @@ extension TunnelKitProvider {
- Parameter bundleIdentifier: The provider bundle identifier required to locate the tunnel extension. - Parameter bundleIdentifier: The provider bundle identifier required to locate the tunnel extension.
- Parameter appGroup: The name of the app group in which the tunnel extension lives in. - Parameter appGroup: The name of the app group in which the tunnel extension lives in.
- Parameter hostname: The hostname the tunnel will connect to.
- Parameter credentials: The optional credentials to authenticate with. - Parameter credentials: The optional credentials to authenticate with.
- Returns: The generated `NETunnelProviderProtocol` object. - Returns: The generated `NETunnelProviderProtocol` object.
- Throws: `ProviderError.credentials` if unable to store `credentials.password` to the `appGroup` keychain. - Throws: `ProviderError.credentials` if unable to store `credentials.password` to the `appGroup` keychain.
*/ */
public func generatedTunnelProtocol(withBundleIdentifier bundleIdentifier: String, appGroup: String, hostname: String?, credentials: SessionProxy.Credentials? = nil) throws -> NETunnelProviderProtocol { public func generatedTunnelProtocol(withBundleIdentifier bundleIdentifier: String, appGroup: String, credentials: SessionProxy.Credentials? = nil) throws -> NETunnelProviderProtocol {
let protocolConfiguration = NETunnelProviderProtocol() let protocolConfiguration = NETunnelProviderProtocol()
protocolConfiguration.providerBundleIdentifier = bundleIdentifier protocolConfiguration.providerBundleIdentifier = bundleIdentifier
protocolConfiguration.serverAddress = hostname protocolConfiguration.serverAddress = sessionConfiguration.hostname ?? resolvedAddresses?.first
if let username = credentials?.username, let password = credentials?.password { if let username = credentials?.username, let password = credentials?.password {
let keychain = Keychain(group: appGroup) let keychain = Keychain(group: appGroup)
do { do {