Changeset 87688 in vbox

Timestamp:

Feb 10, 2021 3:28:46 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Now that VBoxNetNAT gets all its settings via the API, the
only command line parameter we need to pass to it is the network name.
bugref:9929

Location:

trunk/src/VBox

Files:

• Main/src-server/NATNetworkImpl.cpp (modified) (1 diff)
• NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -889 +889 @@
     m->NATRunner.resetArguments();
     m->NATRunner.addArgPair(NetworkServiceRunner::kpszKeyNetwork, Utf8Str(m->s.strNetworkName).c_str());
-    m->NATRunner.addArgPair(NetworkServiceRunner::kpszKeyTrunkType, Utf8Str(TRUNKTYPE_WHATEVER).c_str());
-    m->NATRunner.addArgPair(NetworkServiceRunner::kpszIpAddress, Utf8Str(m->IPv4Gateway).c_str());
-    m->NATRunner.addArgPair(NetworkServiceRunner::kpszIpNetmask, Utf8Str(m->IPv4NetworkMask).c_str());
 
     /* No portforwarding rules from command-line, all will be fetched via API */

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -273 +273 @@
     setMacAddress(mac);
 
-    RTNETADDRIPV4 address;
-    address.u     = RT_MAKE_U32_FROM_U8( 10,  0,  2,  2); // NB: big-endian
-    setIpv4Address(address);
-
-    address.u     = RT_H2N_U32_C(0xffffff00);
-    setIpv4Netmask(address);
-
     /* tell the base class about our command line options */
     for (PCRTGETOPTDEF pcOpt = &s_aGetOptDef[0]; pcOpt->iShort != 0; ++pcOpt)
@@ -577 +570 @@
     AssertReturn(CmdLineMask4.u == 0 || CmdLineMask4.u == Mask4.u,
                  VERR_INVALID_PARAMETER);
+
+    /*
+     * Transitional: tell the base class just in case, though it's not
+     * used as far as I can tell.
+     */
+    if (CmdLineAddr4.u == 0)
+    {
+        setIpv4Address(Addr4);
+        setIpv4Netmask(Mask4);
+    }
 
     memcpy(&m_ProxyOptions.ipv4_addr, &Addr4, sizeof(ip_addr));