config(qemu): properly generate network params for vmnet

Fixes #5128
utmapp · Apr 17, 2023 · 97c7fef · 97c7fef
1 parent 58125b9
commit 97c7fef
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 42 deletions.
diff --git a/Configuration/UTMQemuConfiguration+Arguments.swift b/Configuration/UTMQemuConfiguration+Arguments.swift
@@ -659,6 +659,44 @@ import Foundation
         #endif
     }
 
+    private func parseNetworkSubnet(from network: UTMQemuConfigurationNetwork) -> (start: String, end: String, mask: String)? {
+        guard let net = network.vlanGuestAddress else {
+            return nil
+        }
+        let components = net.split(separator: "/")
+        let address: String
+        let binaryMask: UInt32
+        guard components.count >= 1 else {
+            return nil
+        }
+        if components.count == 2 {
+            var netmaskAddr = in_addr()
+            if inet_pton(AF_INET, String(components[1]), &netmaskAddr) == 1 {
+                binaryMask = UInt32(bigEndian: netmaskAddr.s_addr)
+            } else {
+                let topbits = Int(components[1])
+                guard let topbits = topbits, topbits >= 0 && topbits < 32 else {
+                    return nil
+                }
+                binaryMask = (0xFFFFFFFF as UInt32) << (32 - topbits)
+            }
+        } else {
+            binaryMask = 0xFFFFFF00
+        }
+        address = String(components[0])
+        var networkAddr = in_addr()
+        let netmask = in_addr(s_addr: in_addr_t(bigEndian: binaryMask))
+        guard inet_pton(AF_INET, address, &networkAddr) == 1 else {
+            return nil
+        }
+        let firstAddr = in_addr(s_addr: (in_addr_t(bigEndian: networkAddr.s_addr & netmask.s_addr) + 1).bigEndian)
+        let lastAddr = in_addr(s_addr: (in_addr_t(bigEndian: networkAddr.s_addr | ~netmask.s_addr) - 1).bigEndian)
+        let firstAddrStr = String(cString: inet_ntoa(firstAddr))
+        let lastAddrStr = String(cString: inet_ntoa(lastAddr))
+        let netmaskStr = String(cString: inet_ntoa(netmask))
+        return (firstAddrStr, lastAddrStr, netmaskStr)
+    }
+
     @QEMUArgumentBuilder private var networkArguments: [QEMUArgument] {
         for i in networks.indices {
             if isSparc {
@@ -706,34 +744,43 @@ import Foundation
                     "restrict=on"
                 }
             }
-            if let guestAddress = networks[i].vlanGuestAddress {
-                "net=\(guestAddress)"
-            }
-            if let hostAddress = networks[i].vlanHostAddress {
-                "host=\(hostAddress)"
-            }
-            if let guestAddressIPv6 = networks[i].vlanGuestAddressIPv6 {
-                "ipv6-net=\(guestAddressIPv6)"
-            }
-            if let hostAddressIPv6 = networks[i].vlanHostAddressIPv6 {
-                "ipv6-host=\(hostAddressIPv6)"
-            }
-            if let dhcpStartAddress = networks[i].vlanDhcpStartAddress {
-                "dhcpstart=\(dhcpStartAddress)"
-            }
-            if let dnsServerAddress = networks[i].vlanDnsServerAddress {
-                "dns=\(dnsServerAddress)"
-            }
-            if let dnsServerAddressIPv6 = networks[i].vlanDnsServerAddressIPv6 {
-                "ipv6-dns=\(dnsServerAddressIPv6)"
-            }
-            if let dnsSearchDomain = networks[i].vlanDnsSearchDomain {
-                "dnssearch=\(dnsSearchDomain)"
-            }
-            if let dhcpDomain = networks[i].vlanDhcpDomain {
-                "domainname=\(dhcpDomain)"
-            }
-            if !useVMnet {
+            if useVMnet {
+                if let subnet = parseNetworkSubnet(from: networks[i]) {
+                    "start-address=\(subnet.start)"
+                    "end-address=\(subnet.end)"
+                    "subnet-mask=\(subnet.mask)"
+                }
+                if let nat66prefix = networks[i].vlanGuestAddressIPv6 {
+                    "nat66-prefix=\(nat66prefix)"
+                }
+            } else {
+                if let guestAddress = networks[i].vlanGuestAddress {
+                    "net=\(guestAddress)"
+                }
+                if let hostAddress = networks[i].vlanHostAddress {
+                    "host=\(hostAddress)"
+                }
+                if let guestAddressIPv6 = networks[i].vlanGuestAddressIPv6 {
+                    "ipv6-net=\(guestAddressIPv6)"
+                }
+                if let hostAddressIPv6 = networks[i].vlanHostAddressIPv6 {
+                    "ipv6-host=\(hostAddressIPv6)"
+                }
+                if let dhcpStartAddress = networks[i].vlanDhcpStartAddress {
+                    "dhcpstart=\(dhcpStartAddress)"
+                }
+                if let dnsServerAddress = networks[i].vlanDnsServerAddress {
+                    "dns=\(dnsServerAddress)"
+                }
+                if let dnsServerAddressIPv6 = networks[i].vlanDnsServerAddressIPv6 {
+                    "ipv6-dns=\(dnsServerAddressIPv6)"
+                }
+                if let dnsSearchDomain = networks[i].vlanDnsSearchDomain {
+                    "dnssearch=\(dnsSearchDomain)"
+                }
+                if let dhcpDomain = networks[i].vlanDhcpDomain {
+                    "domainname=\(dhcpDomain)"
+                }
                 for forward in networks[i].portForward {
                     "hostfwd=\(forward.protocol.rawValue.lowercased()):\(forward.hostAddress ?? ""):\(forward.hostPort)-\(forward.guestAddress ?? ""):\(forward.guestPort)"
                 }

diff --git a/Platform/Shared/VMConfigAdvancedNetworkView.swift b/Platform/Shared/VMConfigAdvancedNetworkView.swift
@@ -42,20 +42,22 @@ struct IPConfigurationSection: View {
                 .keyboardType(.asciiCapable)
             DefaultTextField("Guest Network (IPv6)", text: $config.vlanGuestAddressIPv6.bound, prompt: "fec0::/64")
                 .keyboardType(.asciiCapable)
-            DefaultTextField("Host Address", text: $config.vlanHostAddress.bound, prompt: "10.0.2.2")
-                .keyboardType(.decimalPad)
-            DefaultTextField("Host Address (IPv6)", text: $config.vlanHostAddressIPv6.bound, prompt: "fec0::2")
-                .keyboardType(.asciiCapable)
-            DefaultTextField("DHCP Start", text: $config.vlanDhcpStartAddress.bound, prompt: "10.0.2.15")
-                .keyboardType(.decimalPad)
-            DefaultTextField("DHCP Domain Name", text: $config.vlanDhcpDomain.bound)
-                .keyboardType(.asciiCapable)
-            DefaultTextField("DNS Server", text: $config.vlanDnsServerAddress.bound, prompt: "10.0.2.3")
-                .keyboardType(.decimalPad)
-            DefaultTextField("DNS Server (IPv6)", text: $config.vlanDnsServerAddressIPv6.bound, prompt: "fec0::3")
-                .keyboardType(.asciiCapable)
-            DefaultTextField("DNS Search Domains", text: $config.vlanDnsSearchDomain.bound)
-                .keyboardType(.asciiCapable)
+            if config.mode == .emulated {
+                DefaultTextField("Host Address", text: $config.vlanHostAddress.bound, prompt: "10.0.2.2")
+                    .keyboardType(.decimalPad)
+                DefaultTextField("Host Address (IPv6)", text: $config.vlanHostAddressIPv6.bound, prompt: "fec0::2")
+                    .keyboardType(.asciiCapable)
+                DefaultTextField("DHCP Start", text: $config.vlanDhcpStartAddress.bound, prompt: "10.0.2.15")
+                    .keyboardType(.decimalPad)
+                DefaultTextField("DHCP Domain Name", text: $config.vlanDhcpDomain.bound)
+                    .keyboardType(.asciiCapable)
+                DefaultTextField("DNS Server", text: $config.vlanDnsServerAddress.bound, prompt: "10.0.2.3")
+                    .keyboardType(.decimalPad)
+                DefaultTextField("DNS Server (IPv6)", text: $config.vlanDnsServerAddressIPv6.bound, prompt: "fec0::3")
+                    .keyboardType(.asciiCapable)
+                DefaultTextField("DNS Search Domains", text: $config.vlanDnsSearchDomain.bound)
+                    .keyboardType(.asciiCapable)
+            }
         }.disableAutocorrection(true)
     }
 }