Attachment #434232 for bug #582954




#ifdef WIN32
#define close closesocket
#include <winsock2.h>
#ifdef _MINGW32
#undef max
#endif // #ifdef _MINGW32
#else // #ifdef WIN32
#include <sys/wait.h>
#include <sys/utsname.h>

    if(listen6Socket >= 0)
      FD_SET(listen6Socket, &fds);

    r = select(rfbMax(listenSocket, listen6Socket)+1, &fds, NULL, NULL, NULL);

    if (r > 0) {
      if (FD_ISSET(listenSocket, &fds))

    FD_SET(client->listen6Sock, &fds);

  if (timeout < 0)
    r = select(rfbMax(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, NULL);
  else
    r = select(rfbMax(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, &to);

  if (r > 0)
    {

Lines 192-198 rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen) Link Here

(-)a/libvncserver/httpd.c (-1 / +1 lines)
192	}	192	}
193	tv.tv_sec = 0;	193	tv.tv_sec = 0;
194	tv.tv_usec = 0;	194	tv.tv_usec = 0;
195	nfds = select(max(rfbScreen->httpListen6Sock, max(rfbScreen->httpSock,rfbScreen->httpListenSock)) + 1, &fds, NULL, NULL, &tv);	195	nfds = select(rfbMax(rfbScreen->httpListen6Sock, rfbMax(rfbScreen->httpSock,rfbScreen->httpListenSock)) + 1, &fds, NULL, NULL, &tv);
196	if (nfds == 0) {	196	if (nfds == 0) {
197	return;	197	return;
198	}	198	}

Lines 369-375 rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen, Link Here

(-)a/libvncserver/rfbserver.c (-1 / +1 lines)
369	}	369	}
370		370
371	FD_SET(sock,&(rfbScreen->allFds));	371	FD_SET(sock,&(rfbScreen->allFds));
372	rfbScreen->maxFd = max(sock,rfbScreen->maxFd);	372	rfbScreen->maxFd = rfbMax(sock,rfbScreen->maxFd);
373		373
374	INIT_MUTEX(cl->outputMutex);	374	INIT_MUTEX(cl->outputMutex);
375	INIT_MUTEX(cl->refCountMutex);	375	INIT_MUTEX(cl->refCountMutex);





        rfbLog("Autoprobing selected TCP6 port %d\n", rfbScreen->ipv6port);
	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
	rfbScreen->maxFd = rfbMax((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
#endif
    }
    else

      rfbLog("Listening for VNC connections on TCP6 port %d\n", rfbScreen->ipv6port);  
	
      FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
      rfbScreen->maxFd = rfbMax((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
	    }
#endif


	rfbLog("Listening for VNC connections on TCP port %d\n", rfbScreen->port);  

	FD_SET(rfbScreen->udpSock, &(rfbScreen->allFds));
	rfbScreen->maxFd = rfbMax((int)rfbScreen->udpSock,rfbScreen->maxFd);
    }
}



    /* AddEnabledDevice(sock); */
    FD_SET(sock, &rfbScreen->allFds);
    rfbScreen->maxFd = rfbMax(sock,rfbScreen->maxFd);

    return sock;
}

Lines 93-100 Link Here

(-)a/rfb/rfbproto.h (-1 / +1 lines)
93	#define strncasecmp _strnicmp	93	#define strncasecmp _strnicmp
94	#endif	94	#endif
95		95
		96	#define rfbMax(a,b) (((a)>(b))?(a):(b))
96	#if !defined(WIN32) \|\| defined(__MINGW32__)	97	#if !defined(WIN32) \|\| defined(__MINGW32__)
97	#define max(a,b) (((a)>(b))?(a):(b))
98	#ifdef LIBVNCSERVER_HAVE_SYS_TIME_H	98	#ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
99	#include <sys/time.h>	99	#include <sys/time.h>
100	#endif	100	#endif

Return to bug 582954

Lines 193-199 rfbInitSockets(rfbScreenInfoPtr rfbScreen) Link Here

