ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPN: Reload the tunnel before starting it up

Browse Source 
To avoid errors like this: https://stackoverflow.com/q/47550706

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-10-29 05:02:57 +05:30
parent 0baca8bf58
commit e80e8b06c5
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/VPN/TunnelsManager.swift
+12 -9
View File
@@ -272,15 +272,18 @@ class TunnelContainer: NSObject {
s.status = .inactive s.status = .inactive
return return
} }
s.startObservingTunnelStatus() s.tunnelProvider.loadFromPreferences { [weak s] (error) in
let session = (s.tunnelProvider.connection as! NETunnelProviderSession) guard let s = s else { return }
do { s.startObservingTunnelStatus()
let tunnelOptions = PacketTunnelOptionsGenerator.generateOptions( let session = (s.tunnelProvider.connection as! NETunnelProviderSession)
from: tunnelConfiguration, withResolvedEndpoints: endpoints) do {
try session.startTunnel(options: tunnelOptions) let tunnelOptions = PacketTunnelOptionsGenerator.generateOptions(
} catch (let error) { from: tunnelConfiguration, withResolvedEndpoints: endpoints)
os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)") try session.startTunnel(options: tunnelOptions)
completionHandler(error) } catch (let error) {
os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
completionHandler(error)
}
} }
} }
} }