From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUfo-0007tS-GB for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:03:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXUfi-0004g0-UA for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:03:12 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:33932 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUfi-0004fm-O8 for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:03:06 -0400 References: <1426509364-19513-1-git-send-email-berrange@redhat.com> <1426509364-19513-2-git-send-email-berrange@redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1426509364-19513-2-git-send-email-berrange@redhat.com> Date: Mon, 16 Mar 2015 13:03:23 +0000 Message-ID: <87lhixayck.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 1/3] ui: remove unused 'wiremode' variable in VncState struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org, Gerd Hoffmann Daniel P. Berrange writes: > 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; -- Alex Bennée