diff options
author | Pierre Ossman <ossman@cendio.se> | 2020-05-14 18:49:39 +0200 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2020-05-21 12:59:02 +0200 |
commit | ad0f0618fa2ca13d7b916f22eccc5ba3201482cb (patch) | |
tree | 55b84c52f8ab0e7ebe672458471e4577afddc1b9 /common/rfb/HextileDecoder.cxx | |
parent | c0dac220de0186a879f1f71966a2848000f69a48 (diff) | |
download | tigervnc-ad0f0618fa2ca13d7b916f22eccc5ba3201482cb.tar.gz tigervnc-ad0f0618fa2ca13d7b916f22eccc5ba3201482cb.zip |
Change streams to be asynchronous
Major restructuring of how streams work. Neither input nor output
streams are now blocking. This avoids stalling the rest of the client or
server when a peer is slow or unresponsive.
Note that this puts an extra burden on users of streams to make sure
they are allowed to do their work once the underlying transports are
ready (e.g. monitoring fds).
Diffstat (limited to 'common/rfb/HextileDecoder.cxx')
-rw-r--r-- | common/rfb/HextileDecoder.cxx | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/common/rfb/HextileDecoder.cxx b/common/rfb/HextileDecoder.cxx index 742dfb28..34392ea8 100644 --- a/common/rfb/HextileDecoder.cxx +++ b/common/rfb/HextileDecoder.cxx @@ -44,12 +44,14 @@ HextileDecoder::~HextileDecoder() { } -void HextileDecoder::readRect(const Rect& r, rdr::InStream* is, +bool HextileDecoder::readRect(const Rect& r, rdr::InStream* is, const ServerParams& server, rdr::OutStream* os) { Rect t; size_t bytesPerPixel; + is->setRestorePoint(); + bytesPerPixel = server.pf().bpp/8; for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 16) { @@ -61,33 +63,57 @@ void HextileDecoder::readRect(const Rect& r, rdr::InStream* is, t.br.x = __rfbmin(r.br.x, t.tl.x + 16); + if (!is->hasDataOrRestore(1)) + return false; + tileType = is->readU8(); os->writeU8(tileType); if (tileType & hextileRaw) { + if (!is->hasDataOrRestore(t.area() * bytesPerPixel)) + return false; os->copyBytes(is, t.area() * bytesPerPixel); continue; } - if (tileType & hextileBgSpecified) + + if (tileType & hextileBgSpecified) { + if (!is->hasDataOrRestore(bytesPerPixel)) + return false; os->copyBytes(is, bytesPerPixel); + } - if (tileType & hextileFgSpecified) + if (tileType & hextileFgSpecified) { + if (!is->hasDataOrRestore(bytesPerPixel)) + return false; os->copyBytes(is, bytesPerPixel); + } if (tileType & hextileAnySubrects) { rdr::U8 nSubrects; + if (!is->hasDataOrRestore(1)) + return false; + nSubrects = is->readU8(); os->writeU8(nSubrects); - if (tileType & hextileSubrectsColoured) + if (tileType & hextileSubrectsColoured) { + if (!is->hasDataOrRestore(nSubrects * (bytesPerPixel + 2))) + return false; os->copyBytes(is, nSubrects * (bytesPerPixel + 2)); - else + } else { + if (!is->hasDataOrRestore(nSubrects * 2)) + return false; os->copyBytes(is, nSubrects * 2); + } } } } + + is->clearRestorePoint(); + + return true; } void HextileDecoder::decodeRect(const Rect& r, const void* buffer, |