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 | 32e771c31225ba6183cf7efb70b8d876dd7589b1 (patch) | |
| tree | 5b3568e8d36bf12e8982c21151ad52c47adf86a3 | |
| parent | c9bea8b601ca124ae08787e40c567183c190428b (diff) | |
| download | slirp-32e771c31225ba6183cf7efb70b8d876dd7589b1.zip slirp-32e771c31225ba6183cf7efb70b8d876dd7589b1.tar.gz slirp-32e771c31225ba6183cf7efb70b8d876dd7589b1.tar.bz2 | |
wxx: Fix broken TCP networking (regression)v2.6.0-rc3
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.h | 5 | ||||
| -rw-r--r-- | tcp_input.c | 2 |
2 files changed, 1 insertions, 6 deletions
@@ -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/tcp_input.c b/tcp_input.c index 7ca8b2b..0d7b48c 100644 --- a/tcp_input.c +++ b/tcp_input.c @@ -656,7 +656,7 @@ findso: goto cont_input; } - if ((tcp_fconnect(so, so->so_ffamily) == -1) && + if ((tcp_fconnect(so, so->so_ffamily) == -1) && (errno != EAGAIN) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) { uint8_t code; DEBUG_MISC( |