X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fhttpd.c;h=2bed984203ebbdd907eb480daa8ea20749f2c682;hb=72fe063cf6771a3645d8cef0ae4426ad72b16917;hp=9a56997ac4ee1c0b61c82719940b402b5764446a;hpb=23e7e3ae2b2adfa49635495c0950b76e17987c93;p=deb_shairplay.git

diff --git a/src/lib/httpd.c b/src/lib/httpd.c
index 9a56997..2bed984 100644
--- a/src/lib/httpd.c
+++ b/src/lib/httpd.c
@@ -39,6 +39,7 @@ struct httpd_s {
 	int use_rtsp;
 
 	int max_connections;
+	int open_connections;
 	http_connection_t *connections;
 
 	/* These variables only edited mutex locked */
@@ -109,12 +110,14 @@ httpd_add_connection(httpd_t *httpd, int fd, unsigned char *local, int local_len
 		}
 	}
 	if (i == httpd->max_connections) {
-		logger_log(httpd->logger, LOGGER_INFO, "Max connections reached\n");
+		/* This code should never be reached, we do not select server_fd when full */
+		logger_log(httpd->logger, LOGGER_INFO, "Max connections reached");
 		shutdown(fd, SHUT_RDWR);
 		closesocket(fd);
 		return;
 	}
 
+	httpd->open_connections++;
 	httpd->connections[i].socket_fd = fd;
 	httpd->connections[i].connected = 1;
 	httpd->connections[i].user_data = httpd->callbacks.conn_init(httpd->callbacks.opaque, local, local_len, remote, remote_len);
@@ -131,6 +134,7 @@ httpd_remove_connection(httpd_t *httpd, http_connection_t *connection)
 	shutdown(connection->socket_fd, SHUT_WR);
 	closesocket(connection->socket_fd);
 	connection->connected = 0;
+	httpd->open_connections--;
 }
 
 static THREAD_RETVAL
@@ -161,8 +165,10 @@ httpd_thread(void *arg)
 
 		/* Get the correct nfds value and set rfds */
 		FD_ZERO(&rfds);
-		FD_SET(httpd->server_fd, &rfds);
-		nfds = httpd->server_fd+1;
+		if (httpd->open_connections < httpd->max_connections) {
+			FD_SET(httpd->server_fd, &rfds);
+			nfds = httpd->server_fd+1;
+		}
 		for (i=0; i<httpd->max_connections; i++) {
 			int socket_fd;
 			if (!httpd->connections[i].connected) {
@@ -181,7 +187,7 @@ httpd_thread(void *arg)
 			continue;
 		} else if (ret == -1) {
 			/* FIXME: Error happened */
-			logger_log(httpd->logger, LOGGER_INFO, "Error in select\n");
+			logger_log(httpd->logger, LOGGER_INFO, "Error in select");
 			break;
 		}
 
@@ -208,7 +214,7 @@ httpd_thread(void *arg)
 				continue;
 			}
 
-			logger_log(httpd->logger, LOGGER_INFO, "Accepted client on socket %d\n", fd);
+			logger_log(httpd->logger, LOGGER_INFO, "Accepted client on socket %d", fd);
 			local = netutils_get_address(&local_saddr, &local_len);
 			remote = netutils_get_address(&remote_saddr, &remote_len);
 
@@ -230,10 +236,10 @@ httpd_thread(void *arg)
 				assert(connection->request);
 			}
 
-			logger_log(httpd->logger, LOGGER_DEBUG, "Receiving on socket %d\n", httpd->connections[i].socket_fd);
+			logger_log(httpd->logger, LOGGER_DEBUG, "Receiving on socket %d", connection->socket_fd);
 			ret = recv(connection->socket_fd, buffer, sizeof(buffer), 0);
 			if (ret == 0) {
-				logger_log(httpd->logger, LOGGER_INFO, "Connection closed\n");
+				logger_log(httpd->logger, LOGGER_INFO, "Connection closed for socket %d", connection->socket_fd);
 				httpd_remove_connection(httpd, connection);
 				continue;
 			}
