Changeset 16501 in vbox for trunk/src/VBox/Devices/Network/slirp/socket.c

Timestamp:

Feb 4, 2009 10:14:33 AM (16 years ago)

Author:

vboxsync

Message:

NAT: soread aware of reading from closing socket

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (4 diffs)

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

@@ -100 +100 @@
 #ifdef VBOX_WITH_SLIRP_MT
 void
-soread_queue(PNATState pData, struct socket *so, int fCloseIfNothingRead, int *ret)
-{
-    *ret = soread(pData, so, fCloseIfNothingRead);
+soread_queue(PNATState pData, struct socket *so, int *ret)
+{
+    *ret = soread(pData, so);
 }
 #endif
@@ -112 +112 @@
  */
 int
-soread(PNATState pData, struct socket *so, int fCloseIfNothingRead)
+soread(PNATState pData, struct socket *so)
 {
     int n, nn, lss, total;
@@ -202 +202 @@
          * would be dangerous.
          */
-        if (nn == 0 && !fCloseIfNothingRead)
+        int status = 0;
+        unsigned long pended = 0;
+        int ignored;
+        status = WSAIoctl(so->s, FIONREAD, NULL, 0, &pended, sizeof(unsigned long), &ignored, NULL, NULL);
+        if(status < 0) 
+        {
+            Log2(("error in WSAIoctl: %d\n", WSAGetLastError()));
+        }
+        if (nn == 0 && (pended != 0))
         {
             SOCKET_UNLOCK(so);
@@ -278 +286 @@
      * urgent data.
      */
-    soread(pData, so, /*fCloseIfNothingRead=*/false);
+    soread(pData, so);
     tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
     tp->t_force = 1;