Kit: implement Codable for IPAddressRange

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

Sources/WireGuardKit/IPAddress+AddrInfo.swift

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

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