diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2002-07-06 15:16:07 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2002-07-06 15:16:07 +0400 |
| commit | 6bb769efa0a993613e311a586362dbd780a41ca5 (patch) | |
| tree | 7a66c185a404be0d432c8836cc3e8a79761a2bf5 /winsup/cygwin/net.cc | |
| parent | 6201dd26a65c2db4cb8f1e902c0dffcde4dfdaef (diff) | |
* fhandler.h (fhandler_socket::is_unconnected): Constify.
(fhandler_socket::is_connect_pending): Ditto.
(fhandler_socket::is_connected): Ditto.
(fhandler_socket::set_connect_state): New method.
(struct select_record): Add member `except_on_write'.
(select_record::select_record): Initialize all bool values to `false'.
* fhandler_socket.cc: Use set_connect_state() method throughout.
(fhandler_socket::connect): Set state always to connected if connection
isn't pending.
* net.cc (cygwin_getsockopt): Revert erroneous previous patch.
* select.cc (set_bits): Check for `except_on_write'. Set fd in
write_fds if set. Set connect state to connected if fd has been
returned by WINSOCK_SELECT.
(peek_socket): Check for `except_on_write'.
(start_thread_socket): Ditto.
(fhandler_socket::select_write): Don't set `write_ready' if connect
is pending. Set `except_on_write' if connect is pending.
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 1445ae683..870bf7865 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -712,8 +712,6 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval, int *optlen) if (optname == SO_ERROR) { int *e = (int *) optval; - if (!*e && fh->is_connect_pending ()) - *e = WSAEINPROGRESS; *e = find_winsock_errno (*e); } |