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

Timestamp:

Feb 19, 2009 6:47:45 AM (16 years ago)

Author:

vboxsync

Message:

NAT: non-blocks + socket creation error handling

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (3 diffs)

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

@@ -482 +482 @@
     (void) tcp_mss(pData, sototcpcb(so), 0);
 
+    fd_nonblock(inso->s);
     if ((s = accept(inso->s,(struct sockaddr *)&addr,&addrlen)) < 0)
     {

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

@@ -366 +366 @@
         addr.sin_port = 0;
         addr.sin_addr.s_addr = INADDR_ANY;
+        fd_nonblock(so->s);
         if (bind(so->s, (struct sockaddr *)&addr, sizeof(addr)) < 0)
         {
@@ -395 +396 @@
         }
     }
+    else 
+    {
+        LogRel(("NAT: can't create datagramm socket\n"));
+    }
     return so->s;
 }
@@ -703 +708 @@
 
     so->s = socket(AF_INET,SOCK_DGRAM,0);
+    if (so->s == -1) 
+    {
+        LogRel(("NAT: can't create datagram socket\n "));
+        RTMemFree(so);
+        return NULL;
+    }
     so->so_expire = curtime + SO_EXPIRE;
+    fd_nonblock(so->s);
     SOCKET_LOCK_CREATE(so);
     QSOCKET_LOCK(udb);