From 0860c4951fd1b6d90158c35ead4a4c33635802bb Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Tue, 16 Aug 2011 14:02:32 +0200 Subject: websockets: Better disconnect detection. If the only thing we are waiting on is a WebSockets terminator, then remove it from the stream early on in rfbProcessClientNormalMessage. Signed-off-by: Johannes Schindelin --- libvncserver/rfbserver.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libvncserver/rfbserver.c') diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 1df4fee..491a438 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -1844,6 +1844,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) /* With Base64 encoding we need at least 4 bytes */ n = recv(cl->sock, encBuf, 4, MSG_PEEK); if ((n > 0) && (n < 4)) { + if (encBuf[0] == '\xff') { + /* Make sure we don't miss a client disconnect on an end frame + * marker */ + n = read(cl->sock, encBuf, 1); + } return; } } -- cgit v1.2.3