Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix winsock2 compatibility for libvncserver #185

Closed
wants to merge 3 commits into from
Closed

Fix winsock2 compatibility for libvncserver #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b938de3
Fix winsock2 compatibility for libvncserver
Jun 5, 2017
bf9e45b
Fix winsock2 compatibility for http server
Jun 5, 2017
44c95bd
Added read/write macros
Jun 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions libvncserver/httpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#define close closesocket
#define strcasecmp _stricmp
#define strcasecmp _stricmp
#if defined(_MSC_VER)
#include <BaseTsd.h> /* For the missing ssize_t */
#define ssize_t SSIZE_T
#define read _read /* Prevent POSIX deprecation warnings */
#endif
#define read(sock,buf,len) recv(sock,buf,len,0)
#define write(sock,buf,len) send(sock,buf,len,0)
#else
#ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h>
Expand All @@ -67,6 +69,7 @@
#include <arpa/inet.h>
#endif
#include <pwd.h>
#define INVALID_SOCKET -1
#endif

#ifdef USE_LIBWRAP
Expand Down Expand Up @@ -115,7 +118,7 @@ rfbHttpInitSockets(rfbScreenInfoPtr rfbScreen)
}

if ((rfbScreen->httpListenSock =
rfbListenOnTCPPort(rfbScreen->httpPort, rfbScreen->listenInterface)) < 0) {
rfbListenOnTCPPort(rfbScreen->httpPort, rfbScreen->listenInterface)) == INVALID_SOCKET) {
rfbLogPerror("ListenOnTCPPort");
return;
}
Expand All @@ -128,7 +131,7 @@ rfbHttpInitSockets(rfbScreenInfoPtr rfbScreen)
}

if ((rfbScreen->httpListen6Sock
= rfbListenOnTCP6Port(rfbScreen->http6Port, rfbScreen->listen6Interface)) < 0) {
= rfbListenOnTCP6Port(rfbScreen->http6Port, rfbScreen->listen6Interface)) == INVALID_SOCKET) {
/* ListenOnTCP6Port has its own detailed error printout */
return;
}
Expand All @@ -138,22 +141,22 @@ rfbHttpInitSockets(rfbScreenInfoPtr rfbScreen)
}

