diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-11-10 22:09:17 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-11-10 22:09:17 +0900 |
| commit | be6540fef422bf5d63edf0a53d2e94c41ff173e6 (patch) | |
| tree | cc3b8a89971601eb039fe97f6b7f99203b5babb5 /slirp | |
| parent | 7aafbd24cca1d5b83677ac467f82fbc370577533 (diff) | |
| parent | 32d24131b2d1d98384b96c80f6cd3482550dc68a (diff) | |
| download | qemu-be6540fef422bf5d63edf0a53d2e94c41ff173e6.tar.gz qemu-be6540fef422bf5d63edf0a53d2e94c41ff173e6.tar.bz2 qemu-be6540fef422bf5d63edf0a53d2e94c41ff173e6.zip | |
Merge tag 'v2.4.1' into tizen_3.0_develop
v2.4.1
Change-Id: I8d62d785e1d693dc2ce29ddc3bdaf4e5ad30da61
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/tcp_input.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index f946db8dc0..00a77b4a5f 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -584,7 +584,13 @@ findso: goto cont_input; } - if((tcp_fconnect(so) == -1) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) { + if ((tcp_fconnect(so) == -1) && +#if defined(_WIN32) + socket_error() != WSAEWOULDBLOCK +#else + (errno != EINPROGRESS) && (errno != EWOULDBLOCK) +#endif + ) { u_char code=ICMP_UNREACH_NET; DEBUG_MISC((dfd, " tcp fconnect errno = %d-%s\n", errno,strerror(errno))); |