Changeset 15682 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 19, 2008 11:46:38 AM (16 years ago)

Author:

vboxsync

Message:

slirp: tcp/ip port-forwarding fix

File:

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

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

@@ -30 +30 @@
 
 # define DO_CHECK_FD_SET(so, events, fdset) (FD_ISSET((so)->s, (fdset)))
+
+# define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 /* specific for Windows Winsock API */
 
 # define ICMP_ENGAGE_EVENT(so, fdset)               \
@@ -70 +72 @@
     }
 
+# define acceptds_win FD_ACCEPT
+# define acceptds_win_bit FD_ACCEPT_BIT
+
 # define readfds_win FD_READ
 # define readfds_win_bit FD_READ_BIT
@@ -82 +87 @@
     (((events).lNetworkEvents & fdset ## _win) && ((events).iErrorCode[fdset ## _win_bit] == 0))
 
+# define DO_WIN_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), (fdset))
 
 #endif /* defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) */
@@ -102 +108 @@
 #define CHECK_FD_SET(so, events, set)           \
     (DO_CHECK_FD_SET((so), (events), set))
+
+#define WIN_CHECK_FD_SET(so, events, set)           \
+    (DO_WIN_CHECK_FD_SET((so), (events), set))
 
 /*
@@ -748 +757 @@
              * Check sockets for reading
              */
-            else if (CHECK_FD_SET(so, NetworkEvents, readfds))
+            else if (CHECK_FD_SET(so, NetworkEvents, readfds)
+             || WIN_CHECK_FD_SET(so, NetworkEvents, acceptds))
             {
                 /*