system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 00:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapted Winsock to Linux 2.4 TCP socket poll() behaviour

Browse source 
(thanks to Berend Ozceri for finding the problem).
This commit is contained in:
Ove Kaaven 2000-09-06 19:40:23 +00:00 committed by Alexandre Julliard
parent a1ce916171
commit 7a0f96c908
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/sock.c
View file

@ -83,6 +83,14 @@ static void sock_reselect( struct sock *sock )
if (debug_level)
fprintf(stderr,"sock_reselect(%d): new mask %x\n", sock->obj.fd, ev);
if (sock->obj.select == -1) {
/* previously unconnected socket, is this reselect supposed to connect it? */
if (!sock->state) return;
/* ok, it is, attach it to the wineserver's main poll loop */
add_select_user( &sock->obj );
}
/* update condition mask */
set_select_events( &sock->obj, ev );
/* check whether condition is satisfied already */
@ -288,8 +296,9 @@ static struct object *create_socket( int family, int type, int protocol )
return NULL;
}
fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */
if (!(sock = alloc_object( &sock_ops, sockfd ))) return NULL;
sock->state = (type!=SOCK_STREAM) ? WS_FD_READ|WS_FD_WRITE : 0;
if (!(sock = alloc_object( &sock_ops, -1 ))) return NULL;
sock->obj.fd = sockfd;
sock->state = (type != SOCK_STREAM) ? (WS_FD_READ|WS_FD_WRITE) : 0;
sock->mask = 0;
sock->hmask = 0;
sock->pmask = 0;
@ -323,12 +332,13 @@ static struct object *accept_socket( int handle )
release_object( sock );
return NULL;
}
if (!(acceptsock = alloc_object( &sock_ops, acceptfd )))
if (!(acceptsock = alloc_object( &sock_ops, -1 )))
{
release_object( sock );
return NULL;
}
acceptsock->obj.fd = acceptfd;
acceptsock->state = WS_FD_CONNECTED|WS_FD_READ|WS_FD_WRITE;
acceptsock->mask = sock->mask;
acceptsock->hmask = 0;