From: Roopesh Chander <roop@roopc.net>
Date: Sun, 28 Oct 2018 23:32:57 +0000 (+0530)
Subject: VPN: Reload the tunnel before starting it up
X-Git-Tag: 0.0.20181104-1~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e80e8b06c5025a96faa4e1a08fd6bfa322baecbe;p=thirdparty%2Fwireguard-apple.git

VPN: Reload the tunnel before starting it up

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

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index bfecfd6..76d5c05 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -272,15 +272,18 @@ class TunnelContainer: NSObject {
                 s.status = .inactive
                 return
             }
-            s.startObservingTunnelStatus()
-            let session = (s.tunnelProvider.connection as! NETunnelProviderSession)
-            do {
-                let tunnelOptions = PacketTunnelOptionsGenerator.generateOptions(
-                    from: tunnelConfiguration, withResolvedEndpoints: endpoints)
-                try session.startTunnel(options: tunnelOptions)
-            } catch (let error) {
-                os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
-                completionHandler(error)
+            s.tunnelProvider.loadFromPreferences { [weak s] (error) in
+                guard let s = s else { return }
+                s.startObservingTunnelStatus()
+                let session = (s.tunnelProvider.connection as! NETunnelProviderSession)
+                do {
+                    let tunnelOptions = PacketTunnelOptionsGenerator.generateOptions(
+                        from: tunnelConfiguration, withResolvedEndpoints: endpoints)
+                    try session.startTunnel(options: tunnelOptions)
+                } catch (let error) {
+                    os_log("Failed to activate tunnel: %{public}@", log: OSLog.default, type: .debug, "\(error)")
+                    completionHandler(error)
+                }
             }
         }
     }