poll: fix polling unconnected server sockets on WIN32

2008-09-11  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>

	* lib/poll.c (poll): Fix polling unconnected server sockets on WIN32.

diff --git a/ChangeLog b/ChangeLog
index 4ffbb6fff193cda1ac0213ffc76337eb415741b9..3375a19d4cd8ae9a8f5753f1f36cbecf1767875b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-11  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>
+
+       * lib/poll.c (poll): Fix polling unconnected server sockets on WIN32.
+
 2008-09-11  Jim Meyering  <meyering@redhat.com>
 
        * users.txt: Add gtk-vnc.

diff --git a/lib/poll.c b/lib/poll.c
index 4a62dc1df1a8f06854b0e4635bc541600d132ea2..e0714f09a9c1767a05e25e1e3d8a73dc12c78fb0 100644 (file)
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -180,6 +180,12 @@ poll (pfd, nfd, timeout)
 #else
            char data[64];
            r = recv (pfd[i].fd, data, sizeof (data), MSG_PEEK);
+            
+# ifdef WIN32
+           if (r < 0 && GetLastError() == 10057) /* server socket */
+              socket_errno = ENOTCONN;
+           else
+# endif
            socket_errno = (r < 0) ? errno : 0;
 #endif
            if (r == 0)