From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpdX1-0001LE-0M for qemu-devel@nongnu.org; Thu, 29 Sep 2016 11:46:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpdWz-0006VA-0m for qemu-devel@nongnu.org; Thu, 29 Sep 2016 11:45:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpdWy-0006Ur-Rp for qemu-devel@nongnu.org; Thu, 29 Sep 2016 11:45:52 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 560E1335F8C for ; Thu, 29 Sep 2016 15:45:52 +0000 (UTC) From: "Daniel P. Berrange" Date: Thu, 29 Sep 2016 16:45:34 +0100 Message-Id: <1475163940-26094-4-git-send-email-berrange@redhat.com> In-Reply-To: <1475163940-26094-1-git-send-email-berrange@redhat.com> References: <1475163940-26094-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] ui: remove 'ws_tls' field from VncState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Daniel P. Berrange" The 'ws_tls' field in VncState is only ever representing the result of 'tlscreds != NULL' and is thus pointless. Replace use of 'ws_tls' with a direct check against 'tlscreds' Signed-off-by: Daniel P. Berrange --- ui/vnc.c | 11 +---------- ui/vnc.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 45a23d3..83a608b 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3029,7 +3029,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, qio_channel_set_blocking(vs->ioc, false, NULL); if (websocket) { vs->websocket = 1; - if (vd->ws_tls) { + if (vd->tlscreds) { vs->ioc_tag = qio_channel_add_watch( vs->ioc, G_IO_IN, vncws_tls_handshake_io, vs, NULL); } else { @@ -3379,9 +3379,6 @@ vnc_display_setup_auth(VncDisplay *vs, if (password) { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 password auth\n"); @@ -3409,9 +3406,6 @@ vnc_display_setup_auth(VncDisplay *vs, } else if (sasl) { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 SASL auth\n"); @@ -3439,9 +3433,6 @@ vnc_display_setup_auth(VncDisplay *vs, } else { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 no auth\n"); diff --git a/ui/vnc.h b/ui/vnc.h index a0519cc..223af38 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -172,7 +172,6 @@ struct VncDisplay int auth; int subauth; /* Used by VeNCrypt */ int ws_auth; /* Used by websockets */ - bool ws_tls; /* Used by websockets */ bool lossy; bool non_adaptive; QCryptoTLSCreds *tlscreds; -- 2.7.4