void rfbHttpShutdownSockets(rfbScreenInfoPtr rfbScreen) {
if(rfbScreen->httpSock>-1) {
if(rfbScreen->httpSock != INVALID_SOCKET) {
close(rfbScreen->httpSock);
FD_CLR(rfbScreen->httpSock,&rfbScreen->allFds);
rfbScreen->httpSock=-1;
rfbScreen->httpSock = INVALID_SOCKET;
}

if(rfbScreen->httpListenSock>-1) {
if(rfbScreen->httpListenSock != INVALID_SOCKET) {
close(rfbScreen->httpListenSock);
FD_CLR(rfbScreen->httpListenSock,&rfbScreen->allFds);
rfbScreen->httpListenSock=-1;
rfbScreen->httpListenSock = INVALID_SOCKET;
}

if(rfbScreen->httpListen6Sock>-1) {
if(rfbScreen->httpListen6Sock != INVALID_SOCKET) {
close(rfbScreen->httpListen6Sock);
FD_CLR(rfbScreen->httpListen6Sock,&rfbScreen->allFds);
rfbScreen->httpListen6Sock=-1;
rfbScreen->httpListen6Sock = INVALID_SOCKET;
}
}

Expand All @@ -178,15 +181,15 @@ rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen)
if (!rfbScreen->httpDir)
return;

if (rfbScreen->httpListenSock < 0)
if (rfbScreen->httpListenSock == INVALID_SOCKET)
return;

FD_ZERO(&fds);
FD_SET(rfbScreen->httpListenSock, &fds);
if (rfbScreen->httpListen6Sock >= 0) {
if (rfbScreen->httpListen6Sock != INVALID_SOCKET) {
FD_SET(rfbScreen->httpListen6Sock, &fds);
}
if (rfbScreen->httpSock >= 0) {
if (rfbScreen->httpSock != INVALID_SOCKET) {
FD_SET(rfbScreen->httpSock, &fds);
}
tv.tv_sec = 0;
Expand All @@ -204,21 +207,21 @@ rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen)
return;
}

if ((rfbScreen->httpSock >= 0) && FD_ISSET(rfbScreen->httpSock, &fds)) {
if ((rfbScreen->httpSock != INVALID_SOCKET) && FD_ISSET(rfbScreen->httpSock, &fds)) {
httpProcessInput(rfbScreen);
}

if (FD_ISSET(rfbScreen->httpListenSock, &fds) || FD_ISSET(rfbScreen->httpListen6Sock, &fds)) {
if (rfbScreen->httpSock >= 0) close(rfbScreen->httpSock);
if (rfbScreen->httpSock != INVALID_SOCKET) close(rfbScreen->httpSock);

if(FD_ISSET(rfbScreen->httpListenSock, &fds)) {
if ((rfbScreen->httpSock = accept(rfbScreen->httpListenSock, (struct sockaddr *)&addr, &addrlen)) < 0) {
if ((rfbScreen->httpSock = accept(rfbScreen->httpListenSock, (struct sockaddr *)&addr, &addrlen)) == INVALID_SOCKET) {
rfbLogPerror("httpCheckFds: accept");
return;
}
}
else if(FD_ISSET(rfbScreen->httpListen6Sock, &fds)) {
if ((rfbScreen->httpSock = accept(rfbScreen->httpListen6Sock, (struct sockaddr *)&addr, &addrlen)) < 0) {
if ((rfbScreen->httpSock = accept(rfbScreen->httpListen6Sock, (struct sockaddr *)&addr, &addrlen)) == INVALID_SOCKET) {
rfbLogPerror("httpCheckFds: accept");
return;
}
Expand All @@ -239,13 +242,13 @@ rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen)
rfbLog("Rejected HTTP connection from client %s\n",
host);
close(rfbScreen->httpSock);
rfbScreen->httpSock=-1;
rfbScreen->httpSock = INVALID_SOCKET;
return;
}
#endif
if(!rfbSetNonBlocking(rfbScreen->httpSock)) {
close(rfbScreen->httpSock);
rfbScreen->httpSock=-1;
rfbScreen->httpSock = INVALID_SOCKET;
return;
}
/*AddEnabledDevice(httpSock);*/
Expand All @@ -257,7 +260,7 @@ static void
httpCloseSock(rfbScreenInfoPtr rfbScreen)
{
close(rfbScreen->httpSock);
rfbScreen->httpSock = -1;
rfbScreen->httpSock = INVALID_SOCKET;
buf_filled = 0;
}

Expand Down Expand Up @@ -287,7 +290,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
#ifndef WIN32
char* user=getenv("USER");
#endif

cl.sock=rfbScreen->httpSock;

if (strlen(rfbScreen->httpDir) > 255) {
Expand Down Expand Up @@ -354,17 +357,17 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
rfbLog("httpd: client asked for CONNECT\n");
rfbWriteExact(&cl,PROXY_OK_STR,strlen(PROXY_OK_STR));
rfbNewClientConnection(rfbScreen,rfbScreen->httpSock);
rfbScreen->httpSock = -1;
rfbScreen->httpSock = INVALID_SOCKET;
return;
}
if (!strncmp(buf, "GET ",4) && !strncmp(strchr(buf,'/'),"/proxied.connection HTTP/1.", 27)) {
/* proxy connection */
rfbLog("httpd: client asked for /proxied.connection\n");
rfbWriteExact(&cl,PROXY_OK_STR,strlen(PROXY_OK_STR));
rfbNewClientConnection(rfbScreen,rfbScreen->httpSock);
rfbScreen->httpSock = -1;
rfbScreen->httpSock = INVALID_SOCKET;
return;
}
}
}

if (strncmp(buf, "GET ", 4)) {
Expand Down Expand Up @@ -671,4 +674,3 @@ validateString(char *str)
}
return TRUE;
}

Loading