[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 26/41] slirp: replace compile time DO_KEEPAL
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 26/41] slirp: replace compile time DO_KEEPALIVE |
Date: |
Wed, 14 Nov 2018 16:36:28 +0400 |
Use a global variable instead (similar to slirp_debug)
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/slirp.h | 6 +++---
slirp/slirp_config.h | 12 ------------
slirp/slirp.c | 3 +++
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.h b/slirp/slirp.h
index 1a336b2cf1..c328aac88a 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/slirp.c b/slirp/slirp.c
index 2d32debf2a..864a9b5a7a 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/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.1.708.g4ede3d42df
- [Qemu-devel] [PATCH for-3.2 24/41] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent, (continued)
- [Qemu-devel] [PATCH for-3.2 24/41] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 23/41] slirp: remove unused HAVE_INET_ATON, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 25/41] slirp: replace SIZEOF_CHAR_P with glib equivalent, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 26/41] slirp: replace compile time DO_KEEPALIVE,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 27/41] slirp: remove unused global slirp_instance, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 28/41] slirp: replace error_report() with g_critical(), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 32/41] slirp: remove unused sbflush(), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 31/41] slirp: add a callback to log guest errors, Marc-André Lureau, 2018/11/14