From patchwork Mon Mar 16 12:36:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 450539 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 1C9C714019D for ; Mon, 16 Mar 2015 23:38:44 +1100 (AEDT) Received: from localhost ([::1]:49039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUI6-0008HQ-4w for incoming@patchwork.ozlabs.org; Mon, 16 Mar 2015 08:38:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUFu-0005Iz-J9 for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXUFi-0003ir-8L for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:36:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUFh-0003ih-VW for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:36:14 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2GCaDgr002856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 16 Mar 2015 08:36:13 -0400 Received: from localhost.localdomain.com (vpn1-6-75.ams2.redhat.com [10.36.6.75]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2GCa94L003000; Mon, 16 Mar 2015 08:36:11 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 16 Mar 2015 12:36:02 +0000 Message-Id: <1426509364-19513-2-git-send-email-berrange@redhat.com> In-Reply-To: <1426509364-19513-1-git-send-email-berrange@redhat.com> References: <1426509364-19513-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/3] ui: remove unused 'wiremode' variable in VncState struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Daniel P. Berrange Reviewed-by: Alex Bennée --- ui/vnc-auth-vencrypt.c | 1 - ui/vnc-tls.c | 2 -- ui/vnc-tls.h | 7 ------- ui/vnc-ws.c | 1 - 4 files changed, 11 deletions(-) diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index bc7032e..a420ccb 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -93,7 +93,6 @@ static int vnc_start_vencrypt_handshake(struct VncState *vs) { } VNC_DEBUG("Handshake done, switching to TLS data mode\n"); - vs->tls.wiremode = VNC_WIREMODE_TLS; qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs); start_auth_vencrypt_subauth(vs); diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c index 0f59f9b..de1cb34 100644 --- a/ui/vnc-tls.c +++ b/ui/vnc-tls.c @@ -421,14 +421,12 @@ void vnc_tls_client_cleanup(struct VncState *vs) gnutls_deinit(vs->tls.session); vs->tls.session = NULL; } - vs->tls.wiremode = VNC_WIREMODE_CLEAR; g_free(vs->tls.dname); #ifdef CONFIG_VNC_WS if (vs->ws_tls.session) { gnutls_deinit(vs->ws_tls.session); vs->ws_tls.session = NULL; } - vs->ws_tls.wiremode = VNC_WIREMODE_CLEAR; g_free(vs->ws_tls.dname); #endif /* CONFIG_VNC_WS */ } diff --git a/ui/vnc-tls.h b/ui/vnc-tls.h index 36a2227..f9829c7 100644 --- a/ui/vnc-tls.h +++ b/ui/vnc-tls.h @@ -33,11 +33,6 @@ #include "qemu/acl.h" -enum { - VNC_WIREMODE_CLEAR, - VNC_WIREMODE_TLS, -}; - typedef struct VncDisplayTLS VncDisplayTLS; typedef struct VncStateTLS VncStateTLS; @@ -55,8 +50,6 @@ struct VncDisplayTLS { /* Per client state */ struct VncStateTLS { - /* Whether data is being TLS encrypted yet */ - int wiremode; gnutls_session_t session; /* Client's Distinguished Name from the x509 cert */ diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index d75950d..1769d52 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -48,7 +48,6 @@ static int vncws_start_tls_handshake(struct VncState *vs) } VNC_DEBUG("Handshake done, switching to TLS data mode\n"); - vs->ws_tls.wiremode = VNC_WIREMODE_TLS; qemu_set_fd_handler2(vs->csock, NULL, vncws_handshake_read, NULL, vs); return 0;