From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoxav-00059E-QQ for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:54:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zoxaq-0006S6-V1 for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:54:37 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:33997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoxaq-0006RU-MS for qemu-devel@nongnu.org; Wed, 21 Oct 2015 13:54:32 -0400 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Oct 2015 11:54:32 -0600 From: Michael Roth Date: Wed, 21 Oct 2015 12:51:53 -0500 Message-Id: <1445449930-23525-24-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1445449930-23525-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1445449930-23525-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 23/40] slirp: Fix non blocking connect for w32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , qemu-stable@nongnu.org, Michael Roth From: Stefan Weil Signed-off-by: Stefan Weil (cherry picked from commit a246a01631f90230374c2b8ffce608232e2aa654) Signed-off-by: Michael Roth --- slirp/tcp_input.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index f946db8..00a77b4 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -584,7 +584,13 @@ findso: goto cont_input; } - if((tcp_fconnect(so) == -1) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) { + if ((tcp_fconnect(so) == -1) && +#if defined(_WIN32) + socket_error() != WSAEWOULDBLOCK +#else + (errno != EINPROGRESS) && (errno != EWOULDBLOCK) +#endif + ) { u_char code=ICMP_UNREACH_NET; DEBUG_MISC((dfd, " tcp fconnect errno = %d-%s\n", errno,strerror(errno))); -- 1.9.1