From patchwork Fri Sep 30 15:16:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 677107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3slwbm1k2Tz9sC3 for ; Sat, 1 Oct 2016 01:39:32 +1000 (AEST) Received: from localhost ([::1]:45325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzuK-0003Lj-Q1 for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2016 11:39:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzZ0-0007hV-5a for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpzYw-0007aX-0h for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpzYv-0007aJ-NM for qemu-devel@nongnu.org; Fri, 30 Sep 2016 11:17:21 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51DD6624DB; Fri, 30 Sep 2016 15:17:21 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-125.ams2.redhat.com [10.36.6.125]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8UFH9iR005330; Fri, 30 Sep 2016 11:17:19 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2016 16:16:59 +0100 Message-Id: <1475248620-534-6-git-send-email-berrange@redhat.com> In-Reply-To: <1475248620-534-1-git-send-email-berrange@redhat.com> References: <1475248620-534-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 30 Sep 2016 15:17:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/6] vnc: set name for all I/O channels created X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: prashanth sunder , Stefan Hajnoczi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Ensure that all I/O channels created for VNC are given names to distinguish their respective roles. Signed-off-by: Daniel P. Berrange Reviewed-by: Stefan Hajnoczi --- 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 3bac46e..05628a6 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 76a3273..ab68db3 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3108,6 +3108,9 @@ static gboolean vnc_listen_io(QIOChannel *ioc, graphic_hw_update(vs->dcl.con); sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), &err); if (sioc != NULL) { + qio_channel_set_name(QIO_CHANNEL(sioc), + ioc != QIO_CHANNEL(vs->lsock) ? + "vnc-ws-server" : "vnc-server"); qio_channel_set_delay(QIO_CHANNEL(sioc), false); vnc_connect(vs, sioc, false, ioc != QIO_CHANNEL(vs->lsock)); @@ -3824,6 +3827,7 @@ void vnc_display_open(const char *id, Error **errp) } vs->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; } @@ -3831,6 +3835,7 @@ void vnc_display_open(const char *id, Error **errp) object_unref(OBJECT(sioc)); } else { vs->lsock = qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(vs->lsock), "vnc-listen"); if (qio_channel_socket_listen_sync(vs->lsock, saddr, errp) < 0) { goto fail; } @@ -3839,6 +3844,7 @@ void vnc_display_open(const char *id, Error **errp) if (vs->ws_enabled) { vs->lwebsock = qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(vs->lwebsock), "vnc-ws-listen"); if (qio_channel_socket_listen_sync(vs->lwebsock, wsaddr, errp) < 0) { object_unref(OBJECT(vs->lsock)); @@ -3883,6 +3889,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(vs, sioc, skipauth, false); object_unref(OBJECT(sioc)); }