Changeset 107028 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 18, 2024 2:52:36 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165972

Message:

NAT: Consistently take network config from CFGM, and apply part of the IPv4 network address to the IPv6 prefix as well.

File:

• trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -1610 +1610 @@
                                    pDrvIns->iInstance);
 
-    RTNETADDRIPV4 Network, Netmask;
+    RTNETADDRIPV4 Network, Netmask, Nettemp;
     rc = RTCidrStrToIPv4(szNetwork, &Network, &Netmask);
     if (RT_FAILURE(rc))
@@ -1619 +1619 @@
     /* Construct Libslirp Config and Initialzie Slirp */
 
-    LogFlow(("Here is what is coming out of the vbox config:\n"
-             "  Network: %lu\n"
-             "  Netmask: %lu\n", Network, Netmask));
+    LogFlow(("Here is what is coming out of the vbox config (NAT#%d):\n"
+             "  Network: %RTnaipv4\n"
+             "  Netmask: %RTnaipv4\n",
+             pDrvIns->iInstance, RT_H2BE_U32(Network.u), RT_H2BE_U32(Netmask.u)));
 
     struct in_addr vnetwork = RTNetIPv4AddrHEToInAddr(&Network);
     struct in_addr vnetmask = RTNetIPv4AddrHEToInAddr(&Netmask);
-    struct in_addr vhost = RTNetInAddrFromU8(10, 0, 2, 2);
-    struct in_addr vdhcp_start = RTNetInAddrFromU8(10, 0, 2, 15);
-    struct in_addr vnameserver = RTNetInAddrFromU8(10, 0, 2, 3);
+    Nettemp = Network; Nettemp.u |= 2;  /* Usually 10.0.2.2 */
+    struct in_addr vhost       = RTNetIPv4AddrHEToInAddr(&Nettemp);
+    Nettemp = Network; Nettemp.u |= 15; /* Usually 10.0.2.15 */
+    struct in_addr vdhcp_start = RTNetIPv4AddrHEToInAddr(&Nettemp);
+    Nettemp = Network; Nettemp.u |= 3;  /* Usually 10.0.2.3 */
+    struct in_addr vnameserver = RTNetIPv4AddrHEToInAddr(&Nettemp);
 
     SlirpConfig slirpCfg = { 0 };
@@ -1640 +1644 @@
     slirpCfg.in6_enabled = true;
 
-    inet_pton(AF_INET6, "fd00::", &slirpCfg.vprefix_addr6);
+    /*
+     * Use the same prefix as the NAT Network default:
+     * [fd17:625c:f037:XXXX::/64] - RFC 4193 (ULA) Locally Assigned
+     * Global ID where XXXX, 16 bit Subnet ID, are two bytes from the
+     * middle of the IPv4 address, e.g. :0002: for 10.0.2.1.
+     */
+
+    inet_pton(AF_INET6, "fd17:625c:f037:0::",  &slirpCfg.vprefix_addr6);
+    inet_pton(AF_INET6, "fd17:625c:f037:0::2", &slirpCfg.vhost6);
+    inet_pton(AF_INET6, "fd17:625c:f037:0::3", &slirpCfg.vnameserver6);
     slirpCfg.vprefix_len = 64;
-    inet_pton(AF_INET6, "fd00::2", &slirpCfg.vhost6);
+
+    /* Copy the middle of the IPv4 addresses to the IPv6 addresses. */
+    slirpCfg.vprefix_addr6.s6_addr[6] = RT_BYTE2(vhost.s_addr);
+    slirpCfg.vprefix_addr6.s6_addr[7] = RT_BYTE3(vhost.s_addr);
+    slirpCfg.vhost6.s6_addr[6]        = RT_BYTE2(vhost.s_addr);
+    slirpCfg.vhost6.s6_addr[7]        = RT_BYTE3(vhost.s_addr);
+    slirpCfg.vnameserver6.s6_addr[6]  = RT_BYTE2(vnameserver.s_addr);
+    slirpCfg.vnameserver6.s6_addr[7]  = RT_BYTE3(vnameserver.s_addr);
 
     slirpCfg.vhostname = "vbox";
@@ -1651 +1671 @@
     slirpCfg.vnameserver = vnameserver;
     slirpCfg.if_mtu = MTU;
-
-    inet_pton(AF_INET6, "fd00::3", &slirpCfg.vnameserver6);
 
     slirpCfg.vdnssearch = NULL;