Make default_security and channels_security non-global

Move them into the RedsState struct, adjust functions that use these
variables to take a RedsState arg.

Acked-by: Frediano Ziglio <fziglio@redhat.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/server/reds-private.h b/server/reds-private.h
index fda613d6..89f5b97b 100644
--- a/server/reds-private.h
+++ b/server/reds-private.h
@@ -135,6 +135,8 @@ typedef struct RedsClientMonitorsConfig {
     int buffer_pos;
 } RedsClientMonitorsConfig;
 
+typedef struct ChannelSecurityOptions ChannelSecurityOptions;
+
 struct RedsState {
     int listen_socket;
     int secure_listen_socket;
@@ -191,6 +193,9 @@ struct RedsState {
     int mm_time_enabled;
     uint32_t mm_time_latency;
 
+    int default_channel_security;
+    ChannelSecurityOptions *channels_security;
+
     int spice_port;
     int spice_secure_port;
     SpiceCharDeviceInstance *vdagent;