Changeset 25753 in vbox

Timestamp:

Jan 12, 2010 11:06:46 AM (15 years ago)

Author:

vboxsync

Message:

NAT: use CHECK_FD_SET for FD_CLOSE

File:

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

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

@@ -63 +63 @@
 
   /* specific for Unix API */
-# define DO_UNIX_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset) 
+# define DO_UNIX_CHECK_FD_SET(so, events, fdset) DO_CHECK_FD_SET((so), (events), fdset) 
   /* specific for Windows Winsock API */
-# define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 
+# define DO_WIN_CHECK_FD_SET(so, events, fdset) 0 
 
 # ifndef RT_OS_LINUX
@@ -76 +76 @@
 #  define xfds_poll      (POLLPRI)
 # endif
+# define closefds_poll   (POLLHUP)
 # define rderr_poll      (POLLERR)
 # define rdhup_poll      (POLLHUP)
@@ -130 +131 @@
 # define xfds_win         FD_OOB
 # define xfds_win_bit     FD_OOB_BIT
+# define closefds_win     FD_CLOSE
+# define closefds_win_bit FD_CLOSE_BIT
 
 # define DO_CHECK_FD_SET(so, events, fdset)  \
     (((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)
-# define DO_UNIX_CHECK_FD_SET(so, events, fdset ) 1 /*specific for Unix API */
+# define DO_WIN_CHECK_FD_SET(so, events, fdset) DO_CHECK_FD_SET((so), (events), fdset)
+# define DO_UNIX_CHECK_FD_SET(so, events, fdset) 1 /*specific for Unix API */
 
 #endif /* RT_OS_WINDOWS */
@@ -1131 +1134 @@
                 TCP_CONNECT(pData, so);
 #if defined(RT_OS_WINDOWS)
-                if (!(NetworkEvents.lNetworkEvents & FD_CLOSE))
+                if (!CHECK_FD_SET(so, NetworkEvents, closefds))
 #endif
                     CONTINUE(tcp);
@@ -1147 +1150 @@
          * in some cases once FD_CLOSE engaged on socket it could be flashed latter (for some reasons)
          */
-        if (    (NetworkEvents.lNetworkEvents & FD_CLOSE)
+        if (    CHECK_FD_SET(so, NetworkEvents, closefds)
             ||  (so->so_close == 1))
         {