Commit 3424c8a9 authored by Stefan Weil's avatar Stefan Weil
Browse files

wxx: Fix broken TCP networking (regression) 



It is broken since commit c6196440.

Reported-by: default avatarMichael Fritscher <michael@fritscher.net>
Tested-by: default avatarMichael Fritscher <michael@fritscher.net>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
parent c7b45f12

slirp/slirp.h

+0 −5
Original line number Diff line number Diff line
@@ -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

slirp/tcp_input.c

+1 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ findso: 
	  }



	  if ((tcp_fconnect(so, so->so_ffamily) == -1) &&

              (errno != EAGAIN) &&

              (errno != EINPROGRESS) && (errno != EWOULDBLOCK)

          ) {

	    uint8_t code;