Changeset 1587 for trunk/src/wsock32/async.cpp

Timestamp:

Nov 4, 1999, 1:58:03 AM (26 years ago)

Author:

phaller

Message:

Socket experiments

File:

• trunk/src/wsock32/async.cpp (modified) (6 diffs)

trunk/src/wsock32/async.cpp

@@ -1 @@
-/* $Id: async.cpp,v 1.10 1999-10-27 08:38:03 phaller Exp $ */
+/* $Id: async.cpp,v 1.11 1999-11-04 00:58:03 phaller Exp $ */
 
 /*
@@ -32 +32 @@
 #include <sys/ioctl.h>
 #include <sys/select.h>
+#include <sys/time.h>
 
 #include <wsock32const.h>
@@ -60 +61 @@
                        fd_set *,
                        fd_set *,
-                       struct timeval);
+                       struct timeval*);
 
 // wsock32.cpp: error code translation
@@ -1002 +1003 @@
 
   // finally do the select!
+#ifndef BSDSELECT
   irc = os2_select(&sockWin,
                    (ulEvent & FD_READ)  ? 1 : 0,
@@ -1007 +1009 @@
                    (ulEvent & FD_OOB)   ? 1 : 0,
                    10000);              // @@@PH timeout
+#else
+
+  // BSD implementation
+  fd_set fds_read,     *pfds_read      = &fds_read;
+  fd_set fds_write,    *pfds_write     = &fds_write;
+  fd_set fds_exception,*pfds_exception = &fds_exception;
+  struct timeval tv;
+
+  FD_ZERO(&fds_read);      FD_SET(sockWin,&fds_read);
+  FD_ZERO(&fds_write);     FD_SET(sockWin,&fds_write);
+  FD_ZERO(&fds_exception); FD_SET(sockWin,&fds_exception);
+
+  tv.tv_sec  = 10;
+  tv.tv_usec = 0;
+
+  if (!(ulEvent & FD_READ))  pfds_read      = NULL;
+  if (!(ulEvent & FD_WRITE)) pfds_write     = NULL;
+  if (!(ulEvent & FD_OOB))   pfds_exception = NULL;
+
+  irc = bsd_select(sockWin+1,
+                   pfds_read,
+                   pfds_write,
+                   pfds_exception,
+                   &tv);
+#endif
+
   if (irc < 0)                                          /* an error occurred */
   {
@@ -1029 +1057 @@
       irc = ioctl(sockWin, FIONREAD, (char *)&iUnknown, sizeof(iUnknown));
       if ( (irc == 0) && (iUnknown > 0))
-         usResult |= FD_READ;
+         usResult |= FD_READ | FD_CONNECT;
     }