[ros-diffs] [cgutman] 42187: ws2_32_new compatibility fixes - Use Sleep() to wait when we have no interfaces because select() will fail and return without waiting - Use WSAGetLastError() instead of errno

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sat Jul 25 04:01:13 2009
New Revision: 42187

URL: http://svn.reactos.org/svn/reactos?rev=42187&view=rev
Log:
ws2_32_new compatibility fixes
 - Use Sleep() to wait when we have no interfaces because select() will fail and return without waiting
 - Use WSAGetLastError() instead of errno

Modified:
    trunk/reactos/base/services/dhcp/dispatch.c

Modified: trunk/reactos/base/services/dhcp/dispatch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatch.c?rev=42187&r1=42186&r2=42187&view=diff
==============================================================================
--- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sat Jul 25 04:01:13 2009
@@ -63,7 +63,7 @@
 void
 dispatch(void)
 {
-    int count, i, to_msec, nfds;
+    int count, i, to_msec, nfds, err;
     struct protocol *l;
     fd_set fds;
     time_t howlong, cur_time;
@@ -122,10 +122,9 @@
         }
 
         if (i == 0) {
-            /* No interfaces for now, set the select timeout reasonably so
-             * we can recover from that condition later. */
-            timeval.tv_sec = 5;
-            timeval.tv_usec = 0;
+            /* Wait for 5 seconds before looking for more interfaces */
+            Sleep(5000);
+            continue;
         } else {
             /* Wait for a packet or a timeout... XXX */
             timeval.tv_sec = to_msec / 1000;
@@ -156,12 +155,9 @@
 
         /* Not likely to be transitory... */
         if (count == SOCKET_ERROR) {
-            if (errno == EAGAIN || errno == EINTR) {
-                continue;
-            } else {
-                error("poll: %s", strerror(errno));
-                break;
-            }
+            err = WSAGetLastError();
+            error("poll: %d", err);
+            break;
         }
 
         i = 0;