Changeset 5723 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Nov 13, 2007 4:47:27 PM (17 years ago)

Author:

vboxsync

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

26086

Message:

Fix UDP forwarding in the NAT code. Was completely broken.

File:

• trunk/src/VBox/Devices/Network/slirp/udp.c (modified) (2 diffs)

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

@@ -307 +307 @@
             saddr.sin_addr.s_addr = alias_addr.s_addr;
     }
+    /* Any UDP packet to the loopback address must be translated to be from
+     * the forwarding address, i.e. 10.0.2.2. */
+    if (   (saddr.sin_addr.s_addr & htonl(IN_CLASSA_NET))
+        == htonl(INADDR_LOOPBACK & IN_CLASSA_NET))
+        saddr.sin_addr.s_addr = alias_addr.s_addr;
+
     daddr.sin_addr = so->so_laddr;
     daddr.sin_port = so->so_lport;
@@ -647 +653 @@
         getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
         so->so_fport = addr.sin_port;
-        if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr)
+        /* The original check was completely broken, as the commented out
+         * if statement was always true (INADDR_ANY=0). */
+        /* if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr) */
+        if (1 == 0)                 /* always use the else part */
            so->so_faddr = alias_addr;
         else