Changeset 87620 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Feb 5, 2021 3:48:44 AM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Get IPv4 settings from the API, not from the command line
(but for now cross check that they are the same). The command line
settings will be gone soon. bugref:9929.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• VBoxNetLwipNAT.cpp (modified) (7 diffs)
• proxy.h (modified) (1 diff)

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

@@ -177 +177 @@
     int homeInit();
     int logInit();
+    int ipv4Init();
     int eventsInit();
 
@@ -239 +240 @@
     LogFlowFuncEnter();
 
+    RT_ZERO(m_ProxyOptions.ipv4_addr);
+    RT_ZERO(m_ProxyOptions.ipv4_mask);
     m_ProxyOptions.ipv6_enabled = 0;
     m_ProxyOptions.ipv6_defroute = 0;
@@ -362 +365 @@
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
 
+    /*
+     * Get the settings related to IPv4.
+     */
+    rc = ipv4Init();
+    if (RT_FAILURE(rc))
+        return rc;
+
 
     BOOL fIPv6Enabled = FALSE;
@@ -377 +387 @@
     m_ProxyOptions.ipv6_defroute = fIPv6DefaultRoute;
 
-
-    /*
-     * IPv4 source address, if configured.
-     */
-    com::Utf8Str strSourceIp4;
-    rc = getExtraData(strSourceIp4, "SourceIp4");
-    if (RT_SUCCESS(rc) && strSourceIp4.isNotEmpty())
-    {
-        RTNETADDRIPV4 addr;
-        rc = RTNetStrToIPv4Addr(strSourceIp4.c_str(), &addr);
-        if (RT_SUCCESS(rc))
-        {
-            m_src4.sin_addr.s_addr = addr.u;
-            m_ProxyOptions.src4 = &m_src4;
-
-            LogRel(("Will use %RTnaipv4 as IPv4 source address\n",
-                    m_src4.sin_addr.s_addr));
-        }
-        else
-        {
-            LogRel(("Failed to parse \"%s\" IPv4 source address specification\n",
-                    strSourceIp4.c_str()));
-        }
-    }
 
     /*
@@ -431 +417 @@
 
 
-    createRawSock4();
     if (fIPv6Enabled)
         createRawSock6();
@@ -578 +563 @@
 
 
-/**
- * Create and register event listeners.
+/*
+ * Read IPv4 related settings and do necessary initialization.  These
+ * settings will be picked up by the proxy on the lwIP thread.  See
+ * onLwipTcpIpInit().
+ */
+int VBoxNetLwipNAT::ipv4Init()
+{
+    HRESULT hrc;
+    int rc;
+
+    AssertReturn(m_net.isNotNull(), VERR_GENERAL_FAILURE);
+
+    /*
+     * IPv4 address and mask.
+     */
+    com::Bstr bstrIPv4Prefix;
+    hrc = m_net->COMGETTER(Network)(bstrIPv4Prefix.asOutParam());
+    if (FAILED(hrc))
+    {
+        reportComError(m_net, "Network", hrc);
+        return VERR_GENERAL_FAILURE;
+    }
+
+    RTNETADDRIPV4 Net4, Mask4;
+    int iPrefixLength;
+    rc = RTNetStrToIPv4Cidr(com::Utf8Str(bstrIPv4Prefix).c_str(),
+                            &Net4, &iPrefixLength);
+    if (RT_FAILURE(rc))
+    {
+        reportError("Failed to parse IPv4 prefix %ls\n", bstrIPv4Prefix.raw());
+        return rc;
+    }
+
+    if (iPrefixLength > 30)
+    {
+        reportError("IPv4 prefix length %d is too narrow\n", iPrefixLength);
+        return VERR_INVALID_PARAMETER;
+    }
+
+    rc = RTNetPrefixToMaskIPv4(iPrefixLength, &Mask4);
+    AssertRCReturn(rc, rc);
+    AssertReturn(iPrefixLength > 0, VERR_INVALID_PARAMETER);
+
+    RTNETADDRIPV4 Addr4;
+    Addr4.u = Net4.u | RT_H2N_U32_C(0x00000001);
+
+    /* Transitional: check that old and new ways agree */
+    const RTNETADDRIPV4 &CmdLineAddr4 = getIpv4Address();
+    AssertReturn(CmdLineAddr4.u == 0 || CmdLineAddr4.u == Addr4.u,
+                 VERR_INVALID_PARAMETER);
+
+    const RTNETADDRIPV4 &CmdLineMask4 = getIpv4Netmask();
+    AssertReturn(CmdLineMask4.u == 0 || CmdLineMask4.u == Mask4.u,
+                 VERR_INVALID_PARAMETER);
+
+    memcpy(&m_ProxyOptions.ipv4_addr, &Addr4, sizeof(ip_addr));
+    memcpy(&m_ProxyOptions.ipv4_mask, &Mask4, sizeof(ip_addr));
+
+
+    /*
+     * Raw socket for ICMP.
+     */
+    createRawSock4();
+
+
+    /*
+     * IPv4 source address (host), if configured.
+     */
+    com::Utf8Str strSourceIp4;
+    rc = getExtraData(strSourceIp4, "SourceIp4");
+    if (RT_SUCCESS(rc) && strSourceIp4.isNotEmpty())
+    {
+        RTNETADDRIPV4 addr;
+        rc = RTNetStrToIPv4Addr(strSourceIp4.c_str(), &addr);
+        if (RT_SUCCESS(rc))
+        {
+            m_src4.sin_addr.s_addr = addr.u;
+            m_ProxyOptions.src4 = &m_src4;
+
+            LogRel(("Will use %RTnaipv4 as IPv4 source address\n",
+                    m_src4.sin_addr.s_addr));
+        }
+        else
+        {
+            LogRel(("Failed to parse \"%s\" IPv4 source address specification\n",
+                    strSourceIp4.c_str()));
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+
+/**
+ * Create and register API event listeners.
  */
 int VBoxNetLwipNAT::eventsInit()
@@ -734 +813 @@
     proxy_ip6_divert_hook = pxremap_ip6_divert;
 
-    /* lwip thread */
-    RTNETADDRIPV4 network;
-    RTNETADDRIPV4 address = self->getIpv4Address();
-    RTNETADDRIPV4 netmask = self->getIpv4Netmask();
-    network.u = address.u & netmask.u;
-
-    ip_addr LwipIpAddr, LwipIpNetMask, LwipIpNetwork;
-
-    memcpy(&LwipIpAddr, &address, sizeof(ip_addr));
-    memcpy(&LwipIpNetMask, &netmask, sizeof(ip_addr));
-    memcpy(&LwipIpNetwork, &network, sizeof(ip_addr));
-
     netif *pNetif = netif_add(&self->m_LwipNetIf /* Lwip Interface */,
-                              &LwipIpAddr /* IP address*/,
-                              &LwipIpNetMask /* Network mask */,
-                              &LwipIpAddr /* gateway address, @todo: is self IP acceptable? */,
+                              &self->m_ProxyOptions.ipv4_addr, /* IP address*/
+                              &self->m_ProxyOptions.ipv4_mask, /* Network mask */
+                              &self->m_ProxyOptions.ipv4_addr, /* XXX: Gateway address */
                               self /* state */,
                               VBoxNetLwipNAT::netifInit /* netif_init_fn */,

trunk/src/VBox/NetworkServices/NAT/proxy.h

@@ -51 +51 @@
 
 struct proxy_options {
+    ip_addr_t ipv4_addr;
+    ip_addr_t ipv4_mask;
     int ipv6_enabled;
     int ipv6_defroute;