JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.h (class fhandler_socket): Add timeout parameter to wait()

Browse Source 
method.
	* fhandler_socket.cc (fhandler_socket::connect): Use event driven
	technique (prepare/wait/release) to implement interuptible connect.
	(fhandler_socket::wait): Add timeout parameter.  Allow FD_CONNECT
	handling.
	* net.cc (cygwin_connect): Remove braindead workaround for allowing
	blocking connect.  That's entirely in fhandler_socket::connect now.
This commit is contained in:
Corinna Vinschen
2005-10-22 15:11:49 +00:00
parent ecebee4838
commit 152a9caf58
4 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
winsup/cygwin/fhandler_socket.cc
View File

@ -681,7 +681,20 @@ fhandler_socket::connect (const struct sockaddr *name, int namelen)
return -1;
}
res = ::connect (get_socket (), (struct sockaddr *) &sin, namelen);
if (is_nonblocking ())
res = ::connect (get_socket (), (struct sockaddr *) &sin, namelen);
else
{
HANDLE evt;
if (prepare (evt, FD_CONNECT))
{
res = ::connect (get_socket (), (struct sockaddr *) &sin, namelen);
if (res == SOCKET_ERROR
&& WSAGetLastError () == WSAEWOULDBLOCK)
res = wait (evt, 0, INFINITE);
release (evt);
}
}
if (!res)
err = 0;
@ -877,14 +890,14 @@ fhandler_socket::prepare (HANDLE &event, long event_mask)
}
int
fhandler_socket::wait (HANDLE event, int flags)
fhandler_socket::wait (HANDLE event, int flags, DWORD timeout)
{
int ret = SOCKET_ERROR;
int wsa_err = 0;
WSAEVENT ev[2] = { event, signal_arrived };
WSANETWORKEVENTS evts;
switch (WSAWaitForMultipleEvents (2, ev, FALSE, 10, FALSE))
switch (WSAWaitForMultipleEvents (2, ev, FALSE, timeout, FALSE))
{
case WSA_WAIT_TIMEOUT:
ret = 0;
@ -910,7 +923,14 @@ fhandler_socket::wait (HANDLE event, int flags)
break;
}
}
if (evts.lNetworkEvents & FD_READ)
if (evts.lNetworkEvents & FD_CONNECT)
{
if (evts.iErrorCode[FD_CONNECT_BIT])
wsa_err = evts.iErrorCode[FD_CONNECT_BIT];
else
ret = 0;
}
else if (evts.lNetworkEvents & FD_READ)
{
if (evts.iErrorCode[FD_READ_BIT])
wsa_err = evts.iErrorCode[FD_READ_BIT];