diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-02-23 13:42:18 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-03-17 09:49:07 +0100 |
| commit | 7fc4b2c20442845bf0dade7536bd58343e580d2e (patch) | |
| tree | c1f4596ab21adc9a627512646f863099948bb76e | |
| parent | c74a65eadba05f661779dab41b32e2488b9cbfe7 (diff) | |
| download | mullvadvpn-7fc4b2c20442845bf0dade7536bd58343e580d2e.tar.xz mullvadvpn-7fc4b2c20442845bf0dade7536bd58343e580d2e.zip | |
IPC: remove condition that waits for reasserting state
| -rw-r--r-- | ios/MullvadVPN/TunnelIPC/TunnelIPCRequestOperation.swift | 8 | ||||
| -rw-r--r-- | ios/MullvadVPN/TunnelIPC/TunnelIPCSession.swift | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ios/MullvadVPN/TunnelIPC/TunnelIPCRequestOperation.swift b/ios/MullvadVPN/TunnelIPC/TunnelIPCRequestOperation.swift index 08fdfe1dbf..26ded3ff84 100644 --- a/ios/MullvadVPN/TunnelIPC/TunnelIPCRequestOperation.swift +++ b/ios/MullvadVPN/TunnelIPC/TunnelIPCRequestOperation.swift @@ -16,10 +16,6 @@ extension TunnelIPC { /// Used to workaround a bug when talking to the tunnel too early may cause it to freeze. static let connectingStateWaitDelay: TimeInterval = 5 - /// Wait until the tunnel transitioned from reasserting to connected state before sending - /// the request. - var waitIfReasserting: Bool - /// Timeout interval in seconds. var timeout: TimeInterval = 5 } @@ -140,9 +136,7 @@ extension TunnelIPC { } case .reasserting: - if !options.waitIfReasserting { - sendRequest() - } + sendRequest() case .invalid, .disconnecting, .disconnected: completeOperation(completion: .failure(.send(.tunnelDown(status)))) diff --git a/ios/MullvadVPN/TunnelIPC/TunnelIPCSession.swift b/ios/MullvadVPN/TunnelIPC/TunnelIPCSession.swift index 4b12b15db4..dac8368fbc 100644 --- a/ios/MullvadVPN/TunnelIPC/TunnelIPCSession.swift +++ b/ios/MullvadVPN/TunnelIPC/TunnelIPCSession.swift @@ -26,7 +26,7 @@ extension TunnelIPC { queue: queue, connection: connection, request: .reloadTunnelSettings, - options: TunnelIPC.RequestOptions(waitIfReasserting: true), + options: TunnelIPC.RequestOptions(), completionHandler: completionHandler ) @@ -42,7 +42,7 @@ extension TunnelIPC { queue: queue, connection: connection, request: .tunnelConnectionInfo, - options: TunnelIPC.RequestOptions(waitIfReasserting: false), + options: TunnelIPC.RequestOptions(), completionHandler: completionHandler ) |