summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * websockets: restore errno after logging an errorGernot Tenchio2012-01-121-6/+17
| |
| * cmake: adapted to latest websocket crypto changesGernot Tenchio2012-01-121-11/+13
| |
* | Small changes to LibNVCClient doxygen documentation.Christian Beier2011-12-151-22/+23
| |
* | Merge branch 'master' of https://github.com/watkipet/libvncserverChristian Beier2011-12-151-1/+215
|\ \
| * | Added comments.Peter Watkins2011-10-261-1/+215
| | |
* | | Fix build error when libpng is available, but libjpeg is not.Christian Beier2011-12-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The png stuff in tight.c depends on code in tight.c that uses libjpeg features. We could probably seperate that, but for now the dependency for 'tight' goes: PNG depends on JPEG depends on ZLIB. This is reflected in Makefile.am now. NB: Building tight.c with JPEG but without PNG is still possible, but nor the other way around.
* | | Use AM_SILENT_RULES only when it's actually available.Christian Beier2011-12-011-1/+1
| | | | | | | | | | | | | | | Otherwise building breaks with older make versions. Happens on OS X 10.6 for instance.
* | | Merge branch 'included-novnc'Christian Beier2011-11-1774-56/+7514
|\ \ \
| * | | Move the java stuff into webclients/java-applet.Christian Beier2011-11-0922-6/+11
| | | |
| * | | Rename 'classes' dir to 'webclients'.Christian Beier2011-11-0970-10/+10
| | | |
| * | | novnc client: use the client's notion about the server hostname instead of ↵Christian Beier2011-11-092-5/+14
| | | | | | | | | | | | | | | | what the server thinks.
| * | | Fix tiny typo.Christian Beier2011-11-091-1/+1
| | | |
| * | | httpd: fix sending of binary data such as images.Christian Beier2011-10-061-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this simply by omitting the content-type and let the browser decide upon the mime-type of the sent file. Only exception is 'index.vnc', where we do set the content-type since some browsers fail to detect it's html when it's ending in '.vnc' Also, remove superfluous #defines. We close the connection always.
| * | | Fix typo && use proper website.Christian Beier2011-10-061-1/+1
| | | |
| * | | Add noVNC HTML5 client connect possibility to our http server.Christian Beier2011-10-0444-8/+7462
| | | | | | | | | | | | | | | | Pure JavaScript, no Java plugin required anymore! (But a recent browser...)
* | | | Add 0.9.8.2 NEWS entry.Christian Beier2011-11-091-0/+3
| | | |
* | | | When GetCredential() callback is not set, don't use authentications ↵Christian Beier2011-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | requiring it. The auth methods that employ Getcredential() will only be used if the client's GetCredential callback is actually set.
* | | | Update ChangeLog for 0.9.8.1.Christian Beier2011-11-081-0/+18
| | | |
* | | | Update version number in autotools && cmake, NEWS entry.Christian Beier2011-11-083-3/+6
| | | |
* | | | Fix deadlock in threaded mode when using nested rfbClientIteratorNext() calls.Christian Beier2011-10-261-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lengthy explanation follows... First, the scenario before this patch: We have three clients 1,2,3 connected. The main thread loops through them using rfbClientIteratorNext() (loop L1) and is currently at client 2 i.e. client 2's cl_2->refCount is 1. At this point we need to loop again through the clients, with cl_2->refCount == 1, i.e. do a loop L2 nested within loop L1. BUT: Now client 2 disconnects, it's clientInput thread terminates its clientOutput thread and calls rfbClientConnectionGone(). This LOCKs clientListMutex and WAITs for cl_2->refCount to become 0. This means this thread waits for the main thread to release cl_2. Waiting, with clientListMutex LOCKed! Meanwhile, the main thread is about to begin the inner rfbClientIteratorNext() loop L2. The first call to rfbClientIteratorNext() LOCKs clientListMutex. BAAM. This mutex is locked by cl2's clientInput thread and is only released when cl_2->refCount becomes 0. The main thread would decrement cl_2->refCount when it would continue with loop L1. But it's waiting for cl2's clientInput thread to release clientListMutex. Which never happens since this one's waiting for the main thread to decrement cl_2->refCount. DEADLOCK. Now, situation with this patch: Same as above, but when client 2 disconnects it's clientInput thread rfbClientConnectionGone(). This again LOCKs clientListMutex, removes cl_2 from the linked list and UNLOCKS clientListMutex. The WAIT for cl_2->refCount to become 0 is _after_ that. Waiting, with clientListMutex UNLOCKed! Therefore, the main thread can continue, do the inner loop L2 (now only looping through 1,3 - 2 was removed from the linked list) and continue with loop L1, finally decrementing cl_2->refCount, allowing cl2's clientInput thread to continue and terminate. The resources held by cl2 are not free()'d by rfbClientConnectionGone until cl2->refCount becomes 0, i.e. loop L1 has released cl2.
* | | | Update AUTHORSJohannes Schindelin2011-10-161-12/+2
| | | | | | | | | | | | | | | | Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | | | Fix memory leakGeorge Fleury2011-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was debbuging some code tonight and i found a pointer that is not been freed, so i think there is maybe a memory leak, so it is... there is the malloc caller reverse order: ( malloc cl->statEncList ) <- rfbStatLookupEncoding <- rfbStatRecordEncodingSent <- rfbSendCursorPos <- rfbSendFramebufferUpdate <- rfbProcessEvents I didnt look the whole libvncserver api, but i am using rfbReverseConnection with rfbProcessEvents, and then when the client connection dies, i am calling a rfbShutdownServer and rfbScreenCleanup, but the malloc at rfbStatLookupEncoding isnt been freed. So to free the stats i added a rfbResetStats(cl) after rfbPrintStats(cl) at rfbClientConnectionGone in rfbserver.c before free the cl pointer. (at rfbserver.c line 555). And this, obviously, is correcting the memory leak. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | | | Hopefully fix the crash when updating from 0.9.7 or earlierJohannes Schindelin2011-10-121-4/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For backwards-compatibility reasons, we can only add struct members to the end. That way, existing callers still can use newer libraries, as the structs are always allocated by the library (and therefore guaranteed to have the correct size) and still rely on the same position of the parts the callers know about. Reported by Luca Falavigna. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | | SDLvncviewer: make it resizable by defaultJohannes Schindelin2011-10-091-1/+3
|/ / | | | | | | | | | | | | | | | | I got annoyed having to specify -resizable all the time; I never use it in another mode anymore, since I am on a netbook. The option -no-resizable was added to be able to switch off that feature. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | Merge branch 'websockets'Christian Beier2011-10-0426-159/+3441
|\ \
| * | This build warning is a libvncserver one, not for x11vnc.Christian Beier2011-10-041-17/+14
| | | | | | | | | | | | | | | Also, make it warn more generally when no known encryption lib is available.
| * | Merge branch 'websockets' of https://github.com/kanaka/libvncserver into ↵Christian Beier2011-09-231-2/+2
| |\ \ | | |/ | | | | | | websockets
| | * md5: forced to use function names with leading underscoresGernot Tenchio2011-09-211-2/+2
| | | | | | | | | | | | | | | | | | Commented out the surrounding '#ifdef _LIBC' to build md5.o with leading underscores. This is required to match the prototypes defined in md5.h.
| * | Merge branch 'websockets' of https://github.com/kanaka/libvncserver into ↵Christian Beier2011-09-201-3/+3
| |\ \ | | |/ | | | | | | websockets
| | * rfbcrypto_included: fix c&p errorsGernot Tenchio2011-09-201-3/+3
| | |
| * | Merge remote branch 'kanaka/websockets' into websocketsChristian Beier2011-09-209-37/+217
| |\ \ | | |/ | | | | | | | | | Conflicts, resolved manually: libvncserver/Makefile.am
| | * rfbcrypto_polarssl: it was way to late last night...Gernot Tenchio2011-09-201-2/+2
| | |
| | * Add support for different crypto implementationsGernot Tenchio2011-09-197-37/+212
| | |
| | * Autotools: Fix OpenSSL and GnuTLS advertisement.Christian Beier2011-09-192-5/+6
| | |
| | * Fix libvncserver GnuTLS init.Christian Beier2011-09-191-1/+1
| | | | | | | | | | | | | | | gnutls_certificate_set_x509_trust_file() returns the number of processed certs and _not_ GNUTLS_E_SUCCESS (0) on success!
| | * Update AUTHORS regarding the websocket guys.Christian Beier2011-09-192-1/+2
| | |
| | * configure: Add AM_SILENT_RULESGernot Tenchio2011-09-191-0/+1
| | | | | | | | | | | | | | | Working with “silent make mode” makes debugging a lot of easier since warnings wont shadowed by useless compiler noise
| | * cmake: set SOVERSIONGernot Tenchio2011-09-191-0/+4
| | |
| * | Autotools: Fix OpenSSL and GnuTLS advertisement.Christian Beier2011-09-112-5/+6
| | |
| * | Fix libvncserver GnuTLS init.Christian Beier2011-09-111-1/+1
| | | | | | | | | | | | | | | gnutls_certificate_set_x509_trust_file() returns the number of processed certs and _not_ GNUTLS_E_SUCCESS (0) on success!
| * | Update AUTHORS regarding the websocket guys.Christian Beier2011-09-112-1/+2
| |/
| * websocket: Use a single buffer for both, encoding and decodingGernot Tenchio2011-09-081-16/+15
| |
| * Merge branch 'kanaka/websockets' into websocketsGernot Tenchio2011-08-306-251/+684
| |\ | | | | | | | | | | | | Conflicts: libvncserver/websockets.c
| | * rfbssl_gnutls: Merge rfbssl_peek/rfbssl_read into one functionGernot Tenchio2011-08-301-53/+35
| | |
| | * websockets: fix webSocketCheckDisconnect()Gernot Tenchio2011-08-301-1/+1
| | | | | | | | | | | | Do not consume the peeked data if no close frame was detected.
| | * websockets: use 32bit Xor in webSocketsDecodeHybi()Gernot Tenchio2011-08-291-5/+10
| | |
| | * cmake: use sha1.c for websocket buildsGernot Tenchio2011-08-291-0/+1
| | |
| | * Add sha1.*. Remove UTF-8 encode. Protocol handling.Joel Martin2011-08-254-176/+638
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common/sha1.h and common/sha1.c so that we have the SHA routines even if openssl is not available. From the IETF SHA RFC example code. Remove the UTF-8 encoding hack. This was really just an experiment. If the protocol passed in the handshake has "binary" then don't base64 encode for the HyBi protocol. This will allow noVNC to request the binary data be passed raw and not base64 encoded. Unfortunately, the client doesn't speak first in VNC protocol (bad original design). If it did then we could determine whether to base64 encode or not based on the first HyBi frame from the client and whether the binary bit is set or not. Oh well. Misc Cleanup: - Always free response and buf in handshake routine. - Remove some unused variables.
| * | websockets: nothing to worry aboutGernot Tenchio2011-08-251-4/+5
| | |
| * | websockets: added gcrypt based sha1 digest funtionGernot Tenchio2011-08-251-0/+15
| | |