From b3f21d56ad3f36562d396685de8ff4981af6b805 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 30 Jul 2015 23:08:12 +0200 Subject: [PATCH] slirp: Fix non blocking connect for w32 Signed-off-by: Stefan Weil --- 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 f946db8dc0..b30dacbb9a 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() != WSAEINPROGRESS && 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))); -- 2.11.4.GIT