[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] slirp: Remove dead code for "PROBE_CONN"
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 4/9] slirp: Remove dead code for "PROBE_CONN" |
Date: |
Wed, 10 Jun 2015 16:59:46 +0800 |
It has always been compiled out. Remove it before we refactor the rest
part of slirp poll.
Signed-off-by: Fam Zheng <address@hidden>
---
slirp/slirp.c | 40 ----------------------------------------
slirp/slirp_config.h | 4 ----
2 files changed, 44 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 35f819a..25cdca6 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -578,46 +578,6 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
* a window probe to get things going again
*/
}
-
- /*
- * 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);
- } /* SS_ISFCONNECTING */
-#endif
}
/*
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index 896d802..70563ae 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.4.2
- [Qemu-devel] [PATCH 0/9] slirp: iohandler: Rebase onto aio, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 1/9] aio: Introduce aio_set_fd_handler_pri, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 2/9] iohandler: Use aio code, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 3/9] main-loop: Move include of "qemu/sockets.h" to libslirp.h, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 4/9] slirp: Remove dead code for "PROBE_CONN",
Fam Zheng <=
- [Qemu-devel] [PATCH 6/9] slirp: Move icmp socket to iohandler, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 5/9] slirp: Add "poll_events" to struct socket, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 8/9] slirp: Move tcb socket to iohandler, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 7/9] slirp: Move udb socket to iohandler, Fam Zheng, 2015/06/10
- [Qemu-devel] [PATCH 9/9] slirp: Remove unused pollfds from the parameter list, Fam Zheng, 2015/06/10
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/9] slirp: iohandler: Rebase onto aio, Stefan Hajnoczi, 2015/06/16