[Qemu-devel] [PATCH for 2.6] wxx: Fix broken TCP networking (regression)

[Stefan Weil <sw@weilnetz.de>]

It is broken since commit c619644067f98098dcdbc951e2dda79e97560afa.

Reported-by: Michael Fritscher <michael@fritscher.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

Networking with QEMU for Windows is currently not usable,
see bug report https://bugs.launchpad.net/qemu/+bug/1569988.

With this patch, it seems to work again at least partially.
Michael Fritscher reported that it is still slow, so
more fixes might be needed.

Would it be better to add conditional compilation to
slirp/tcp_input.c again (then the changes would only
be for Windows, so no new risk for QEMU 2.6)?

Peter, I'd appreciate to get Windows networking fixed
for 2.6, so feel free to modify and apply this patch as
needed if time is too short for reviews and my pull request.

Regards,
Stefan

 slirp/slirp.h     | 5 -----
 slirp/tcp_input.c | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/slirp/slirp.h b/slirp/slirp.h
index c99ebb9..203deec 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 5433e7f..e2b5d4e 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;
-- 
2.1.4