[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 10/11] vnc: set name for all I/O channels created
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 10/11] vnc: set name for all I/O channels created |
Date: |
Thu, 27 Oct 2016 14:57:37 +0200 |
Ensure that all I/O channels created for VNC are given names
to distinguish their respective roles.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
ui/vnc-auth-vencrypt.c | 1 +
ui/vnc-ws.c | 3 +++
ui/vnc.c | 7 +++++++
3 files changed, 11 insertions(+)
diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index 11c8c9a..c0c29a5 100644
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -116,6 +116,7 @@ static int protocol_client_vencrypt_auth(VncState *vs,
uint8_t *data, size_t len
return 0;
}
+ qio_channel_set_name(QIO_CHANNEL(tls), "vnc-server-tls");
VNC_DEBUG("Start TLS VeNCrypt handshake process\n");
object_unref(OBJECT(vs->ioc));
vs->ioc = QIO_CHANNEL(tls);
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 42a8e7b..bffb484 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -67,6 +67,8 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
return TRUE;
}
+ qio_channel_set_name(QIO_CHANNEL(tls), "vnc-ws-server-tls");
+
VNC_DEBUG("Start TLS WS handshake process\n");
object_unref(OBJECT(vs->ioc));
vs->ioc = QIO_CHANNEL(tls);
@@ -113,6 +115,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
}
wioc = qio_channel_websock_new_server(vs->ioc);
+ qio_channel_set_name(QIO_CHANNEL(wioc), "vnc-ws-server-websock");
object_unref(OBJECT(vs->ioc));
vs->ioc = QIO_CHANNEL(wioc);
diff --git a/ui/vnc.c b/ui/vnc.c
index 1bedc95..2c28a59 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3100,6 +3100,9 @@ static gboolean vnc_listen_io(QIOChannel *ioc,
sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), &err);
if (sioc != NULL) {
+ qio_channel_set_name(QIO_CHANNEL(sioc),
+ ioc != QIO_CHANNEL(vd->lsock) ?
+ "vnc-ws-server" : "vnc-server");
qio_channel_set_delay(QIO_CHANNEL(sioc), false);
vnc_connect(vd, sioc, false,
ioc != QIO_CHANNEL(vd->lsock));
@@ -3788,6 +3791,7 @@ void vnc_display_open(const char *id, Error **errp)
}
vd->is_unix = saddr->type == SOCKET_ADDRESS_KIND_UNIX;
sioc = qio_channel_socket_new();
+ qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
if (qio_channel_socket_connect_sync(sioc, saddr, errp) < 0) {
goto fail;
}
@@ -3795,6 +3799,7 @@ void vnc_display_open(const char *id, Error **errp)
object_unref(OBJECT(sioc));
} else {
vd->lsock = qio_channel_socket_new();
+ qio_channel_set_name(QIO_CHANNEL(vd->lsock), "vnc-listen");
if (qio_channel_socket_listen_sync(vd->lsock, saddr, errp) < 0) {
goto fail;
}
@@ -3802,6 +3807,7 @@ void vnc_display_open(const char *id, Error **errp)
if (ws_enabled) {
vd->lwebsock = qio_channel_socket_new();
+ qio_channel_set_name(QIO_CHANNEL(vd->lwebsock), "vnc-ws-listen");
if (qio_channel_socket_listen_sync(vd->lwebsock,
wsaddr, errp) < 0) {
object_unref(OBJECT(vd->lsock));
@@ -3845,6 +3851,7 @@ void vnc_display_add_client(const char *id, int csock,
bool skipauth)
sioc = qio_channel_socket_new_fd(csock, NULL);
if (sioc) {
+ qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-server");
vnc_connect(vd, sioc, skipauth, false);
object_unref(OBJECT(sioc));
}
--
2.9.3
- [Qemu-devel] [PULL v1 00/11] Merge qio 2016/10/27, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 01/11] io: Fix double shift usages on QIOChannel features, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 02/11] io: Use qio_channel_has_feature() where applicable, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 04/11] io: set LISTEN flag explicitly for listen sockets, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 06/11] io: add ability to set a name for IO channels, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 03/11] io: Introduce a qio_channel_set_feature() helper, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 07/11] nbd: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 05/11] io: Add a QIOChannelSocket cleanup test, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 08/11] char: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 10/11] vnc: set name for all I/O channels created,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 11/11] main: set names for main loop sources created, Daniel P. Berrange, 2016/10/27
- [Qemu-devel] [PULL v1 09/11] migration: set name for all I/O channels created, Daniel P. Berrange, 2016/10/27
- Re: [Qemu-devel] [PULL v1 00/11] Merge qio 2016/10/27, Peter Maydell, 2016/10/27