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

Timestamp:

Dec 10, 2008 12:54:19 PM (16 years ago)

Author:

vboxsync

Message:

slirp: another fix for windows hosts

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• socket.c (modified) (3 diffs)
• socket.h (modified) (1 diff)

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

@@ -754 +754 @@
                 }
 
-                ret = soread(pData, so);
+                ret = soread(pData, so, /*fCloseIfNothingRead=*/false);
                 /* Output it if we read something */
                 if (ret > 0)
@@ -771 +771 @@
                 for (;;)
                 {
-                    ret = soread(pData, so);
+                    ret = soread(pData, so, /*fCloseIfNothingRead=*/true);
                     if (ret > 0)
                         tcp_output(pData, sototcpcb(so));

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

@@ -93 +93 @@
  */
 int
-soread(PNATState pData, struct socket *so)
+soread(PNATState pData, struct socket *so, int fCloseIfNothingRead)
 {
     int n, nn, lss, total;
@@ -180 +180 @@
          * would be dangerous.
          */
-        if (nn == 0)
+        if (nn == 0 && !fCloseIfNothingRead)
             return 0;
 #endif
@@ -248 +248 @@
      * urgent data.
      */
-    soread(pData, so);
+    soread(pData, so, /*fCloseIfNothingRead=*/false);
     tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
     tp->t_force = 1;

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

@@ -100 +100 @@
 struct socket * socreate _P((void));
 void sofree _P((PNATState, struct socket *));
-int soread _P((PNATState, struct socket *));
+int soread _P((PNATState, struct socket *, int));
 void sorecvoob _P((PNATState, struct socket *));
 int sosendoob _P((struct socket *));