]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
TunnelsManager: Error out only on no-internet scenario
authorRoopesh Chander <roop@roopc.net>
Mon, 10 Dec 2018 22:18:24 +0000 (03:48 +0530)
committerRoopesh Chander <roop@roopc.net>
Mon, 10 Dec 2018 22:18:28 +0000 (03:48 +0530)
The other scenario happens even during reloading of a tunnel for activation.

Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/VPN/TunnelsManager.swift

index 9eaecff68fbc939188c7297674fcf8e46b574977..222100d220569a949848b842c0cf6f1fffe729b4 100644 (file)
@@ -286,10 +286,10 @@ class TunnelsManager {
                 // In case our attempt to start the tunnel, didn't succeed
                 if (tunnel == s.tunnelBeingActivated) {
                     if (session.status == .disconnected) {
-                        let error = (InternetReachability.currentStatus() == .notReachable ?
-                            TunnelsManagerError.tunnelActivationFailedNoInternetConnection :
-                            TunnelsManagerError.tunnelActivationFailedInternalError)
-                        s.activationDelegate?.tunnelActivationFailed(tunnel: tunnel, error: error)
+                        if (InternetReachability.currentStatus() == .notReachable) {
+                            let error = TunnelsManagerError.tunnelActivationFailedNoInternetConnection
+                            s.activationDelegate?.tunnelActivationFailed(tunnel: tunnel, error: error)
+                        }
                         s.tunnelBeingActivated = nil
                     } else if (session.status == .connected) {
                         s.tunnelBeingActivated = nil