Correct capacity argument when casting memory to sockaddr_* type.

The capacity argument indicates the number of instances of sockaddr_* and not
number of bytes within the pointer.

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

Sources/WireGuardKit/IPAddress+AddrInfo.swift

@@ -8,7 +8,10 @@ extension IPv4Address {
     init?(addrInfo: addrinfo) {
         guard addrInfo.ai_family == AF_INET else { return nil }
 
-        let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: MemoryLayout<sockaddr_in>.size) { ptr -> Data in
+        let addressData = addrInfo.ai_addr.withMemoryRebound(
+            to: sockaddr_in.self,
+            capacity: 1
+        ) { ptr -> Data in
             return Data(bytes: &ptr.pointee.sin_addr, count: MemoryLayout<in_addr>.size)
         }
 
@@ -20,7 +23,10 @@ extension IPv6Address {
     init?(addrInfo: addrinfo) {
         guard addrInfo.ai_family == AF_INET6 else { return nil }
 
-        let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: MemoryLayout<sockaddr_in6>.size) { ptr -> Data in
+        let addressData = addrInfo.ai_addr.withMemoryRebound(
+            to: sockaddr_in6.self,
+            capacity: 1
+        ) { ptr -> Data in
             return Data(bytes: &ptr.pointee.sin6_addr, count: MemoryLayout<in6_addr>.size)
         }
 

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)
         }
     }