Commit a2f45bc0 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

ui: remove unused 'wiremode' variable in VncState struct 



Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f3cf80e8

ui/vnc-auth-vencrypt.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

ui/vnc-tls.c

+0 −2
Original line number Diff line number Diff line
@@ -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 */

}

ui/vnc-tls.h

+0 −7
Original line number Diff line number Diff line
@@ -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 */

ui/vnc-ws.c

+0 −1
Original line number Diff line number Diff line
@@ -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;