Changeset 61805 in vbox

Timestamp:

Jun 21, 2016 4:37:09 PM (9 years ago)

Author:

vboxsync

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

108206

Message:

NAT: udp_listen - don't use a condition that is always false;
instead restore the original condition but ifdef the if/else out.
XXX: The comment that justified the original change looks bogus,
this needs to be revisited properly.

File:

• trunk/src/VBox/Devices/Network/slirp/udp.c (modified) (1 diff)

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

@@ -685 +685 @@
     /* XXX: wtf are we setting so_faddr/so_fport here? */
     so->so_fport = addr.sin_port;
+#if 0
     /* 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) */
     /* @todo: vvl - alias_addr should be set (if required)
      * later by liabalias module.
      */
-    if (1 == 0)                 /* always use the else part */
+    if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr)
         so->so_faddr = alias_addr;
     else
+#endif
         so->so_faddr = addr.sin_addr;