From 5ed28907ecab4f7c001ab604be664eb46033bdc5 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sun, 24 Feb 2019 19:30:14 +0530 Subject: iOS: Hack to restart active tunnel after adding a new tunnel Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/Tunnel/TunnelsManager.swift | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'WireGuard/WireGuard') diff --git a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift index ece1e72..e05bea9 100644 --- a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift +++ b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift @@ -115,6 +115,8 @@ class TunnelsManager { activateOnDemandSetting.apply(on: tunnelProviderManager) + let activeTunnel = tunnels.first { $0.status == .active || $0.status == .activating } + tunnelProviderManager.saveToPreferences { [weak self] error in guard error == nil else { wg_log(.error, message: "Add: Saving configuration failed: \(error!)") @@ -125,6 +127,19 @@ class TunnelsManager { guard let self = self else { return } + #if os(iOS) + // HACK: In iOS, adding a tunnel causes deactivation of any currently active tunnel. + // This is an ugly hack to reactivate the tunnel that has been deactivated like that. + if let activeTunnel = activeTunnel { + if activeTunnel.status == .inactive || activeTunnel.status == .deactivating { + self.startActivation(of: activeTunnel) + } + if activeTunnel.status == .active || activeTunnel.status == .activating { + activeTunnel.status = .restarting + } + } + #endif + let tunnel = TunnelContainer(tunnel: tunnelProviderManager) self.tunnels.append(tunnel) self.tunnels.sort { $0.name < $1.name } @@ -440,7 +455,7 @@ class TunnelContainer: NSObject { } func refreshStatus() { - if (status == .restarting) && (tunnelProvider.connection.status == .disconnected || tunnelProvider.connection.status == .disconnecting) { + if status == .restarting { return } status = TunnelStatus(from: tunnelProvider.connection.status) -- cgit v1.2.3-59-g8ed1b