[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] slirp: Fix non blocking connect for w32
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PULL 2/5] slirp: Fix non blocking connect for w32 |
Date: |
Thu, 24 Sep 2015 22:16:05 +0200 |
Signed-off-by: Stefan Weil <address@hidden>
---
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)));
--
2.1.4
- [Qemu-devel] [PULL 0/5] Patch queue for w32/w64, Stefan Weil, 2015/09/24
- [Qemu-devel] [PULL 1/5] nsis: Add QEMU version information to Windows registry, Stefan Weil, 2015/09/24
- [Qemu-devel] [PULL 2/5] slirp: Fix non blocking connect for w32,
Stefan Weil <=
- [Qemu-devel] [PULL 4/5] gtk: avoid redefining _WIN32_WINNT macro, Stefan Weil, 2015/09/24
- [Qemu-devel] [PULL 3/5] qemu-thread: add a fast path to the Win32 QemuEvent, Stefan Weil, 2015/09/24
- [Qemu-devel] [PULL 5/5] oslib-win32: only provide localtime_r/gmtime_r if missing, Stefan Weil, 2015/09/24
- Re: [Qemu-devel] [PULL 0/5] Patch queue for w32/w64, Peter Maydell, 2015/09/24