summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-16 14:35:54 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:42 +0100
commit0476e9d28b2a323585e9095d616b3edc8828fc33 (patch)
tree2a76339f8bda14dfc35f71247ae3b883b8b7cfd3
parent83140b64fdb4e2e6a88cb6babd351bcd21e14f21 (diff)
downloadspice-0476e9d28b2a323585e9095d616b3edc8828fc33.tar.gz
spice-0476e9d28b2a323585e9095d616b3edc8828fc33.tar.xz
spice-0476e9d28b2a323585e9095d616b3edc8828fc33.zip
Change reds_client_disconnect() to take RedsState arg
-rw-r--r--server/main-dispatcher.c2
-rw-r--r--server/reds.c6
-rw-r--r--server/reds.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/server/main-dispatcher.c b/server/main-dispatcher.c
index 3d681371..7c48c84b 100644
--- a/server/main-dispatcher.c
+++ b/server/main-dispatcher.c
@@ -123,7 +123,7 @@ static void main_dispatcher_handle_client_disconnect(void *opaque,
MainDispatcherClientDisconnectMessage *msg = payload;
spice_debug("client=%p", msg->client);
- reds_client_disconnect(msg->client);
+ reds_client_disconnect(reds, msg->client);
red_client_unref(msg->client);
}
diff --git a/server/reds.c b/server/reds.c
index e4937642..7203e344 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -431,7 +431,7 @@ static int reds_main_channel_connected(RedsState *reds)
return main_channel_is_connected(reds->main_channel);
}
-void reds_client_disconnect(RedClient *client)
+void reds_client_disconnect(RedsState *reds, RedClient *client)
{
RedsMigTargetClient *mig_client;
@@ -525,7 +525,7 @@ static void reds_disconnect(void)
spice_info(NULL);
RING_FOREACH_SAFE(link, next, &reds->clients) {
- reds_client_disconnect(SPICE_CONTAINEROF(link, RedClient, link));
+ reds_client_disconnect(reds, SPICE_CONTAINEROF(link, RedClient, link));
}
reds_mig_cleanup(reds);
}
@@ -1545,7 +1545,7 @@ static void reds_mig_target_client_disconnect_all(void)
RING_FOREACH_SAFE(now, next, &reds->mig_target_clients) {
RedsMigTargetClient *mig_client = SPICE_CONTAINEROF(now, RedsMigTargetClient, link);
- reds_client_disconnect(mig_client->client);
+ reds_client_disconnect(reds, mig_client->client);
}
}
diff --git a/server/reds.h b/server/reds.h
index 9688297c..0849fca9 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -83,7 +83,7 @@ extern spice_wan_compression_t zlib_glz_state;
// Temporary measures to make splitting reds.c to inputs_channel.c easier
/* should be called only from main_dispatcher */
-void reds_client_disconnect(RedClient *client);
+void reds_client_disconnect(RedsState *reds, RedClient *client);
// Temporary (?) for splitting main channel
typedef struct MainMigrateData MainMigrateData;