Compare commits

..

1 Commits

Author SHA1 Message Date
Andrej Mihajlov abbdeb8e39 Kit: make it possible to opt-out from automatically raising the reasserting flag.
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
2022-03-02 11:14:37 +01:00
+7 -30
View File
@@ -265,27 +265,12 @@ public class WireGuardAdapter {
} }
} }
let settingsGenerator: PacketTunnelSettingsGenerator
do { do {
settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration) let settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration)
} catch let error as WireGuardAdapterError { try self.setNetworkSettings(settingsGenerator.generateNetworkSettings())
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)
@@ -297,19 +282,6 @@ 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:
@@ -317,6 +289,11 @@ public class WireGuardAdapter {
} }
completionHandler(nil) completionHandler(nil)
} catch let error as WireGuardAdapterError {
completionHandler(error)
} catch {
fatalError()
}
} }
} }