ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not clear FD_WINE_CONNECTED on shutdown(). FD_WINE_CONNECTED 

(currently unused) can thus be used to determine if a stream socket
was ever connected.
This commit is contained in:
Martin Wilck 2003-01-28 00:24:04 +00:00 committed by Alexandre Julliard
parent b3be773afe
commit c422dae189
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/winsock/socket.c
View File

@ -2835,7 +2835,7 @@ int WINAPI WS_shutdown(SOCKET s, int how)
case 2: /* drop all */ case 2: /* drop all */
clear_flags |= FD_READ|FD_WRITE; clear_flags |= FD_READ|FD_WRITE;
default: default:
clear_flags |= FD_WINE_CONNECTED|FD_WINE_LISTENING; clear_flags |= FD_WINE_LISTENING;
} }
if ( flags & FD_FLAG_OVERLAPPED ) { if ( flags & FD_FLAG_OVERLAPPED ) {

5
server/sock.c
View File

@ -398,7 +398,7 @@ static void sock_poll_event( struct object *obj, int event )
{ {
sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd ); sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd );
if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) ))
sock->state &= ~(FD_WINE_CONNECTED|FD_WRITE); sock->state &= ~FD_WRITE;
sock->pmask |= FD_CLOSE; sock->pmask |= FD_CLOSE;
sock->hmask |= FD_CLOSE; sock->hmask |= FD_CLOSE;
if (debug_level) if (debug_level)
@ -494,8 +494,11 @@ static int sock_get_info( struct object *obj, struct get_file_info_reply *reply,
} }
*flags = 0; *flags = 0;
if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED; if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED;
if ( sock->type != SOCK_STREAM || sock->state & FD_WINE_CONNECTED )
{
if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN; if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN;
if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN; if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN;
}
return FD_TYPE_SOCKET; return FD_TYPE_SOCKET;
} }