From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDrJ-0008EH-Fq for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:18:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYDr5-0001vb-5v for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:18:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDr4-0001vF-Ri for qemu-devel@nongnu.org; Wed, 18 Mar 2015 09:17:51 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 5E7FB39ABD9 for ; Wed, 18 Mar 2015 13:17:50 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 18 Mar 2015 14:17:39 +0100 Message-Id: <1426684666-30629-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1426684666-30629-1-git-send-email-kraxel@redhat.com> References: <1426684666-30629-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/9] ui: remove unused 'wiremode' variable in VncState struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann From: "Daniel P. Berrange" Signed-off-by: Daniel P. Berrange Signed-off-by: Gerd Hoffmann --- 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; -- 1.8.3.1