extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-02-16 10:29:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-3307_auto_downgrade_tcp' into 'master'

Browse Source 
Implement server-side downgrade from udp

Closes KASM-3307

See merge request kasm-technologies/internal/KasmVNC!68
This commit is contained in:
Matthew McClaskey 2022-10-11 16:34:51 +00:00
commit bef16c5b34
12 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/network/Udp.cxx
View File

@ -125,7 +125,7 @@ static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint
return 0;
}
UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0) {
UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0), failed(false) {
ptr = data;
end = data + UDPSTREAM_BUFSIZE;
@ -137,8 +137,10 @@ void UdpStream::flush() {
total_len += len;
if (client) {
if (udpsend(client, data, len, &id))
if (udpsend(client, data, len, &id)) {
vlog.error("Error sending udp, client gone?");
failed = true;
}
} else {
vlog.error("Tried to send udp without a client");
}
@ -151,6 +153,14 @@ void UdpStream::overrun(size_t needed) {
abort();
}
bool UdpStream::isFailed() const {
return failed;
}
void UdpStream::clearFailed() {
failed = false;
}
void wuGotHttp(const char msg[], const uint32_t msglen, char resp[]) {
WuGotHttp(host, msg, msglen, resp);
}

4
common/network/Udp.h
View File

@ -39,11 +39,15 @@ namespace network {
void setClient(WuClient *cli) {
client = cli;
}
bool isFailed() const;
void clearFailed();
private:
uint8_t data[UDPSTREAM_BUFSIZE];
WuClient *client;
size_t total_len;
uint32_t id;
bool failed;
};
}

4
common/rfb/EncodeManager.cxx
View File

@ -1716,3 +1716,7 @@ unsigned EncodeManager::scaledQuality(const Rect& rect) const {
return dynamic;
}
void EncodeManager::resetZlib() {
((TightEncoder *) encoders[encoderTight])->resetZlib();
}

2
common/rfb/EncodeManager.h
View File

@ -79,6 +79,8 @@ namespace rfb {
return scalingTime;
};
void resetZlib();
struct codecstats_t {
uint32_t ms;
uint32_t area;

2
common/rfb/SMsgHandler.h
View File

@ -96,7 +96,7 @@ namespace rfb {
virtual void supportsQEMUKeyEvent();
virtual void udpUpgrade(const char *resp) = 0;
virtual void udpDowngrade() = 0;
virtual void udpDowngrade(const bool) = 0;
ConnParams cp;
};

2
common/rfb/SMsgReader.cxx
View File

@ -346,7 +346,7 @@ void SMsgReader::readUpgradeToUdp()
}
if (!len) {
handler->udpDowngrade();
handler->udpDowngrade(false);
return;
}

11
common/rfb/TightEncoder.cxx
View File

@ -57,7 +57,7 @@ static const TightConf conf[10] = {
};
TightEncoder::TightEncoder(SConnection* conn) :
Encoder(conn, encodingTight, EncoderPlain, 256)
Encoder(conn, encodingTight, EncoderPlain, 256), zlibNeedsReset(false)
{
setCompressLevel(-1);
}
@ -166,7 +166,7 @@ void TightEncoder::writeFullColourRect(const PixelBuffer* pb, const Palette& pal
int stride, h;
os = conn->getOutStream(conn->cp.supportsUdp);
if (conn->cp.supportsUdp)
if (conn->cp.supportsUdp || zlibNeedsReset)
os->writeU8((streamId << 4) | (1 << streamId));
else
os->writeU8(streamId << 4);
@ -247,7 +247,7 @@ rdr::OutStream* TightEncoder::getZlibOutStream(int streamId, int level, size_t l
zlibStreams[streamId].setUnderlying(&memStream);
zlibStreams[streamId].setCompressionLevel(level);
if (conn->cp.supportsUdp)
if (conn->cp.supportsUdp || zlibNeedsReset)
zlibStreams[streamId].resetDeflate();
return &zlibStreams[streamId];
@ -272,6 +272,11 @@ void TightEncoder::flushZlibOutStream(rdr::OutStream* os_)
memStream.clear();
}
void TightEncoder::resetZlib()
{
zlibNeedsReset = true;
}
//
// Including BPP-dependent implementation of the encoder.
//

2
common/rfb/TightEncoder.h
View File

@ -39,6 +39,7 @@ namespace rfb {
virtual void writeSolidRect(int width, int height,
const PixelFormat& pf,
const rdr::U8* colour);
void resetZlib();
protected:
void writeMonoRect(const PixelBuffer* pb, const Palette& palette);
@ -76,6 +77,7 @@ namespace rfb {
rdr::MemOutStream memStream;
int idxZlibLevel, monoZlibLevel, rawZlibLevel;
bool zlibNeedsReset;
};
}

4
common/rfb/TightEncoderBPP.cxx
View File

@ -40,7 +40,7 @@ void TightEncoder::writeMonoRect(int width, int height,
os = conn->getOutStream(conn->cp.supportsUdp);
if (conn->cp.supportsUdp)
if (conn->cp.supportsUdp || zlibNeedsReset)
os->writeU8(((streamId | tightExplicitFilter) << 4) | (1 << streamId));
else
os->writeU8((streamId | tightExplicitFilter) << 4);
@ -130,7 +130,7 @@ void TightEncoder::writeIndexedRect(int width, int height,
os = conn->getOutStream(conn->cp.supportsUdp);
if (conn->cp.supportsUdp)
if (conn->cp.supportsUdp || zlibNeedsReset)
os->writeU8(((streamId | tightExplicitFilter) << 4) | (1 << streamId));
else
os->writeU8((streamId | tightExplicitFilter) << 4);

6
common/rfb/VNCSConnectionST.cxx
View File

@ -1769,10 +1769,12 @@ void VNCSConnectionST::udpUpgrade(const char *resp)
writer()->writeUdpUpgrade(resp);
}
void VNCSConnectionST::udpDowngrade()
void VNCSConnectionST::udpDowngrade(const bool byServer)
{
cp.supportsUdp = false;
cp.useCopyRect = true;
encodeManager.resetZlib();
vlog.info("Client %s downgrading from udp", sock->getPeerAddress());
vlog.info("Client %s downgrading from udp by %s", sock->getPeerAddress(),
byServer ? "the server" : "its own request");
}

3
common/rfb/VNCSConnectionST.h
View File

@ -196,6 +196,8 @@ namespace rfb {
return encodeManager.getScalingTime();
}
virtual void udpDowngrade(const bool byServer);
bool upgradingToUdp;
private:
@ -220,7 +222,6 @@ namespace rfb {
virtual void handleClipboardAnnounce(bool available);
virtual void handleClipboardAnnounceBinary(const unsigned num, const char mimes[][32]);
virtual void udpUpgrade(const char *resp);
virtual void udpDowngrade();
virtual void supportsLocalCursor();
virtual void supportsFence();
virtual void supportsContinuousUpdates();

5
common/rfb/VNCServerST.cxx
View File

@ -1064,6 +1064,11 @@ void VNCServerST::writeUpdate()
(*ci)->add_changed(ui.changed);
(*ci)->writeFramebufferUpdateOrClose();
if (((network::UdpStream *)(*ci)->getOutStream(true))->isFailed()) {
((network::UdpStream *)(*ci)->getOutStream(true))->clearFailed();
(*ci)->udpDowngrade(true);
}
if (apimessager) {
(*ci)->sendStats(false);
const EncodeManager::codecstats_t subjpeg = (*ci)->getJpegStats();