[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE |
Date: |
Wed, 19 Dec 2018 00:04:10 +0100 |
From: Marc-André Lureau <address@hidden>
Use a global variable instead (similar to slirp_debug)
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/slirp.c | 3 +++
slirp/slirp.h | 6 +++---
slirp/slirp_config.h | 12 ------------
slirp/tcp_input.c | 2 +-
slirp/tcp_timer.c | 2 +-
5 files changed, 8 insertions(+), 17 deletions(-)
delete mode 100644 slirp/slirp_config.h
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 4fd957be89..3261a04236 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -35,6 +35,9 @@
#include <net/if.h>
#endif
+/* Define to 1 if you want KEEPALIVE timers */
+bool slirp_do_keepalive;
+
/* host loopback address */
struct in_addr loopback_addr;
/* host loopback network mask */
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 4bbbba046e..05c203c8c7 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -1,8 +1,6 @@
#ifndef SLIRP_H
#define SLIRP_H
-#include "slirp_config.h"
-
#ifdef _WIN32
typedef char *caddr_t;
@@ -219,7 +217,9 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int
pkt_len);
#include <netdb.h>
#endif
-#define SO_OPTIONS DO_KEEPALIVE
+
+extern bool slirp_do_keepalive;
+
#define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
/* dnssearch.c */
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
deleted file mode 100644
index 7147e0de04..0000000000
--- a/slirp/slirp_config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * User definable configuration options
- */
-
-/* Define to 1 if you want KEEPALIVE timers */
-#define DO_KEEPALIVE 0
-
-/*********************************************************/
-/*
- * Autoconf defined configuration options
- * You shouldn't need to touch any of these
- */
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index d073ef9525..922dbe32eb 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -481,7 +481,7 @@ findso:
* Reset idle time and keep-alive timer.
*/
tp->t_idle = 0;
- if (SO_OPTIONS)
+ if (slirp_do_keepalive)
tp->t_timer[TCPT_KEEP] = TCPTV_KEEPINTVL;
else
tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_IDLE;
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index 52ef5f9100..d953a16386 100644
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -262,7 +262,7 @@ tcp_timers(register struct tcpcb *tp, int timer)
if (tp->t_state < TCPS_ESTABLISHED)
goto dropit;
- if ((SO_OPTIONS) && tp->t_state <= TCPS_CLOSE_WAIT) {
+ if (slirp_do_keepalive && tp->t_state <= TCPS_CLOSE_WAIT) {
if (tp->t_idle >= TCPTV_KEEP_IDLE + TCP_MAXIDLE)
goto dropit;
/*
--
2.19.2
- [Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS, (continued)
- [Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 35/64] slirp: improve a bit the debug macros, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface with qemu, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 44/64] slirp: simplify fork_exec(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 46/64] slirp: Enable fork_exec support on Windows, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 40/64] slirp: remove dead TCP_ACK_HACK code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 39/64] slirp: NULL is defined by stddef.h, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 48/64] slirp: rename exec_list, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 37/64] slirp: remove #if notdef dead code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE,
Samuel Thibault <=
- [Qemu-devel] [PULL 51/64] slirp: replace some fprintf() with DEBUG_MISC, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 54/64] slirp: always build with debug statements, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 49/64] slirp: use virtual time for packet expiration, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 59/64] slirp: factor out guestfwd addition checks, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 47/64] slirp: drop <Vista compatibility, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 53/64] slirp: no need to make DPRINTF conditional on DEBUG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 58/64] slirp: replace DEBUG_ARGS with DEBUG_ARG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 52/64] slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 62/64] slirp: set G_LOG_DOMAIN, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 56/64] slirp: use %p for pointers format, Samuel Thibault, 2018/12/18