david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxx: Fix broken TCP networking (regression)

Browse Source 
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>
This commit is contained in:
Stefan Weil 2016-04-14 19:31:24 +02:00
parent c7b45f1282
commit 3424c8a9c8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slirp/slirp.h
View File

@ -347,9 +347,4 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
#define max(x,y) ((x) > (y) ? (x) : (y)) #define max(x,y) ((x) > (y) ? (x) : (y))
#endif #endif
#ifdef _WIN32
#undef errno
#define errno (WSAGetLastError())
#endif
#endif #endif

1
slirp/tcp_input.c
View File

@ -659,6 +659,7 @@ findso:
} }
if ((tcp_fconnect(so, so->so_ffamily) == -1) && if ((tcp_fconnect(so, so->so_ffamily) == -1) &&
(errno != EAGAIN) &&
(errno != EINPROGRESS) && (errno != EWOULDBLOCK) (errno != EINPROGRESS) && (errno != EWOULDBLOCK)
) { ) {
uint8_t code; uint8_t code;