From 7b45a00d05cc936d28e36b95932864e8cc095968 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 17 Mar 2015 13:42:59 +0000 Subject: ui: remove separate gnutls_session for websockets server The previous change to the auth scheme handling guarantees we can never have nested TLS sessions in the VNC websockets server. Thus we can remove the separate gnutls_session instance. Signed-off-by: Daniel P. Berrange Signed-off-by: Gerd Hoffmann --- ui/vnc-ws.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/vnc-ws.c') diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 0fcce4e378..5f9fcc42db 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -26,12 +26,12 @@ static int vncws_start_tls_handshake(struct VncState *vs) { - int ret = gnutls_handshake(vs->ws_tls.session); + int ret = gnutls_handshake(vs->tls.session); if (ret < 0) { if (!gnutls_error_is_fatal(ret)) { VNC_DEBUG("Handshake interrupted (blocking)\n"); - if (!gnutls_record_get_direction(vs->ws_tls.session)) { + if (!gnutls_record_get_direction(vs->tls.session)) { qemu_set_fd_handler(vs->csock, vncws_tls_handshake_io, NULL, vs); } else { -- cgit v1.2.1