summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2013-11-22 15:52:55 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2013-11-22 16:10:17 +0100
commit76885eaa181d64ef92c19cbdcbba16b12ee4a43f (patch)
treeb461989537c55c29ba4400b8d5975d570d3ed439
parent08a888ab6a0ede51d64ee6097955fe6534fc2898 (diff)
channel: swap channel GSocketConnection on migration
When migration completes, unrefing the new connection leads to original GSocket pending refs, and thus the sockets stay in CLOSE_WAIT. This is a regression from 8029bd0 where GSocketConnection is kept around to satisfy old glib. https://bugzilla.redhat.com/show_bug.cgi?id=1024501 This will also probably fix: https://bugzilla.redhat.com/show_bug.cgi?id=952375
-rw-r--r--gtk/spice-channel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
index e8758c0..e4683f8 100644
--- a/gtk/spice-channel.c
+++ b/gtk/spice-channel.c
@@ -2727,6 +2727,7 @@ void spice_channel_swap(SpiceChannel *channel, SpiceChannel *swap, gboolean swap
/* TODO: split channel in 2 objects: a controller and a swappable
state object */
+ SWAP(conn);
SWAP(sock);
SWAP(ctx);
SWAP(ssl);