Fixed compiler warnings.

Signed-off-by: David Galeano <davidgaleano@turbulenz.biz>

diff --git a/lib/client-handshake.c b/lib/client-handshake.c
index d572b6b..77c6120 100644 (file)
--- a/lib/client-handshake.c
+++ b/lib/client-handshake.c
@@ -66,7 +66,7 @@ struct libwebsocket * __libwebsocket_client_connect_2(
 
        /* Disable Nagle */
 #if !defined(__APPLE__)
-       setsockopt(wsi->sock, SOL_TCP, TCP_NODELAY, &opt, sizeof(opt));
+       setsockopt(wsi->sock, SOL_TCP, TCP_NODELAY, (const void *)&opt, sizeof(opt));
 #else
     tcp_proto = getprotobyname("TCP");
     setsockopt(wsi->sock, tcp_proto->p_proto, TCP_NODELAY, &opt, sizeof(opt));

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 80ab9c1..5376ea1 100644 (file)
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -1512,6 +1512,11 @@ libwebsocket_service_fd(struct libwebsocket_context *context,
                if (!pollfd->revents & POLLIN)
                        break;
 
+               if (context->fds_count >= MAX_CLIENTS) {
+                       fprintf(stderr, "too busy to accept new client\n");
+                       break;
+               }
+
                /* listen socket got an unencrypted connection... */
 
                clilen = sizeof(cli_addr);
@@ -1524,19 +1529,9 @@ libwebsocket_service_fd(struct libwebsocket_context *context,
 
                /* Disable Nagle */
                opt = 1;
-               setsockopt(accept_fd, IPPROTO_TCP, TCP_NODELAY, &opt,
+        setsockopt(accept_fd, IPPROTO_TCP, TCP_NODELAY, (const void *)&opt,
                                sizeof(opt));
 
-               if (context->fds_count >= MAX_CLIENTS) {
-                       fprintf(stderr, "too busy to accept new client\n");
-#ifdef WIN32
-                       closesocket(accept_fd);
-#else
-                       close(accept_fd);
-#endif
-                       break;
-               }
-
                /*
                 * look at who we connected to and give user code a chance
                 * to reject based on client IP.  There's no protocol selected
@@ -2757,12 +2752,12 @@ libwebsocket_create_context(int port, const char *interf,
                }
 
                /* allow us to restart even if old sockets in TIME_WAIT */
-               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt, sizeof(opt));
 
 
                /* Disable Nagle */
                opt = 1;
-               setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
+               setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (const void *)&opt, sizeof(opt));
 
                bzero((char *) &serv_addr, sizeof(serv_addr));
                serv_addr.sin_family = AF_INET;
@@ -2833,7 +2828,7 @@ libwebsocket_create_context(int port, const char *interf,
                }
 
                /* allow us to restart even if old sockets in TIME_WAIT */
-               setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+               setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt, sizeof(opt));
 
                bzero((char *) &serv_addr, sizeof(serv_addr));
                serv_addr.sin_family = AF_INET;