Kit: implement Codable for IPAddressRange

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

Sources/WireGuardKit/IPAddressRange.swift

@@ -27,6 +27,29 @@ 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)"

Sources/WireGuardKit/WireGuardAdapter.swift

@@ -56,10 +56,6 @@ public class WireGuardAdapter {
     /// Adapter state.
     private var state: State = .stopped
 
-    /// Whether adapter should automatically raise the `reasserting` flag when updating
-    /// tunnel configuration.
-    private let shouldHandleReasserting: Bool
-
     /// Tunnel device file descriptor.
     private var tunnelFileDescriptor: Int32? {
         var ctlInfo = ctl_info()
@@ -132,12 +128,9 @@ public class WireGuardAdapter {
     /// Designated initializer.
     /// - Parameter packetTunnelProvider: an instance of `NEPacketTunnelProvider`. Internally stored
     ///   as a weak reference.
-    /// - Parameter shouldHandleReasserting: whether adapter should automatically raise the
-    ///   `reasserting` flag when updating tunnel configuration.
     /// - Parameter logHandler: a log handler closure.
-    public init(with packetTunnelProvider: NEPacketTunnelProvider, shouldHandleReasserting: Bool = true, logHandler: @escaping LogHandler) {
+    public init(with packetTunnelProvider: NEPacketTunnelProvider, logHandler: @escaping LogHandler) {
         self.packetTunnelProvider = packetTunnelProvider
-        self.shouldHandleReasserting = shouldHandleReasserting
         self.logHandler = logHandler
 
         setupLogHandler()
@@ -255,68 +248,40 @@ public class WireGuardAdapter {
             // Tell the system that the tunnel is going to reconnect using new WireGuard
             // configuration.
             // This will broadcast the `NEVPNStatusDidChange` notification to the GUI process.
-            if self.shouldHandleReasserting {
+            self.packetTunnelProvider?.reasserting = true
-                self.packetTunnelProvider?.reasserting = true
-            }
-
             defer {
-                if self.shouldHandleReasserting {
+                self.packetTunnelProvider?.reasserting = false
-                    self.packetTunnelProvider?.reasserting = false
-                }
             }
 
-            let settingsGenerator: PacketTunnelSettingsGenerator
             do {
-                settingsGenerator = try self.makeSettingsGenerator(with: tunnelConfiguration)
+                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)
             } 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)
         }
     }