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

TunnelsManager: Better errors

Browse Source 
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-11-01 16:57:40 +05:30
parent 53a93e9b92
commit 39a457e402
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/VPN/TunnelsManager.swift
+4 -4
View File
@@ -15,8 +15,8 @@ protocol TunnelsManagerDelegate: class {
enum TunnelActivationError: Error { enum TunnelActivationError: Error {
case noEndpoint case noEndpoint
case dnsResolutionFailed case dnsResolutionFailed
case tunnelOperationFailed case tunnelActivationFailed
case attemptingActivationWhenAnotherTunnelIsActive case attemptingActivationWhenAnotherTunnelIsBusy(otherTunnelStatus: TunnelStatus)
case attemptingActivationWhenTunnelIsNotInactive case attemptingActivationWhenTunnelIsNotInactive
case attemptingDeactivationWhenTunnelIsInactive case attemptingDeactivationWhenTunnelIsInactive
} }
@@ -237,7 +237,7 @@ class TunnelsManager {
return return
} }
guard (currentTunnel == nil) else { guard (currentTunnel == nil) else {
completionHandler(TunnelActivationError.attemptingActivationWhenAnotherTunnelIsActive) completionHandler(TunnelActivationError.attemptingActivationWhenAnotherTunnelIsBusy(otherTunnelStatus: currentTunnel!.status))
return return
} }
setCurrentTunnel(tunnel: tunnel) setCurrentTunnel(tunnel: tunnel)
@@ -368,7 +368,7 @@ class TunnelContainer: NSObject {
completionHandler: @escaping (Error?) -> Void) { completionHandler: @escaping (Error?) -> Void) {
if (recursionCount >= 8) { if (recursionCount >= 8) {
os_log("startActivation: Failed after 8 attempts. Giving up with %{public}@.", log: OSLog.default, type: .error, "\(lastError!)") os_log("startActivation: Failed after 8 attempts. Giving up with %{public}@.", log: OSLog.default, type: .error, "\(lastError!)")
completionHandler(lastError) completionHandler(TunnelActivationError.tunnelActivationFailed)
return return
} }