Changeset 72276 in vbox for trunk/src

Timestamp:

May 21, 2018 1:14:28 PM (7 years ago)

Author:

vboxsync

Message:

NAT: udp_attach - prettify a bit.

File:

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

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

@@ -534 +534 @@
     so->so_type = IPPROTO_UDP;
 
-    if ((so->s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+    so->s = socket(AF_INET, SOCK_DGRAM, 0);
+    if (so->s == -1)
         goto error;
+    fd_nonblock(so->s);
+
     so->so_sottl = 0;
     so->so_sotos = 0;
     so->so_sodf = -1;
 
-    fd_nonblock(so->s);
-
     status = sobind(pData, so);
     if (status != 0)
@@ -548 +549 @@
     /* success, insert in queue */
     so->so_expire = curtime + SO_EXPIRE;
+
     /* enable broadcast for later use */
     setsockopt(so->s, SOL_SOCKET, SO_BROADCAST, (const char *)&opt, sizeof(opt));
+
     status = getsockname(so->s, &sa_addr, &socklen);
 #if 0 /** @todo  Something is explitived here! Temporarily disabled this annoying assertion.  Re-enable when fixed.  */
@@ -564 +567 @@
     return so->s;
 error:
-    Log2(("NAT: can't create datagramm socket\n"));
+    Log2(("NAT: can't create datagram socket\n"));
     return -1;
 }