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

ui: remove 'ws_tls' field from VncState 



The 'ws_tls' field in VncState is only ever representing
the result of 'tlscreds != NULL' and is thus pointless.
Replace use of 'ws_tls' with a direct check against
'tlscreds'

Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475163940-26094-4-git-send-email-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 12b28067

ui/vnc.c

+1 −10
Original line number Diff line number Diff line
@@ -3029,7 +3029,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, 
    qio_channel_set_blocking(vs->ioc, false, NULL);

    if (websocket) {

        vs->websocket = 1;

        if (vd->ws_tls) {

        if (vd->tlscreds) {

            vs->ioc_tag = qio_channel_add_watch(

                vs->ioc, G_IO_IN, vncws_tls_handshake_io, vs, NULL);

        } else {
@@ -3379,9 +3379,6 @@ vnc_display_setup_auth(VncDisplay *vs, 
    if (password) {

        if (vs->tlscreds) {

            vs->auth = VNC_AUTH_VENCRYPT;

            if (websocket) {

                vs->ws_tls = true;

            }

            if (object_dynamic_cast(OBJECT(vs->tlscreds),

                                    TYPE_QCRYPTO_TLS_CREDS_X509)) {

                VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -3409,9 +3406,6 @@ vnc_display_setup_auth(VncDisplay *vs, 
    } else if (sasl) {

        if (vs->tlscreds) {

            vs->auth = VNC_AUTH_VENCRYPT;

            if (websocket) {

                vs->ws_tls = true;

            }

            if (object_dynamic_cast(OBJECT(vs->tlscreds),

                                    TYPE_QCRYPTO_TLS_CREDS_X509)) {

                VNC_DEBUG("Initializing VNC server with x509 SASL auth\n");
@@ -3439,9 +3433,6 @@ vnc_display_setup_auth(VncDisplay *vs, 
    } else {

        if (vs->tlscreds) {

            vs->auth = VNC_AUTH_VENCRYPT;

            if (websocket) {

                vs->ws_tls = true;

            }

            if (object_dynamic_cast(OBJECT(vs->tlscreds),

                                    TYPE_QCRYPTO_TLS_CREDS_X509)) {

                VNC_DEBUG("Initializing VNC server with x509 no auth\n");

ui/vnc.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct VncDisplay 
    int auth;

    int subauth; /* Used by VeNCrypt */

    int ws_auth; /* Used by websockets */

    bool ws_tls; /* Used by websockets */

    bool lossy;

    bool non_adaptive;

    QCryptoTLSCreds *tlscreds;