Commit c31476a1 authored by gkiagia's avatar gkiagia

Fix rfbProcessNewConnection to return some value instead of void.

BUG: 256891

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork/krfb/libvncserver@1196995 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
parent 22946807
...@@ -971,7 +971,7 @@ extern rfbBool rfbSendTextChatMessage(rfbClientPtr cl, uint32_t length, char *bu ...@@ -971,7 +971,7 @@ extern rfbBool rfbSendTextChatMessage(rfbClientPtr cl, uint32_t length, char *bu
* Additions for Qt event loop integration * Additions for Qt event loop integration
* Original idea taken from vino. * Original idea taken from vino.
*/ */
void rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen); rfbBool rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen);
rfbBool rfbUpdateClient(rfbClientPtr cl); rfbBool rfbUpdateClient(rfbClientPtr cl);
......
...@@ -264,7 +264,8 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec) ...@@ -264,7 +264,8 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
if (rfbScreen->listenSock != -1 && FD_ISSET(rfbScreen->listenSock, &fds)) { if (rfbScreen->listenSock != -1 && FD_ISSET(rfbScreen->listenSock, &fds)) {
rfbProcessNewConnection(rfbScreen); if (!rfbProcessNewConnection(rfbScreen))
return -1;
FD_CLR(rfbScreen->listenSock, &fds); FD_CLR(rfbScreen->listenSock, &fds);
if (--nfds == 0) if (--nfds == 0)
...@@ -326,7 +327,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec) ...@@ -326,7 +327,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
return result; return result;
} }
void rfbBool
rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen) rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
{ {
const int one = 1; const int one = 1;
...@@ -337,14 +338,14 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen) ...@@ -337,14 +338,14 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
if ((sock = accept(rfbScreen->listenSock, if ((sock = accept(rfbScreen->listenSock,
(struct sockaddr *)&addr, &addrlen)) < 0) { (struct sockaddr *)&addr, &addrlen)) < 0) {
rfbLogPerror("rfbCheckFds: accept"); rfbLogPerror("rfbCheckFds: accept");
return -1; return FALSE;
} }
#ifndef WIN32 #ifndef WIN32
if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
rfbLogPerror("rfbCheckFds: fcntl"); rfbLogPerror("rfbCheckFds: fcntl");
closesocket(sock); closesocket(sock);
return -1; return FALSE;
} }
#endif #endif
...@@ -352,7 +353,7 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen) ...@@ -352,7 +353,7 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
(char *)&one, sizeof(one)) < 0) { (char *)&one, sizeof(one)) < 0) {
rfbLogPerror("rfbCheckFds: setsockopt"); rfbLogPerror("rfbCheckFds: setsockopt");
closesocket(sock); closesocket(sock);
return -1; return FALSE;
} }
#ifdef USE_LIBWRAP #ifdef USE_LIBWRAP
...@@ -361,13 +362,15 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen) ...@@ -361,13 +362,15 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
rfbLog("Rejected connection from client %s\n", rfbLog("Rejected connection from client %s\n",
inet_ntoa(addr.sin_addr)); inet_ntoa(addr.sin_addr));
closesocket(sock); closesocket(sock);
return -1; return FALSE;
} }
#endif #endif
rfbLog("Got connection from client %s\n", inet_ntoa(addr.sin_addr)); rfbLog("Got connection from client %s\n", inet_ntoa(addr.sin_addr));
rfbNewClient(rfbScreen,sock); rfbNewClient(rfbScreen,sock);
return TRUE;
} }
......
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