[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] ui: track how much decoded data we consumed wh
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 06/14] ui: track how much decoded data we consumed when doing SASL encoding |
Date: |
Fri, 12 Jan 2018 13:58:46 +0100 |
From: "Daniel P. Berrange" <address@hidden>
When we encode data for writing with SASL, we encode the entire pending output
buffer. The subsequent write, however, may not be able to send the full encoded
data in one go though, particularly with a slow network. So we delay setting the
output buffer offset back to zero until all the SASL encoded data is sent.
Between encoding the data and completing sending of the SASL encoded data,
however, more data might have been placed on the pending output buffer. So it
is not valid to set offset back to zero. Instead we must keep track of how much
data we consumed during encoding and subtract only that amount.
With the current bug we would be throwing away some pending data without having
sent it at all. By sheer luck this did not previously cause any serious problem
because appending data to the send buffer is always an atomic action, so we
only ever throw away complete RFB protocol messages. In the case of frame buffer
updates we'd catch up fairly quickly, so no obvious problem was visible.
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc-auth-sasl.h | 1 +
ui/vnc-auth-sasl.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index cb42745a6b..b9d8de1c10 100644
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -53,6 +53,7 @@ struct VncStateSASL {
*/
const uint8_t *encoded;
unsigned int encodedLength;
+ unsigned int encodedRawLength;
unsigned int encodedOffset;
char *username;
char *mechlist;
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index 23f28280e7..761493b9b2 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -67,6 +67,7 @@ long vnc_client_write_sasl(VncState *vs)
if (err != SASL_OK)
return vnc_client_io_error(vs, -1, NULL);
+ vs->sasl.encodedRawLength = vs->output.offset;
vs->sasl.encodedOffset = 0;
}
@@ -78,7 +79,7 @@ long vnc_client_write_sasl(VncState *vs)
vs->sasl.encodedOffset += ret;
if (vs->sasl.encodedOffset == vs->sasl.encodedLength) {
- vs->output.offset = 0;
+ vs->output.offset -= vs->sasl.encodedRawLength;
vs->sasl.encoded = NULL;
vs->sasl.encodedOffset = vs->sasl.encodedLength = 0;
}
--
2.9.3
- [Qemu-devel] [PULL 08/14] ui: correctly reset framebuffer update state after processing dirty regions, (continued)
- [Qemu-devel] [PULL 08/14] ui: correctly reset framebuffer update state after processing dirty regions, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 05/14] ui: avoid pointless VNC updates if framebuffer isn't dirty, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 07/14] ui: introduce enum to track VNC client framebuffer update request state, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 02/14] ui: remove 'sync' parameter from vnc_update_client, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 01/14] vnc: fix debug spelling, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 09/14] ui: refactor code for determining if an update should be sent to the client, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 13/14] ui: add trace events related to VNC client throttling, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 12/14] ui: place a hard cap on VNC server output buffer size, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 06/14] ui: track how much decoded data we consumed when doing SASL encoding,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 14/14] ui: mix misleading comments & return types of VNC I/O helper methods, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Gerd Hoffmann, 2018/01/12
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Peter Maydell, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Daniel P. Berrange, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Paolo Bonzini, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Daniel P. Berrange, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Paolo Bonzini, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Peter Maydell, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Paolo Bonzini, 2018/01/18
- Re: [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Thomas Huth, 2018/01/18