@@ -241,7 +247,7 @@ httpd_thread(void *arg)
 			/* Parse HTTP request from data read from connection */
 			http_request_add_data(connection->request, buffer, ret);
 			if (http_request_has_error(connection->request)) {
-				logger_log(httpd->logger, LOGGER_INFO, "Error in parsing: %s\n", http_request_get_error_name(connection->request));
+				logger_log(httpd->logger, LOGGER_INFO, "Error in parsing: %s", http_request_get_error_name(connection->request));
 				httpd_remove_connection(httpd, connection);
 				continue;
 			}
@@ -268,13 +274,13 @@ httpd_thread(void *arg)
 						ret = send(connection->socket_fd, data+written, datalen-written, 0);
 						if (ret == -1) {
 							/* FIXME: Error happened */
-							logger_log(httpd->logger, LOGGER_INFO, "Error in sending data\n");
+							logger_log(httpd->logger, LOGGER_INFO, "Error in sending data");
 							break;
 						}
 						written += ret;
 					}
 				} else {
-					logger_log(httpd->logger, LOGGER_INFO, "Didn't get response\n");
+					logger_log(httpd->logger, LOGGER_INFO, "Didn't get response");
 				}
 				http_response_destroy(response);
 			}
@@ -288,11 +294,11 @@ httpd_thread(void *arg)
 		if (!connection->connected) {
 			continue;
 		}
-		logger_log(httpd->logger, LOGGER_INFO, "Removing connection\n");
+		logger_log(httpd->logger, LOGGER_INFO, "Removing connection for socket %d", connection->socket_fd);
 		httpd_remove_connection(httpd, connection);
 	}
 
-	logger_log(httpd->logger, LOGGER_INFO, "Exiting thread\n");
+	logger_log(httpd->logger, LOGGER_INFO, "Exiting HTTP thread");
 
 	return 0;
 }
@@ -311,16 +317,21 @@ httpd_start(httpd_t *httpd, unsigned short *port)
 
 	httpd->server_fd = netutils_init_socket(port, 1, 0);
 	if (httpd->server_fd == -1) {
-		logger_log(httpd->logger, LOGGER_INFO, "Error initialising socket %d\n", SOCKET_GET_ERROR());
+		logger_log(httpd->logger, LOGGER_INFO, "Error initialising IPv6 socket %d", SOCKET_GET_ERROR());
+		logger_log(httpd->logger, LOGGER_INFO, "Attempting to fall back to IPv4");
+		httpd->server_fd = netutils_init_socket(port, 0, 0);
+	}
+	if (httpd->server_fd == -1) {
+		logger_log(httpd->logger, LOGGER_INFO, "Error initialising socket %d", SOCKET_GET_ERROR());
 		MUTEX_UNLOCK(httpd->run_mutex);
 		return -1;
 	}
 	if (listen(httpd->server_fd, 5) == -1) {
-		logger_log(httpd->logger, LOGGER_INFO, "Error listening to socket\n");
+		logger_log(httpd->logger, LOGGER_INFO, "Error listening to socket");
 		MUTEX_UNLOCK(httpd->run_mutex);
 		return -2;
 	}
-	logger_log(httpd->logger, LOGGER_INFO, "Initialized server socket\n");
+	logger_log(httpd->logger, LOGGER_INFO, "Initialized server socket");
 
 	/* Set values correctly and create new thread */
 	httpd->running = 1;
@@ -331,6 +342,20 @@ httpd_start(httpd_t *httpd, unsigned short *port)
 	return 1;
 }
 
+int
+httpd_is_running(httpd_t *httpd)
+{
+	int running;
+
+	assert(httpd);
+
+	MUTEX_LOCK(httpd->run_mutex);
+	running = httpd->running || !httpd->joined;
+	MUTEX_UNLOCK(httpd->run_mutex);
+
+	return running;
+}
+
 void
 httpd_stop(httpd_t *httpd)
 {