From: Roopesh Chander <roop@roopc.net>
Date: Mon, 10 Dec 2018 22:18:24 +0000 (+0530)
Subject: TunnelsManager: Error out only on no-internet scenario
X-Git-Tag: 0.0.20181104-6~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ded24f0e00c6d552d4b81d6da5b92475d1d124d;p=thirdparty%2Fwireguard-apple.git

TunnelsManager: Error out only on no-internet scenario

The other scenario happens even during reloading of a tunnel for activation.

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

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 9eaecff..222100d 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -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