|
 |
e2c81d |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
e2c81d |
From: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
e2c81d |
Date: Wed, 2 Mar 2016 12:25:23 +0100
|
|
|
e2c81d |
Subject: [PATCH] Remove spice_server_set_keepalive_timeout
|
|
|
e2c81d |
|
|
|
e2c81d |
This public API is no longer needed as the keepalive interval does not
|
|
|
e2c81d |
need to be configurable. This API was never in a stable 0.12 release, so
|
|
|
e2c81d |
it's OK to remove it now.
|
|
|
e2c81d |
---
|
|
|
e2c81d |
server/reds-private.h | 1 -
|
|
|
e2c81d |
server/reds.c | 7 -------
|
|
|
e2c81d |
server/spice-server.syms | 5 -----
|
|
|
e2c81d |
server/spice.h | 1 -
|
|
|
e2c81d |
4 files changed, 14 deletions(-)
|
|
|
e2c81d |
|
|
|
e2c81d |
diff --git a/server/reds-private.h b/server/reds-private.h
|
|
|
e2c81d |
index 0f7ab65..46899f6 100644
|
|
|
e2c81d |
--- a/server/reds-private.h
|
|
|
e2c81d |
+++ b/server/reds-private.h
|
|
|
e2c81d |
@@ -162,7 +162,6 @@ typedef struct RedsState {
|
|
|
e2c81d |
int vm_running;
|
|
|
e2c81d |
Ring char_devs_states; /* list of SpiceCharDeviceStateItem */
|
|
|
e2c81d |
int seamless_migration_enabled; /* command line arg */
|
|
|
e2c81d |
- int keepalive_timeout;
|
|
|
e2c81d |
|
|
|
e2c81d |
SSL_CTX *ctx;
|
|
|
e2c81d |
|
|
|
e2c81d |
diff --git a/server/reds.c b/server/reds.c
|
|
|
e2c81d |
index a848828..e7e4090 100644
|
|
|
e2c81d |
--- a/server/reds.c
|
|
|
e2c81d |
+++ b/server/reds.c
|
|
|
e2c81d |
@@ -4717,10 +4717,3 @@ void reds_stream_free(RedsStream *s)
|
|
|
e2c81d |
|
|
|
e2c81d |
free(s);
|
|
|
e2c81d |
}
|
|
|
e2c81d |
-
|
|
|
e2c81d |
-SPICE_GNUC_VISIBLE void spice_server_set_keepalive_timeout(SpiceServer *s, int timeout)
|
|
|
e2c81d |
-{
|
|
|
e2c81d |
- spice_assert(s == reds);
|
|
|
e2c81d |
- reds->keepalive_timeout = timeout;
|
|
|
e2c81d |
- spice_debug("keepalive timeout=%d", timeout);
|
|
|
e2c81d |
-}
|
|
|
e2c81d |
diff --git a/server/spice-server.syms b/server/spice-server.syms
|
|
|
e2c81d |
index 9af3354..4f2dc37 100644
|
|
|
e2c81d |
--- a/server/spice-server.syms
|
|
|
e2c81d |
+++ b/server/spice-server.syms
|
|
|
e2c81d |
@@ -145,8 +145,3 @@ SPICE_SERVER_0.12.4 {
|
|
|
e2c81d |
global:
|
|
|
e2c81d |
spice_server_set_agent_file_xfer;
|
|
|
e2c81d |
} SPICE_SERVER_0.12.3;
|
|
|
e2c81d |
-
|
|
|
e2c81d |
-SPICE_SERVER_0.12.7 {
|
|
|
e2c81d |
-global:
|
|
|
e2c81d |
- spice_server_set_keepalive_timeout;
|
|
|
e2c81d |
-} SPICE_SERVER_0.12.4;
|
|
|
e2c81d |
diff --git a/server/spice.h b/server/spice.h
|
|
|
e2c81d |
index c31839d..9c8e18a 100644
|
|
|
e2c81d |
--- a/server/spice.h
|
|
|
e2c81d |
+++ b/server/spice.h
|
|
|
e2c81d |
@@ -508,7 +508,6 @@ int spice_server_set_playback_compression(SpiceServer *s, int enable);
|
|
|
e2c81d |
int spice_server_set_agent_mouse(SpiceServer *s, int enable);
|
|
|
e2c81d |
int spice_server_set_agent_copypaste(SpiceServer *s, int enable);
|
|
|
e2c81d |
int spice_server_set_agent_file_xfer(SpiceServer *s, int enable);
|
|
|
e2c81d |
-void spice_server_set_keepalive_timeout(SpiceServer *s, int timeout);
|
|
|
e2c81d |
|
|
|
e2c81d |
int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);
|
|
|
e2c81d |
int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen);
|