diff options
| author | Brandon Carpenter <brandon.carpenter@cypherpath.com> | 2017-09-12 08:21:47 -0700 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2017-10-04 13:21:53 +0100 |
| commit | a75d6f07613af7ec5b016b31b117436e32ce7a5f (patch) | |
| tree | 60e063eefa48a8535b57fac8d4ff39f5e4e7327f /ui/vnc-ws.c | |
| parent | 33badfd1e3735b877e41939100511c65572be6b9 (diff) | |
| download | qemu-a75d6f07613af7ec5b016b31b117436e32ce7a5f.tar.gz | |
ui: Always remove an old VNC channel watch before adding a new one
Also set saved handle to zero when removing without adding a new watch.
Signed-off-by: Brandon Carpenter <brandon.carpenter@cypherpath.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'ui/vnc-ws.c')
| -rw-r--r-- | ui/vnc-ws.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index aeaafe2c21..6ccad22cef 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -37,6 +37,9 @@ static void vncws_tls_handshake_done(QIOTask *task, error_free(err); } else { VNC_DEBUG("TLS handshake complete, starting websocket handshake\n"); + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } vs->ioc_tag = qio_channel_add_watch( QIO_CHANNEL(vs->ioc), G_IO_IN, vncws_handshake_io, vs, NULL); } @@ -97,6 +100,9 @@ static void vncws_handshake_done(QIOTask *task, } else { VNC_DEBUG("Websock handshake complete, starting VNC protocol\n"); vnc_start_protocol(vs); + if (vs->ioc_tag) { + g_source_remove(vs->ioc_tag); + } vs->ioc_tag = qio_channel_add_watch( vs->ioc, G_IO_IN, vnc_client_io, vs, NULL); } |