From 3424c8a9c89a3bc0d29ad38520d2f060e0d0479c Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 14 Apr 2016 19:31:24 +0200 Subject: wxx: Fix broken TCP networking (regression) It is broken since commit c619644067f98098dcdbc951e2dda79e97560afa. Reported-by: Michael Fritscher Tested-by: Michael Fritscher Reviewed-by: Peter Maydell Reviewed-by: Daniel P. Berrange Signed-off-by: Stefan Weil --- slirp/slirp.h | 5 ----- slirp/tcp_input.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/slirp/slirp.h b/slirp/slirp.h index c99ebb9621..203deec480 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -347,9 +347,4 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err); #define max(x,y) ((x) > (y) ? (x) : (y)) #endif -#ifdef _WIN32 -#undef errno -#define errno (WSAGetLastError()) -#endif - #endif diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 5433e7fe9c..e2b5d4ebbb 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -659,6 +659,7 @@ findso: } if ((tcp_fconnect(so, so->so_ffamily) == -1) && + (errno != EAGAIN) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) { uint8_t code; -- cgit v1.2.1