Compare commits

..

3 Commits

Author SHA1 Message Date
Andrej Mihajlov b7f344968d Kit: make it possible to opt-out from automatically raising the reasserting flag.
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
2022-02-21 15:54:49 +01:00
Andrej Mihajlov 399013415d Merge branch 'am/ignore-set-network-settings-error-when-offline' into am/develop 2022-02-21 13:11:49 +01:00
Andrej Mihajlov 7dea71898d Kit: Adapter: ignore error when updating tunnel settings in offline
Since around iOS 15.1, calling `setNetworkSettings()` when in
airplane mode, throws an unknown error:

Error Domain=NEAgentErrorDomain Code=1

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
2021-12-20 16:21:34 +01:00
+30 -7
View File
@@ -265,12 +265,27 @@ public class WireGuardAdapter {
} }
} }
let settingsGenerator: PacketTunnelSettingsGenerator
do { do {
let settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration) settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration)
try self.setNetworkSettings(settingsGenerator.generateNetworkSettings()) } catch let error as WireGuardAdapterError {
completionHandler(error)
return
} catch {
fatalError()
}
switch self.state { switch self.state {
case .started(let handle, _): case .started(let handle, _):
do {
try self.setNetworkSettings(settingsGenerator.generateNetworkSettings())
} catch let error as WireGuardAdapterError {
completionHandler(error)
return
} catch {
fatalError()
}
let (wgConfig, resolutionResults) = settingsGenerator.uapiConfiguration() let (wgConfig, resolutionResults) = settingsGenerator.uapiConfiguration()
self.logEndpointResolutionResults(resolutionResults) self.logEndpointResolutionResults(resolutionResults)
@@ -282,6 +297,19 @@ public class WireGuardAdapter {
self.state = .started(handle, settingsGenerator) self.state = .started(handle, settingsGenerator)
case .temporaryShutdown: case .temporaryShutdown:
// On iOS 15.1 or newer, updating network settings may fail when in airplane mode.
// Network path monitor will retry updating settings later when connectivity is
// back online.
do {
try self.setNetworkSettings(settingsGenerator.generateNetworkSettings())
} catch let error as WireGuardAdapterError {
if case .setNetworkSettings(let systemError) = error {
self.logHandler(.verbose, "Failed to set network settings while offline. Will retry when connectivity is back online. Error: \(systemError.localizedDescription)")
}
} catch {
fatalError()
}
self.state = .temporaryShutdown(settingsGenerator) self.state = .temporaryShutdown(settingsGenerator)
case .stopped: case .stopped:
@@ -289,11 +317,6 @@ public class WireGuardAdapter {
} }
completionHandler(nil) completionHandler(nil)
} catch let error as WireGuardAdapterError {
completionHandler(error)
} catch {
fatalError()
}
} }
} }