Re: [PATCH 1/3] util: WSAEWOULDBLOCK on connect should map to EINPROGRESS

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 10/1/19 3:26 PM, Marc-André Lureau wrote:
> In general, WSAEWOULDBLOCK can be mapped to EAGAIN as done by
> socket_error() (or EWOULDBLOCK). But for connect() with non-blocking
> sockets, it actually means the operation is in progress:
> 
> https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect
> "The socket is marked as nonblocking and the connection cannot be completed immediately."
> 
> (this is also the behaviour implemented by GLib GSocket)
> 
> This fixes socket_can_bind_connect() test on win32.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   util/oslib-win32.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index c62cd4328c..886e400d6a 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -585,7 +585,11 @@ int qemu_connect_wrap(int sockfd, const struct sockaddr *addr,
>       int ret;
>       ret = connect(sockfd, addr, addrlen);
>       if (ret < 0) {
> -        errno = socket_error();
> +        if (WSAGetLastError() == WSAEWOULDBLOCK) {
> +            errno = EINPROGRESS;
> +        } else {
> +            errno = socket_error();
> +        }
>       }
>       return ret;
>   }
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>