Changeset 71982 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2018 2:04:04 PM (7 years ago)

Author:

vboxsync

Message:

NAT: (re)implement --nataliasmode sameports because the libalias
version never really worked.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• socket.c (modified) (2 diffs)
• socket.h (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (4 diffs)

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

@@ -36 +36 @@
 #include <icmpapi.h>
 #endif
+#include <alias.h>
 
 #if defined(DECLARE_IOVEC) && defined(RT_OS_WINDOWS)
@@ -170 +171 @@
     LogFlowFuncLeave();
 }
+
+
+int
+sobind(PNATState pData, struct socket *so)
+{
+    bool fSamePorts = !!(pData->i32AliasMode & PKT_ALIAS_SAME_PORTS);
+    struct sockaddr_in self;
+    int opt;
+    int binderr;
+    int ret;
+    
+    /* do we need to bind the socket to specific host address/port? */
+    if (pData->bindIP.s_addr == INADDR_ANY && !fSamePorts)
+        return 0;
+
+    opt = 1;
+    setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt));
+
+    RT_ZERO(self);
+#ifdef RT_OS_DARWIN
+    self.sin_len = sizeof(self);
+#endif
+    self.sin_family = AF_INET;
+    self.sin_addr = pData->bindIP;
+    self.sin_port = fSamePorts ? so->so_lport : 0;
+    
+    Log2(("NAT: binding guest %RTnaipv4:%d to host %RTnaipv4:%d\n",
+          so->so_laddr.s_addr, ntohs(so->so_lport),
+          self.sin_addr.s_addr, ntohs(self.sin_port)));
+
+    ret = bind(so->s, (struct sockaddr *)&self, sizeof(self));
+    if (ret == 0)
+    {
+        Log2(("NAT: ... bind ok\n"));
+        return 0;
+    }
+
+    if (self.sin_port != 0)
+    {
+        if (pData->bindIP.s_addr != INADDR_ANY)
+        {
+            Log2(("NAT: failed to bind to %RTnaipv4:%d (bindip,sameports),"
+                  " retrying with random port\n",
+                  self.sin_addr.s_addr, self.sin_port));
+
+            /*
+             * don't try to guess why bind() failed, retry without
+             * requesting the same port port
+             */
+            self.sin_port = 0;
+
+            ret = bind(so->s, (struct sockaddr *)&self, sizeof(self));
+            if (ret == 0)   /* bindIP ok (but port is not the same) */
+            {
+                Log2(("NAT: ... bind ok (without sameports)\n"));
+                return 0;
+            }
+        }
+        else
+        {
+            Log2(("NAT: failed to bind to 0.0.0.0:%d (sameports),"
+                  " ignoring sameports\n",
+                  self.sin_port));
+
+            /* it's ok if we failed to get the same port */
+            return 0;
+        }
+    }
+
+    binderr = errno;
+
+    Log2(("NAT: failed to bind to %RTnaipv4 (bindip)\n",
+          self.sin_addr.s_addr));
+
+    closesocket(so->s);
+    so->s = -1;
+#ifdef RT_OS_WINDOWS
+    WSASetLastError(binderr);
+#else
+    errno = binderr;
+#endif
+    return -1;
+}
+
 
 /*

trunk/src/VBox/Devices/Network/slirp/socket.h

@@ -167 +167 @@
 struct socket * socreate (void);
 void sofree (PNATState, struct socket *);
+int sobind(PNATState, struct socket *);
 int soread (PNATState, struct socket *);
 void sorecvoob (PNATState, struct socket *);

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

@@ -413 +413 @@
 
         fd_nonblock(s);
-        opt = 1;
-        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt));
+
         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;
-            }
-        }
+        ret = sobind(pData, so);
+        if (ret != 0)
+            return ret;
 
         addr.sin_family = AF_INET;

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

@@ -271 +271 @@
             goto bad_free_mbuf;
         }
+
+        /*
+         * Setup fields
+         */
+        so->so_laddr = ip->ip_src;
+        so->so_lport = uh->uh_sport;
+        so->so_iptos = ip->ip_tos;
+
         if (udp_attach(pData, so) <= 0)
         {
@@ -279 +287 @@
         }
 
-        /*
-         * Setup fields
-         */
         /* udp_last_so = so; */
-        so->so_laddr = ip->ip_src;
-        so->so_lport = uh->uh_sport;
-
-        so->so_iptos = ip->ip_tos;
-
         /*
          * XXXXX Here, check if it's in udpexec_list,
@@ -526 +526 @@
 udp_attach(PNATState pData, struct socket *so)
 {
-    struct sockaddr_in *addr;
     struct sockaddr sa_addr;
     socklen_t socklen = sizeof(struct sockaddr);
@@ -539 +538 @@
     so->so_sotos = 0;
     so->so_sodf = -1;
-    /*
-     * Here, we bind() the socket.  Although not really needed
-     * (sendto() on an unbound socket will bind it), it's done
-     * here so that emulation of ytalk etc. don't have to do it
-     */
-    memset(&sa_addr, 0, sizeof(struct sockaddr));
-    addr = (struct sockaddr_in *)&sa_addr;
-#ifdef RT_OS_DARWIN
-    addr->sin_len = sizeof(struct sockaddr_in);
-#endif
-    addr->sin_family = AF_INET;
-    addr->sin_addr.s_addr = pData->bindIP.s_addr;
+
     fd_nonblock(so->s);
-    if (bind(so->s, &sa_addr, sizeof(struct sockaddr_in)) < 0)
-    {
-        int lasterrno = errno;
-        closesocket(so->s);
-        so->s = -1;
-#ifdef RT_OS_WINDOWS
-        WSASetLastError(lasterrno);
-#else
-        errno = lasterrno;
-#endif
-        goto error;
-    }
+
+    status = sobind(pData, so);
+    if (status != 0)
+        return status;
+
     /* success, insert in queue */
     so->so_expire = curtime + SO_EXPIRE;