From 47497e62435513c9a32f8c511118a58357db63ed Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 5 Sep 2001 08:16:51 +0000 Subject: [PATCH] * net.cc (cygwin_connect): Add WSAEALREADY and WSAEINVAL handling for non-blocking sockets. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/net.cc | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1d60b7f86..4728bc134 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 5 10:14:00 2001 Corinna Vinschen + + * net.cc (cygwin_connect): Add WSAEALREADY and WSAEINVAL handling + for non-blocking sockets. + Tue Sep 4 22:42:13 2001 Christopher Faylor * exceptions.cc (ctrl_c_handler): Only send SIGINT when we have a diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 7077220bc..1715b16cb 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -868,13 +868,18 @@ cygwin_connect (int fd, if (res) { /* Special handling for connect to return the correct error code - when called to early on a non-blocking socket. */ - if (WSAGetLastError () == WSAEWOULDBLOCK) + when called on a non-blocking socket. */ + if (sock->is_nonblocking ()) { - WSASetLastError (WSAEINPROGRESS); - in_progress = TRUE; + DWORD err = WSAGetLastError (); + if (err == WSAEWOULDBLOCK || err == WSAEALREADY) + { + WSASetLastError (WSAEINPROGRESS); + in_progress = TRUE; + } + else if (err == WSAEINVAL) + WSASetLastError (WSAEISCONN); } - set_winsock_errno (); } if (sock->get_addr_family () == AF_UNIX)