From: Stefan Weil <sw@weilnetz.de>
Date: Thu, 30 Jul 2015 21:08:12 +0000 (+0200)
Subject: slirp: Fix non blocking connect for w32
X-Git-Tag: v2.4.1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e00bf9ee701b65a0fa7c6b011b0050845c798aa8;p=thirdparty%2Fqemu.git

slirp: Fix non blocking connect for w32

Signed-off-by: Stefan Weil <sw@weilnetz.de>
(cherry picked from commit a246a01631f90230374c2b8ffce608232e2aa654)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index f946db8dc07..00a77b4a5fa 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)));