reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made accept thread safe(r).

Browse Source
This commit is contained in:
Eric Pouech 2005-10-24 21:41:34 +00:00 committed by Alexandre Julliard
parent f610f31c10
commit 904b6ea8e3
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/winsock/socket.c
View File

@ -1378,34 +1378,39 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr,
int *addrlen32)
{
SOCKET as;
BOOL is_blocking;
TRACE("socket %04x\n", s );
if (_is_blocking(s))
{
int fd = get_sock_fd( s, GENERIC_READ, NULL );
if (fd == -1) return INVALID_SOCKET;
/* block here */
do_block(fd, POLLIN, -1);
_sync_sock_state(s); /* let wineserver notice connection */
release_sock_fd( s, fd );
/* retrieve any error codes from it */
SetLastError(_get_sock_error(s, FD_ACCEPT_BIT));
/* FIXME: care about the error? */
}
SERVER_START_REQ( accept_socket )
{
req->lhandle = SOCKET2HANDLE(s);
req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE;
req->inherit = TRUE;
set_error( wine_server_call( req ) );
as = HANDLE2SOCKET( reply->handle );
}
SERVER_END_REQ;
if (as)
{
if (addr) WS_getpeername(as, addr, addrlen32);
return as;
}
is_blocking = _is_blocking(s);
do {
if (is_blocking)
{
int fd = get_sock_fd( s, GENERIC_READ, NULL );
if (fd == -1) return INVALID_SOCKET;
/* block here */
do_block(fd, POLLIN, -1);
_sync_sock_state(s); /* let wineserver notice connection */
release_sock_fd( s, fd );
/* retrieve any error codes from it */
SetLastError(_get_sock_error(s, FD_ACCEPT_BIT));
/* FIXME: care about the error? */
}
SERVER_START_REQ( accept_socket )
{
req->lhandle = SOCKET2HANDLE(s);
req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE;
req->inherit = TRUE;
set_error( wine_server_call( req ) );
as = HANDLE2SOCKET( reply->handle );
}
SERVER_END_REQ;
if (as)
{
if (addr) WS_getpeername(as, addr, addrlen32);
return as;
}
} while (is_blocking);
return INVALID_SOCKET;
}