Commit f1cd5d41 authored Oct 01, 2019 by Marc-André Lureau Committed by Paolo Bonzini Oct 04, 2019

util: WSAEWOULDBLOCK on connect should map to EINPROGRESS

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>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 56f99750

util/oslib-win32.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -585,8 +585,12 @@ int qemu_connect_wrap(int sockfd, const struct sockaddr *addr,
		int ret;
		ret = connect(sockfd, addr, addrlen);
		if (ret < 0) {
		if (WSAGetLastError() == WSAEWOULDBLOCK) {
		errno = EINPROGRESS;
		} else {
		errno = socket_error();
		}
		}
		return ret;
		}