diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-11-14 16:36:12 +0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-01-14 00:40:54 +0100 |
| commit | 8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a (patch) | |
| tree | 5e80d9eb634c40b4a2facfe46f69a39dc3e60125 /slirp/slirp.c | |
| parent | d846b927a613afbee7bd30756d1c8384085cfc64 (diff) | |
| download | qemu-8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a.zip qemu-8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a.tar.gz qemu-8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a.tar.bz2 | |
slirp: remove PROBE_CONN dead-code
Nobody cares for over 14y. Somebody can revert or rewrite if
interested by that.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp/slirp.c')
| -rw-r--r-- | slirp/slirp.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c index bab49e8..76e94eb 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -699,47 +699,6 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) } } } - - /* - * Probe a still-connecting, non-blocking socket - * to check if it's still alive - */ -#ifdef PROBE_CONN - if (so->so_state & SS_ISFCONNECTING) { - ret = qemu_recv(so->s, &ret, 0, 0); - - if (ret < 0) { - /* XXX */ - if (errno == EAGAIN || errno == EWOULDBLOCK || - errno == EINPROGRESS || errno == ENOTCONN) { - continue; /* Still connecting, continue */ - } - - /* else failed */ - so->so_state &= SS_PERSISTENT_MASK; - so->so_state |= SS_NOFDREF; - - /* tcp_input will take care of it */ - } else { - ret = send(so->s, &ret, 0, 0); - if (ret < 0) { - /* XXX */ - if (errno == EAGAIN || errno == EWOULDBLOCK || - errno == EINPROGRESS || errno == ENOTCONN) { - continue; - } - /* else failed */ - so->so_state &= SS_PERSISTENT_MASK; - so->so_state |= SS_NOFDREF; - } else { - so->so_state &= ~SS_ISFCONNECTING; - } - - } - tcp_input((struct mbuf *)NULL, sizeof(struct ip), so, - so->so_ffamily); - } /* SS_ISFCONNECTING */ -#endif } /* |