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

Timestamp:

Aug 17, 2017 1:05:10 PM (7 years ago)

Author:

vboxsync

Message:

NAT: Bind TCP sockets to specific address if requested. Why and how
this has been overlooked is a mistery. Report the address we will
bind to in the release log. While here, actually verify --natbindip
argument at the API call time.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/slirp.c (modified) (1 diff)
• slirp/tcp_subr.c (modified) (1 diff)

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

@@ -1656 +1656 @@
         slirp_set_mtu(pThis->pNATState, MTU);
         slirp_set_somaxconn(pThis->pNATState, i32SoMaxConn);
+
         char *pszBindIP = NULL;
         GET_STRING_ALLOC(rc, pThis, pCfg, "BindIP", pszBindIP);
-        rc = slirp_set_binding_address(pThis->pNATState, pszBindIP);
-        if (rc != 0 && pszBindIP && *pszBindIP)
-            LogRel(("NAT: Value of BindIP has been ignored\n"));
-
-        if(pszBindIP != NULL)
+        slirp_set_binding_address(pThis->pNATState, pszBindIP);
+        if (pszBindIP != NULL)
             MMR3HeapFree(pszBindIP);
+
 #define SLIRP_SET_TUNING_VALUE(name, setter)                    \
             do                                                  \

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -1694 +1694 @@
 int slirp_set_binding_address(PNATState pData, char *addr)
 {
-    if (addr == NULL || (inet_aton(addr, &pData->bindIP) == 0))
-    {
+    int ok;
+
+    pData->bindIP.s_addr = INADDR_ANY;
+
+    if (addr == NULL || *addr == '\0')
+        return VINF_SUCCESS;
+
+    ok = inet_aton(addr, &pData->bindIP);
+    if (!ok)
+    {
+        LogRel(("NAT: Unable to parse binding address: %s\n", addr));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (pData->bindIP.s_addr == INADDR_ANY)
+        return VINF_SUCCESS;
+
+    if ((pData->bindIP.s_addr & RT_N2H_U32_C(0xe0000000)) == RT_N2H_U32_C(0xe0000000))
+    {
+        LogRel(("NAT: Ignoring multicast binding address %RTnaipv4\n", pData->bindIP.s_addr));
         pData->bindIP.s_addr = INADDR_ANY;
-        return 1;
-    }
-    return 0;
+        return VERR_INVALID_PARAMETER;
+    }
+
+    LogRel(("NAT: Binding address %RTnaipv4\n", pData->bindIP.s_addr));
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Devices/Network/slirp/tcp_subr.c

@@ -417 +417 @@
         opt = 1;
         setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&opt, sizeof(opt));
+
+        if (pData->bindIP.s_addr != INADDR_ANY)
+        {
+            struct sockaddr_in self;
+            self.sin_family = AF_INET;
+            self.sin_addr = pData->bindIP;
+            self.sin_port = 0;
+
+            ret = bind(s, (struct sockaddr *)&self, sizeof(self));
+            if (ret != 0)
+            {
+                Log2(("NAT: bind(%RTnaipv4): %s\n", pData->bindIP.s_addr, strerror(errno)));
+                return ret;
+            }
+        }
 
         addr.sin_family = AF_INET;