[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/7] io: Always remove an old channel watch befor
From: |
Brandon Carpenter |
Subject: |
[Qemu-devel] [PATCH v3 1/7] io: Always remove an old channel watch before adding a new one |
Date: |
Tue, 12 Sep 2017 08:21:47 -0700 |
Also set saved handle to zero when removing without adding a new watch.
Signed-off-by: Brandon Carpenter <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
---
ui/vnc-auth-vencrypt.c | 3 +++
ui/vnc-ws.c | 6 ++++++
ui/vnc.c | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index ffaab57550..c3eece4fa7 100644
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -77,6 +77,9 @@ static void vnc_tls_handshake_done(QIOTask *task,
vnc_client_error(vs);
error_free(err);
} else {
+ if (vs->ioc_tag) {
+ g_source_remove(vs->ioc_tag);
+ }
vs->ioc_tag = qio_channel_add_watch(
vs->ioc, G_IO_IN | G_IO_OUT, vnc_client_io, vs, NULL);
start_auth_vencrypt_subauth(vs);
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index f530cd5474..eaf309553c 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -36,6 +36,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);
}
diff --git a/ui/vnc.c b/ui/vnc.c
index 0b5dbc62e4..62f7a3f30a 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1121,6 +1121,7 @@ static void vnc_disconnect_start(VncState *vs)
vnc_set_share_mode(vs, VNC_SHARE_MODE_DISCONNECTED);
if (vs->ioc_tag) {
g_source_remove(vs->ioc_tag);
+ vs->ioc_tag = 0;
}
qio_channel_close(vs->ioc, NULL);
vs->disconnecting = TRUE;
@@ -2931,6 +2932,9 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket
*sioc,
VNC_DEBUG("New client on socket %p\n", vs->sioc);
update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_BASE);
qio_channel_set_blocking(vs->ioc, false, NULL);
+ if (vs->ioc_tag) {
+ g_source_remove(vs->ioc_tag);
+ }
if (websocket) {
vs->websocket = 1;
if (vd->tlscreds) {
--
2.14.1
--
CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is
for the sole use of the intended recipient(s) and may contain proprietary,
confidential or privileged information or otherwise be protected by law.
Any unauthorized review, use, disclosure or distribution is prohibited. If
you are not the intended recipient, please notify the sender and destroy
all copies and the original message.
- [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 3/7] io: Add support for fragmented websocket binary frames, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 2/7] io: Small updates in preparation for websocket changes, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 1/7] io: Always remove an old channel watch before adding a new one,
Brandon Carpenter <=
- [Qemu-devel] [PATCH v3 4/7] io: Allow empty websocket payload, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 7/7] io: Attempt to send websocket close messages to client, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 6/7] io: Reply to ping frames, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 5/7] io: Ignore websocket PING and PONG frames, Brandon Carpenter, 2017/09/12
- Re: [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Stefan Hajnoczi, 2017/09/18
- Re: [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Brandon Carpenter, 2017/09/20