diff options
| author | runge <runge> | 2005-11-25 07:22:43 +0000 |
|---|---|---|
| committer | runge <runge> | 2005-11-25 07:22:43 +0000 |
| commit | 8eb18f6cd8793ea55f04d3c736885b04c41aba4f (patch) | |
| tree | d447343f6495e703690217928e2783dc1636df26 /libvncserver/rfbserver.c | |
| parent | de99644d2fa630828fd6e92ed206dd63da1fdfa9 (diff) | |
| download | libtdevnc-8eb18f6cd8793ea55f04d3c736885b04c41aba4f.tar.gz libtdevnc-8eb18f6cd8793ea55f04d3c736885b04c41aba4f.zip | |
fix deadlock from rfbReleaseExtensionIterator(), fix no libz/libjpeg builds, disable tightvnc-filetransfer if no libpthread, add --without-pthread option, rm // comments, set NAME_MAX if not defined, x11vnc: throttle load if fb update requests not taking place.
Diffstat (limited to 'libvncserver/rfbserver.c')
| -rw-r--r-- | libvncserver/rfbserver.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 474351c..75516fe 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -318,6 +318,7 @@ rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen, rfbScreen->clientHead = cl; UNLOCK(rfbClientListMutex); +#ifdef LIBVNCSERVER_HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBJPEG cl->tightCompressLevel = TIGHT_DEFAULT_COMPRESSION; cl->tightQualityLevel = -1; @@ -327,6 +328,7 @@ rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen, cl->zsActive[i] = FALSE; } #endif +#endif cl->enableCursorShapeUpdates = FALSE; cl->enableCursorPosUpdates = FALSE; @@ -562,7 +564,7 @@ rfbProcessClientProtocolVersion(rfbClientPtr cl) return; } - // Chk for the minor version use either of the two standard version of RFB + /* Chk for the minor version use either of the two standard version of RFB */ cl->protocolMinorVersion = minor_; if (minor_ > rfbProtocolMinorVersion) { cl->protocolMinorVersion = rfbProtocolMinorVersion; @@ -949,17 +951,16 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) } encs++; } - rfbReleaseExtensionIterator(); - if(e) e = e->next; } + rfbReleaseExtensionIterator(); if(!handled) - rfbLog("rfbProcessClientNormalMessage: ignoring" - " unknown encoding type %d\n", - (int)enc); + rfbLog("rfbProcessClientNormalMessage: " + "ignoring unknown encoding type %d\n", + (int)enc); } } } @@ -1348,11 +1349,14 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, fu->type = rfbFramebufferUpdate; if (nUpdateRegionRects != 0xFFFF) { if(cl->screen->maxRectsPerUpdate>0 +#ifdef LIBVNCSERVER_HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBJPEG /* Tight encoding counts the rectangles differently */ && cl->preferredEncoding != rfbEncodingTight + /* XXX Should rfbEncodingCoRRE be in here? */ && cl->preferredEncoding != rfbEncodingCoRRE #endif +#endif && nUpdateRegionRects>cl->screen->maxRectsPerUpdate) { sraRegion* newUpdateRegion = sraRgnBBox(updateRegion); sraRgnDestroy(updateRegion); |