(-)a/libvncserver/sockets.c (-4 / +4 lines)
193		193
194	rfbLog("Autoprobing selected TCP6 port %d\n", rfbScreen->ipv6port);	194	rfbLog("Autoprobing selected TCP6 port %d\n", rfbScreen->ipv6port);
195	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));	195	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
196	rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);	196	rfbScreen->maxFd = rfbMax((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
197	#endif	197	#endif
198	}	198	}
199	else	199	else
Lines 220-226 rfbInitSockets(rfbScreenInfoPtr rfbScreen) Link Here
220	rfbLog("Listening for VNC connections on TCP6 port %d\n", rfbScreen->ipv6port);	220	rfbLog("Listening for VNC connections on TCP6 port %d\n", rfbScreen->ipv6port);
221		221
222	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));	222	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
223	rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);	223	rfbScreen->maxFd = rfbMax((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
224	}	224	}
225	#endif	225	#endif
226		226
Lines 236-242 rfbInitSockets(rfbScreenInfoPtr rfbScreen) Link Here
236	rfbLog("Listening for VNC connections on TCP port %d\n", rfbScreen->port);	236	rfbLog("Listening for VNC connections on TCP port %d\n", rfbScreen->port);
237		237
238	FD_SET(rfbScreen->udpSock, &(rfbScreen->allFds));	238	FD_SET(rfbScreen->udpSock, &(rfbScreen->allFds));
239	rfbScreen->maxFd = max((int)rfbScreen->udpSock,rfbScreen->maxFd);	239	rfbScreen->maxFd = rfbMax((int)rfbScreen->udpSock,rfbScreen->maxFd);
240	}	240	}
241	}	241	}
242		242
Lines 563-569 rfbConnect(rfbScreenInfoPtr rfbScreen, Link Here
563		563
564	/* AddEnabledDevice(sock); */	564	/* AddEnabledDevice(sock); */
565	FD_SET(sock, &rfbScreen->allFds);	565	FD_SET(sock, &rfbScreen->allFds);
566	rfbScreen->maxFd = max(sock,rfbScreen->maxFd);	566	rfbScreen->maxFd = rfbMax(sock,rfbScreen->maxFd);
567		567
568	return sock;	568	return sock;
569	}	569	}

Lines 30-38 Link Here

(-)a/libvncclient/listen.c (-6 / +3 lines)
30	#ifdef WIN32	30	#ifdef WIN32
31	#define close closesocket	31	#define close closesocket
32	#include <winsock2.h>	32	#include <winsock2.h>
33	#ifdef _MINGW32
34	#undef max
35	#endif // #ifdef _MINGW32
36	#else // #ifdef WIN32	33	#else // #ifdef WIN32
37	#include <sys/wait.h>	34	#include <sys/wait.h>
38	#include <sys/utsname.h>	35	#include <sys/utsname.h>
Lines 99-105 listenForIncomingConnections(rfbClient* client) Link Here
99	if(listen6Socket >= 0)	96	if(listen6Socket >= 0)
100	FD_SET(listen6Socket, &fds);	97	FD_SET(listen6Socket, &fds);
101		98
102	r = select(max(listenSocket, listen6Socket)+1, &fds, NULL, NULL, NULL);	99	r = select(rfbMax(listenSocket, listen6Socket)+1, &fds, NULL, NULL, NULL);
103		100
104	if (r > 0) {	101	if (r > 0) {
105	if (FD_ISSET(listenSocket, &fds))	102	if (FD_ISSET(listenSocket, &fds))
Lines 195-203 listenForIncomingConnectionsNoFork(rfbClient* client, int timeout) Link Here
195	FD_SET(client->listen6Sock, &fds);	192	FD_SET(client->listen6Sock, &fds);
196		193
197	if (timeout < 0)	194	if (timeout < 0)
198	r = select(max(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, NULL);	195	r = select(rfbMax(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, NULL);
199	else	196	else
200	r = select(max(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, &to);	197	r = select(rfbMax(client->listenSock, client->listen6Sock) +1, &fds, NULL, NULL, &to);
201		198
202	if (r > 0)	199	if (r > 0)
203	{	200	{