ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475163940-26094-4-git-send-email-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-09-29 16:45:34 +01:00 committed by Gerd Hoffmann
parent 12b2806761
commit 38e5756a61
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/vnc.c
View File

@ -3029,7 +3029,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,
qio_channel_set_blocking(vs->ioc, false, NULL); qio_channel_set_blocking(vs->ioc, false, NULL);
if (websocket) { if (websocket) {
vs->websocket = 1; vs->websocket = 1;
if (vd->ws_tls) { if (vd->tlscreds) {
vs->ioc_tag = qio_channel_add_watch( vs->ioc_tag = qio_channel_add_watch(
vs->ioc, G_IO_IN, vncws_tls_handshake_io, vs, NULL); vs->ioc, G_IO_IN, vncws_tls_handshake_io, vs, NULL);
} else { } else {
@ -3379,9 +3379,6 @@ vnc_display_setup_auth(VncDisplay *vs,
if (password) { if (password) {
if (vs->tlscreds) { if (vs->tlscreds) {
vs->auth = VNC_AUTH_VENCRYPT; vs->auth = VNC_AUTH_VENCRYPT;
if (websocket) {
vs->ws_tls = true;
}
if (object_dynamic_cast(OBJECT(vs->tlscreds), if (object_dynamic_cast(OBJECT(vs->tlscreds),
TYPE_QCRYPTO_TLS_CREDS_X509)) { TYPE_QCRYPTO_TLS_CREDS_X509)) {
VNC_DEBUG("Initializing VNC server with x509 password auth\n"); VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@ -3409,9 +3406,6 @@ vnc_display_setup_auth(VncDisplay *vs,
} else if (sasl) { } else if (sasl) {
if (vs->tlscreds) { if (vs->tlscreds) {
vs->auth = VNC_AUTH_VENCRYPT; vs->auth = VNC_AUTH_VENCRYPT;
if (websocket) {
vs->ws_tls = true;
}
if (object_dynamic_cast(OBJECT(vs->tlscreds), if (object_dynamic_cast(OBJECT(vs->tlscreds),
TYPE_QCRYPTO_TLS_CREDS_X509)) { TYPE_QCRYPTO_TLS_CREDS_X509)) {
VNC_DEBUG("Initializing VNC server with x509 SASL auth\n"); VNC_DEBUG("Initializing VNC server with x509 SASL auth\n");
@ -3439,9 +3433,6 @@ vnc_display_setup_auth(VncDisplay *vs,
} else { } else {
if (vs->tlscreds) { if (vs->tlscreds) {
vs->auth = VNC_AUTH_VENCRYPT; vs->auth = VNC_AUTH_VENCRYPT;
if (websocket) {
vs->ws_tls = true;
}
if (object_dynamic_cast(OBJECT(vs->tlscreds), if (object_dynamic_cast(OBJECT(vs->tlscreds),
TYPE_QCRYPTO_TLS_CREDS_X509)) { TYPE_QCRYPTO_TLS_CREDS_X509)) {
VNC_DEBUG("Initializing VNC server with x509 no auth\n"); VNC_DEBUG("Initializing VNC server with x509 no auth\n");

1
ui/vnc.h
View File

@ -172,7 +172,6 @@ struct VncDisplay
int auth; int auth;
int subauth; /* Used by VeNCrypt */ int subauth; /* Used by VeNCrypt */
int ws_auth; /* Used by websockets */ int ws_auth; /* Used by websockets */
bool ws_tls; /* Used by websockets */
bool lossy; bool lossy;
bool non_adaptive; bool non_adaptive;
QCryptoTLSCreds *tlscreds; QCryptoTLSCreds *tlscreds;