[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/9] ui: remove 'ws_tls' field from VncState
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH 3/9] ui: remove 'ws_tls' field from VncState |
Date: |
Thu, 29 Sep 2016 16:45:34 +0100 |
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 <address@hidden>
---
ui/vnc.c | 11 +----------
ui/vnc.h | 1 -
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 45a23d3..83a608b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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");
diff --git a/ui/vnc.h b/ui/vnc.h
index a0519cc..223af38 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -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;
--
2.7.4
- [Qemu-devel] [PATCH 0/9] Misc VNC server code cleanups, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 1/9] ui: remove misleading comment from vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 2/9] ui: remove 'enabled' and 'ws_enabled' fields from VncState, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 3/9] ui: remove 'ws_tls' field from VncState,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH 5/9] ui: refactor method for setting up VncDisplay auth types, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 4/9] ui: rename misleading 'VncDisplay' variables, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 7/9] ui: remove bogus call to reset_keys() in vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 8/9] ui: move some initialization out of vnc_init_state, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 6/9] ui: remove bogus call to graphic_hw_update() in vnc_listen_io, Daniel P. Berrange, 2016/09/29
- [Qemu-devel] [PATCH 9/9] ui: rename vnc_init_state to vnc_start_protocol, Daniel P. Berrange, 2016/09/29