[Spice-devel] [PATCH spice-gtk] channel: swap channel GSocketConnection on migration

[Christophe Fergeau]

ACK

Christophe

On Fri, Nov 22, 2013 at 04:05:34PM +0100, Marc-André Lureau wrote:
> 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
> ---
>  gtk/spice-channel.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
> index eda31d2..6ddbe50 100644
> --- a/gtk/spice-channel.c
> +++ b/gtk/spice-channel.c
> @@ -2733,6 +2733,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);
> -- 
> 1.8.4.2
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20131122/85b1405f/attachment.pgp>