Skip to content

W
wine-winehq
Commit c422dae1 authored by Martin Wilck's avatar Martin Wilck Committed by Alexandre Julliard
Browse files
Options

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.
parent b3be773a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
dlls/winsock/socket.c
View file @ c422dae1
......@@ -2835,7 +2835,7 @@ int WINAPI WS_shutdown(SOCKET s, int how)
case 2: /* drop all */
clear_flags |= FD_READ|FD_WRITE;
default:
clear_flags |= FD_WINE_CONNECTED|FD_WINE_LISTENING;
clear_flags |= FD_WINE_LISTENING;
}
if ( flags & FD_FLAG_OVERLAPPED ) {
......
server/sock.c
View file @ c422dae1
......@@ -398,7 +398,7 @@ static void sock_poll_event( struct object *obj, int event )
{
sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd );
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->hmask |= FD_CLOSE;
if (debug_level)
......@@ -494,8 +494,11 @@ static int sock_get_info( struct object *obj, struct get_file_info_reply *reply,
}
*flags = 0;
if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED;
if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN;
if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN;
if ( sock->type != SOCK_STREAM || sock->state & FD_WINE_CONNECTED )
{
if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN;
if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN;
}
return FD_TYPE_SOCKET;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment