From: Roopesh Chander <roop@roopc.net>
Date: Thu, 1 Nov 2018 11:27:40 +0000 (+0530)
Subject: TunnelsManager: Better errors
X-Git-Tag: 0.0.20181104-1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a457e40289f4e28c81975461454b28ed50f229;p=thirdparty%2Fwireguard-apple.git

TunnelsManager: Better errors

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

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 7c942ad..7d5dd50 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -15,8 +15,8 @@ protocol TunnelsManagerDelegate: class {
 enum TunnelActivationError: Error {
     case noEndpoint
     case dnsResolutionFailed
-    case tunnelOperationFailed
-    case attemptingActivationWhenAnotherTunnelIsActive
+    case tunnelActivationFailed
+    case attemptingActivationWhenAnotherTunnelIsBusy(otherTunnelStatus: TunnelStatus)
     case attemptingActivationWhenTunnelIsNotInactive
     case attemptingDeactivationWhenTunnelIsInactive
 }
@@ -237,7 +237,7 @@ class TunnelsManager {
             return
         }
         guard (currentTunnel == nil) else {
-            completionHandler(TunnelActivationError.attemptingActivationWhenAnotherTunnelIsActive)
+            completionHandler(TunnelActivationError.attemptingActivationWhenAnotherTunnelIsBusy(otherTunnelStatus: currentTunnel!.status))
             return
         }
         setCurrentTunnel(tunnel: tunnel)
@@ -368,7 +368,7 @@ class TunnelContainer: NSObject {
                                      completionHandler: @escaping (Error?) -> Void) {
         if (recursionCount >= 8) {
             os_log("startActivation: Failed after 8 attempts. Giving up with %{public}@.", log: OSLog.default, type: .error, "\(lastError!)")
-            completionHandler(lastError)
+            completionHandler(TunnelActivationError.tunnelActivationFailed)
             return
         }