From d4d674793779bb16ed3f1d5f78717eb48b9485b9 Mon Sep 17 00:00:00 2001
From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Tue, 27 Jan 2015 13:26:02 -0600
Subject: [PATCH] Move spice_secure_port to RedsState struct

removing more global variables

Acked-by: Pavel Grunt <pgrunt@redhat.com>
---
 server/reds-private.h | 1 +
 server/reds.c         | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/reds-private.h b/server/reds-private.h
index 7dfec7fa..427ce8ea 100644
--- a/server/reds-private.h
+++ b/server/reds-private.h
@@ -194,6 +194,7 @@ struct RedsState {
     const char *default_renderer;
 
     int spice_port;
+    int spice_secure_port;
 };
 
 #endif
diff --git a/server/reds.c b/server/reds.c
index feef532b..9e56780a 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -149,7 +149,6 @@ static SpiceMigrateInstance *migration_interface = NULL;
 
 static TicketAuthentication taTicket;
 
-static int spice_secure_port = -1;
 static int spice_listen_socket_fd = -1;
 static char spice_addr[256];
 static int spice_family = PF_UNSPEC;
@@ -2584,8 +2583,8 @@ static int reds_init_net(RedsState *reds)
         }
     }
 
-    if (spice_secure_port != -1) {
-        reds->secure_listen_socket = reds_init_socket(spice_addr, spice_secure_port,
+    if (reds->spice_secure_port != -1) {
+        reds->secure_listen_socket = reds_init_socket(spice_addr, reds->spice_secure_port,
                                                       spice_family);
         if (-1 == reds->secure_listen_socket) {
             return -1;
@@ -3440,6 +3439,7 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void)
     reds = spice_new0(RedsState, 1);
     reds->default_renderer = "sw";
     reds->spice_port = -1;
+    reds->spice_secure_port = -1;
     return reds;
 }
 
@@ -3651,7 +3651,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_tls(SpiceServer *s, int port,
     }
     memset(&ssl_parameters, 0, sizeof(ssl_parameters));
 
-    spice_secure_port = port;
+    s->spice_secure_port = port;
     g_strlcpy(ssl_parameters.ca_certificate_file, ca_cert_file,
               sizeof(ssl_parameters.ca_certificate_file));
     g_strlcpy(ssl_parameters.certs_file, certs_file,