Update OpenVPN/WireGuard builders

Author: keeshux

Sources/PartoutOpenVPNConnection/Internal/NetworkSettingsBuilder.swift

@@ -230,13 +230,23 @@ private extension NetworkSettingsBuilder {
 
         if let domain = dnsDomain {
             pp_log(ctx, .openvpn, .info, "\tDNS: Set domain: \(domain.asSensitiveAddress(ctx))")
-            dnsSettings.domainName = domain
+            dnsSettings.domains = [domain]
+            dnsSettings.isFirstDomainPrimary = true
+        } else {
+            dnsSettings.isFirstDomainPrimary = false
         }
 
         let searchDomains = allDNSSearchDomains
         if !searchDomains.isEmpty {
             pp_log(ctx, .openvpn, .info, "\tDNS: Set search domains: \(searchDomains.map { $0.asSensitiveAddress(ctx) })")
-            dnsSettings.searchDomains = searchDomains
+            // First domain is main domain
+            if var domains = dnsSettings.domains {
+                let otherDomains = searchDomains.filter { !domains.contains($0) }
+                domains.append(contentsOf: otherDomains)
+                dnsSettings.domains = domains
+            } else {
+                dnsSettings.domains = searchDomains
+            }
         }
 
         do {

Sources/PartoutWireGuard/Internal/Configuration+WgQuickConfig.swift

@@ -176,7 +176,7 @@ extension WireGuard.Configuration {
                 }
             }
             interface.dns.servers = dnsServers.map(\.rawValue)
-            interface.dns.searchDomains = dnsSearch
+            interface.dns.domains = dnsSearch
         }
         if let mtuString = attributes["mtu"] {
             guard let mtu = UInt16(mtuString) else {

Sources/PartoutWireGuard/StandardWireGuardParser+Validate.swift

@@ -29,7 +29,7 @@ private extension WireGuard.Configuration.Builder {
         if !interface.addresses.isEmpty {
             lines.append("Address = \(interface.addresses.wgJoined)")
         }
-        let dnsEntries = interface.dns.servers + (interface.dns.searchDomains ?? [])
+        let dnsEntries = interface.dns.servers + (interface.dns.domains ?? [])
         if !dnsEntries.isEmpty {
             lines.append("DNS = \(dnsEntries.wgJoined)")
         }

Sources/PartoutWireGuardConnection/Legacy/Mappers/LocalInterface+WireGuardKit.swift

@@ -13,7 +13,7 @@ extension WireGuard.LocalInterface {
 
         var dnsBuilder = DNSModule.Builder()
         dnsBuilder.servers = wg.dns.map(\.stringRepresentation)
-        dnsBuilder.searchDomains = wg.dnsSearch
+        dnsBuilder.domains = wg.dnsSearch
         let dns = try dnsBuilder.build()
 
         let mtu = wg.mtu

Tests/PartoutWireGuardTests/WireGuardParserTests.swift

@@ -67,7 +67,7 @@ Endpoint = 1.2.3.4:12345
 
         var dns = DNSModule.Builder()
         dns.servers = ["1.2.3.4"]
-        dns.searchDomains = ["domain.local"]
+        dns.domains = ["domain.local"]
         sut.interface.dns = dns
 
         let builder = WireGuardModule.Builder(configurationBuilder: sut)
@@ -113,7 +113,7 @@ Endpoint = 1.2.3.4:12345
 //
 //        var dns = DNSModule.Builder()
 //        dns.servers = ["1.a.2.$%3"]
-//        dns.searchDomains = ["-invalid.example.com"]
+//        dns.domains = ["-invalid.example.com"]
 //        sut.interface.dns = dns
 //
 //        do {
@@ -214,7 +214,7 @@ private extension WireGuardParserTests {
             builder.interface.addresses = ["1.2.3.4"]
             var dns = DNSModule.Builder()
             dns.servers = ["1.2.3.4"]
-            dns.searchDomains = ["domain.local"]
+            dns.domains = ["domain.local"]
             builder.interface.dns = dns
         }
         if withPeer {