Compare commits

..

1 Commits

Author SHA1 Message Date
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
2 changed files with 46 additions and 46 deletions
-23
View File
@@ -27,29 +27,6 @@ extension IPAddressRange: Hashable {
}
}
extension IPAddressRange: Codable {
public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(self.stringRepresentation)
}
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()
let value = try container.decode(String.self)
if let ipAddressRange = IPAddressRange(from: value) {
self = ipAddressRange
} else {
let context = DecodingError.Context(
codingPath: container.codingPath,
debugDescription: "Invalid IPAddressRange representation"
)
throw DecodingError.dataCorrupted(context)
}
}
}
extension IPAddressRange {
public var stringRepresentation: String {
return "\(address)/\(networkPrefixLength)"
+46 -23
View File
@@ -253,35 +253,58 @@ public class WireGuardAdapter {
self.packetTunnelProvider?.reasserting = false
}
let settingsGenerator: PacketTunnelSettingsGenerator
do {
let settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration)
try self.setNetworkSettings(settingsGenerator.generateNetworkSettings())
switch self.state {
case .started(let handle, _):
let (wgConfig, resolutionResults) = settingsGenerator.uapiConfiguration()
self.logEndpointResolutionResults(resolutionResults)
wgSetConfig(handle, wgConfig)
#if os(iOS)
wgDisableSomeRoamingForBrokenMobileSemantics(handle)
#endif
self.state = .started(handle, settingsGenerator)
case .temporaryShutdown:
self.state = .temporaryShutdown(settingsGenerator)
case .stopped:
fatalError()
}
completionHandler(nil)
settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration)
} catch let error as WireGuardAdapterError {
completionHandler(error)
return
} catch {
fatalError()
}
switch self.state {
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()
self.logEndpointResolutionResults(resolutionResults)
wgSetConfig(handle, wgConfig)
#if os(iOS)
wgDisableSomeRoamingForBrokenMobileSemantics(handle)
#endif
self.state = .started(handle, settingsGenerator)
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)
case .stopped:
fatalError()
}
completionHandler(nil)
}
}