diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-27 11:19:21 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:45 +0100 |
| commit | a042ba399614321de85a98fe46e477eded8815c3 (patch) | |
| tree | ec47e78bf7e6208deee295ab1c8b3aa98c64e7a9 | |
| parent | d10f4d16ef1fe38ceebdd0130faca4da06729584 (diff) | |
| download | spice-a042ba399614321de85a98fe46e477eded8815c3.tar.gz spice-a042ba399614321de85a98fe46e477eded8815c3.tar.xz spice-a042ba399614321de85a98fe46e477eded8815c3.zip | |
Move spice_port to RedsState struct
Remove another global variable
| -rw-r--r-- | server/reds-private.h | 1 | ||||
| -rw-r--r-- | server/reds.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/server/reds-private.h b/server/reds-private.h index 8e92eb4b..de549a0e 100644 --- a/server/reds-private.h +++ b/server/reds-private.h @@ -182,6 +182,7 @@ struct RedsState { const char *default_renderer; GArray *renderers; + int spice_port; }; #endif diff --git a/server/reds.c b/server/reds.c index d074ee01..e83fd43b 100644 --- a/server/reds.c +++ b/server/reds.c @@ -93,7 +93,6 @@ static SpiceMigrateInstance *migration_interface = NULL; static TicketAuthentication taTicket; -static int spice_port = -1; static int spice_secure_port = -1; static int spice_listen_socket_fd = -1; static char spice_addr[256]; @@ -2445,8 +2444,8 @@ void reds_set_client_mm_time_latency(RedsState *reds, RedClient *client, uint32_ static int reds_init_net(RedsState *reds) { - if (spice_port != -1) { - reds->listen_socket = reds_init_socket(spice_addr, spice_port, spice_family); + if (reds->spice_port != -1) { + reds->listen_socket = reds_init_socket(spice_addr, reds->spice_port, spice_family); if (-1 == reds->listen_socket) { return -1; } @@ -3326,6 +3325,7 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void) SPICE_CHANNEL_SECURITY_NONE | SPICE_CHANNEL_SECURITY_SSL; reds->default_renderer = "sw"; reds->renderers = g_array_sized_new(FALSE, TRUE, sizeof(uint32_t), RED_RENDERER_LAST); + reds->spice_port = -1; return reds; } @@ -3407,7 +3407,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_port(SpiceServer *s, int port) if (port < 0 || port > 0xffff) { return -1; } - spice_port = port; + s->spice_port = port; return 0; } |