Commit ab4126d1 authored by dscho's avatar dscho

reverted exception fds to NULL, because of unexpected behaviour

parent c70b4dd8
...@@ -9,8 +9,8 @@ VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg ...@@ -9,8 +9,8 @@ VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
# The code for 3 Bytes/Pixel is not very efficient! # The code for 3 Bytes/Pixel is not very efficient!
FLAG24 = -DALLOW24BPP FLAG24 = -DALLOW24BPP
#OPTFLAGS=-g # -Wall OPTFLAGS=-g -Wall
OPTFLAGS=-O2 -Wall #OPTFLAGS=-O2 -Wall
CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL
RANLIB=ranlib RANLIB=ranlib
......
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
#include <vncserverctrl.h> #include <vncserverctrl.h>
#endif #endif
#ifdef DEBUGPROTO
#undef DEBUGPROTO
#define DEBUGPROTO(x) x
#else
#define DEBUGPROTO(x)
#endif
rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */ rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */
static void rfbProcessClientProtocolVersion(rfbClientPtr cl); static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
......
...@@ -188,7 +188,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec) ...@@ -188,7 +188,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
memcpy((char *)&fds, (char *)&(rfbScreen->allFds), sizeof(fd_set)); memcpy((char *)&fds, (char *)&(rfbScreen->allFds), sizeof(fd_set));
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = usec; tv.tv_usec = usec;
nfds = select(rfbScreen->maxFd + 1, &fds, NULL, &fds, &tv); nfds = select(rfbScreen->maxFd + 1, &fds, NULL, NULL /* &fds */, &tv);
if (nfds == 0) { if (nfds == 0) {
return; return;
} }
...@@ -451,7 +451,7 @@ WriteExact(cl, buf, len) ...@@ -451,7 +451,7 @@ WriteExact(cl, buf, len)
FD_SET(sock, &fds); FD_SET(sock, &fds);
tv.tv_sec = 5; tv.tv_sec = 5;
tv.tv_usec = 0; tv.tv_usec = 0;
n = select(sock+1, NULL, &fds, &fds, &tv); n = select(sock+1, NULL, &fds, NULL /* &fds */, &tv);
if (n < 0) { if (n < 0) {
rfbLogPerror("WriteExact: select"); rfbLogPerror("WriteExact: select");
UNLOCK(cl->outputMutex); UNLOCK(cl->outputMutex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment