diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 14:33:57 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
commit | 83140b64fdb4e2e6a88cb6babd351bcd21e14f21 (patch) | |
tree | 29bf934fea13d0fa2aa2f91c7344bd7710191901 | |
parent | afc5fd3e1d201ab1cab077bfd09559e62d113f7b (diff) | |
download | spice-83140b64fdb4e2e6a88cb6babd351bcd21e14f21.tar.gz spice-83140b64fdb4e2e6a88cb6babd351bcd21e14f21.tar.xz spice-83140b64fdb4e2e6a88cb6babd351bcd21e14f21.zip |
Change reds_main_channel_connected() to take RedsState arg
-rw-r--r-- | server/reds.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/reds.c b/server/reds.c index 419dfae6..e4937642 100644 --- a/server/reds.c +++ b/server/reds.c @@ -426,7 +426,7 @@ static void reds_reset_vdp(RedsState *reds) } } -static int reds_main_channel_connected(void) +static int reds_main_channel_connected(RedsState *reds) { return main_channel_is_connected(reds->main_channel); } @@ -532,7 +532,7 @@ static void reds_disconnect(void) static void reds_mig_disconnect(void) { - if (reds_main_channel_connected()) { + if (reds_main_channel_connected(reds)) { reds_disconnect(); } else { reds_mig_cleanup(reds); @@ -589,7 +589,7 @@ static void reds_agent_remove(RedsState *reds) vdagent = NULL; reds_update_mouse_mode(reds); - if (reds_main_channel_connected() && + if (reds_main_channel_connected(reds) && !red_channel_waits_for_migrate_data(&reds->main_channel->base)) { main_channel_push_agent_disconnected(reds->main_channel); } @@ -2416,7 +2416,7 @@ listen: static void reds_send_mm_time(void) { - if (!reds_main_channel_connected()) { + if (!reds_main_channel_connected(reds)) { return; } spice_debug(NULL); @@ -2657,7 +2657,7 @@ static void reds_exit(void) static inline void on_activating_ticketing(void) { - if (!ticketing_enabled && reds_main_channel_connected()) { + if (!ticketing_enabled && reds_main_channel_connected(reds)) { spice_warning("disconnecting"); reds_disconnect(); } @@ -2876,7 +2876,7 @@ static SpiceCharDeviceState *attach_to_red_agent(SpiceCharDeviceInstance *sin) sif->state(vdagent, 1); } - if (!reds_main_channel_connected()) { + if (!reds_main_channel_connected(reds)) { return state->base; } @@ -3473,7 +3473,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_ticket(SpiceServer *s, { spice_assert(reds == s); - if (reds_main_channel_connected()) { + if (reds_main_channel_connected(reds)) { if (fail_if_connected) { return -1; } @@ -3797,7 +3797,7 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_client_state(SpiceServer *s) { spice_assert(reds == s); - if (!reds_main_channel_connected()) { + if (!reds_main_channel_connected(reds)) { return SPICE_MIGRATE_CLIENT_NONE; } else if (reds->mig_wait_connect) { return SPICE_MIGRATE_CLIENT_WAITING; @@ -3826,7 +3826,7 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_end(SpiceServer *s, int completed) } reds->expect_migrate = FALSE; - if (!reds_main_channel_connected()) { + if (!reds_main_channel_connected(reds)) { spice_info("no peer connected"); goto complete; } |