[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/64] slirp: remove PROBE_CONN dead-code
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 16/64] slirp: remove PROBE_CONN dead-code |
Date: |
Wed, 19 Dec 2018 00:03:54 +0100 |
From: Marc-André Lureau <address@hidden>
Nobody cares for over 14y. Somebody can revert or rewrite if
interested by that.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/slirp.c | 41 -----------------------------------------
slirp/slirp_config.h | 4 ----
2 files changed, 45 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 7213915bf3..4fd957be89 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
}
/*
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index c59f655207..721667e3ef 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -2,10 +2,6 @@
* User definable configuration options
*/
-/* Define if you want the connection to be probed */
-/* XXX Not working yet, so ignore this for now */
-#undef PROBE_CONN
-
/* Define to 1 if you want KEEPALIVE timers */
#define DO_KEEPALIVE 0
--
2.19.2
- [Qemu-devel] [PULL 19/64] slirp: remove HAVE_SYS_SIGNAL_H, (continued)
- [Qemu-devel] [PULL 19/64] slirp: remove HAVE_SYS_SIGNAL_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 14/64] slirp: remove unused M_TRAILINGSPACE, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 24/64] slirp: remove unused HAVE_SYS_WAIT_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 13/64] slirp: move socket pair creation in helper function, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 20/64] slirp: remove unused HAVE_SYS_BITYPES_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 06/64] slirp: rename /extra/chardev, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 18/64] slirp: remove the disabled readv()/writev() code path, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 17/64] slirp: remove FULL_BOLT, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 29/64] slirp: remove unused HAVE_INET_ATON, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 23/64] slirp: remove unused HAVE_ARPA_INET_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 16/64] slirp: remove PROBE_CONN dead-code,
Samuel Thibault <=
- [Qemu-devel] [PULL 10/64] slirp: replace the poor-man string split with g_strsplit(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 08/64] slirp: remove Monitor dependency, return a string for info, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 21/64] slirp: remove NO_UNIX_SOCKETS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 36/64] slirp: add a callback to log guest errors, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 30/64] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 26/64] slirp: remove HAVE_SYS_IOCTL_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 33/64] slirp: remove unused global slirp_instance, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 42/64] net: do not depend on slirp internals, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, Samuel Thibault, 2018/12/18