Skip to content

Commit

Permalink
wxx: Fix broken TCP networking (regression)
Browse files Browse the repository at this point in the history
It is broken since commit c619644.

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>
  • Loading branch information
stweil committed Apr 15, 2016
1 parent c7b45f1 commit 3424c8a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 0 additions & 5 deletions slirp/slirp.h
Expand Up @@ -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
1 change: 1 addition & 0 deletions slirp/tcp_input.c
Expand Up @@ -659,6 +659,7 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso, unsigned short af)
}

if ((tcp_fconnect(so, so->so_ffamily) == -1) &&
(errno != EAGAIN) &&
(errno != EINPROGRESS) && (errno != EWOULDBLOCK)
) {
uint8_t code;
Expand Down

0 comments on commit 3424c8a

Please sign in to comment.