passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TunnelsManager: Always call the completion handler before returning 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-12-10 17:00:31 +05:30
parent 663bb02c68
commit 0d7a585bf7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WireGuard/WireGuard/VPN/TunnelsManager.swift
View File

@ -26,6 +26,7 @@ enum TunnelsManagerError: WireGuardAppError {
case vpnSystemErrorOnRemoveTunnel case vpnSystemErrorOnRemoveTunnel
// Tunnel activation // Tunnel activation
case attemptingActivationWhenTunnelIsNotInactive
case tunnelActivationAttemptFailed // startTunnel() throwed case tunnelActivationAttemptFailed // startTunnel() throwed
case tunnelActivationFailedInternalError // startTunnel() succeeded, but activation failed case tunnelActivationFailedInternalError // startTunnel() succeeded, but activation failed
case tunnelActivationFailedNoInternetConnection // startTunnel() succeeded, but activation failed since no internet case tunnelActivationFailedNoInternetConnection // startTunnel() succeeded, but activation failed since no internet
@ -45,6 +46,8 @@ enum TunnelsManagerError: WireGuardAppError {
case .vpnSystemErrorOnRemoveTunnel: case .vpnSystemErrorOnRemoveTunnel:
return ("Unable to remove tunnel", "Internal error") return ("Unable to remove tunnel", "Internal error")
case .attemptingActivationWhenTunnelIsNotInactive:
return ("Activation failure", "The tunnel is already active or in the process of being activated")
case .tunnelActivationAttemptFailed: case .tunnelActivationAttemptFailed:
return ("Activation failure", "The tunnel could not be activated due to an internal error") return ("Activation failure", "The tunnel could not be activated due to an internal error")
case .tunnelActivationFailedInternalError: case .tunnelActivationFailedInternalError:
@ -232,6 +235,7 @@ class TunnelsManager {
func startActivation(of tunnel: TunnelContainer, completionHandler: @escaping (TunnelsManagerError?) -> Void) { func startActivation(of tunnel: TunnelContainer, completionHandler: @escaping (TunnelsManagerError?) -> Void) {
guard (tunnel.status == .inactive) else { guard (tunnel.status == .inactive) else {
completionHandler(TunnelsManagerError.attemptingActivationWhenTunnelIsNotInactive)
return return
} }