diff options
| author | Stefan Weil <sw@weilnetz.de> | 2016-04-14 19:31:24 +0200 |
|---|---|---|
| committer | Stefan Weil <sw@weilnetz.de> | 2016-04-15 19:35:17 +0200 |
| commit | 3424c8a9c89a3bc0d29ad38520d2f060e0d0479c (patch) | |
| tree | ec4725634725e77b899bb73a2578a6133df8ae14 | |
| parent | c7b45f12828c1ba7105dbc029c63d7de68eaa91c (diff) | |
| download | focaccia-qemu-3424c8a9c89a3bc0d29ad38520d2f060e0d0479c.tar.gz focaccia-qemu-3424c8a9c89a3bc0d29ad38520d2f060e0d0479c.zip | |
wxx: Fix broken TCP networking (regression)
It is broken since commit c619644067f98098dcdbc951e2dda79e97560afa. Reported-by: Michael Fritscher <michael@fritscher.net> Tested-by: Michael Fritscher <michael@fritscher.net> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Stefan Weil <sw@weilnetz.de>
| -rw-r--r-- | slirp/slirp.h | 5 | ||||
| -rw-r--r-- | slirp/tcp_input.c | 1 |
2 files changed, 1 insertions, 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; |