X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=c6b9decca941489c82b629982ddb6d6dbdb2ea33;hp=fb9fd9b3d1b42a1f3841ef88e261178e66efc302;hb=HEAD;hpb=b0ec08945c28e35558ed85691b57f314724f7613

diff --git a/http_send.c b/http_send.c
index fb9fd9b3..429b4662 100644
--- a/http_send.c
+++ b/http_send.c
@@ -16,13 +16,14 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
+#include "net.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
-#include "net.h"
+#include "close_on_fork.h"
 #include "fd.h"
 #include "chunk_queue.h"
 
@@ -75,6 +76,13 @@ static void http_shutdown_clients(void)
 	shutdown_clients(hss);
 }
 
+static void http_shutdown(void)
+{
+	http_shutdown_clients();
+	generic_acl_deplete(&hss->acl);
+	free_sender_status(hss);
+}
+
 static int queue_chunk_or_shutdown(struct sender_client *sc,
 		struct sender_status *ss, const char *buf, size_t num_bytes)
 {
@@ -150,7 +158,7 @@ static void http_send(long unsigned current_chunk,
 	}
 }
 
-static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
+static void http_post_monitor(__a_unused struct sched *s)
 {
 	struct sender_client *sc, *tmp;
 	struct private_http_sender_data *phsd;
@@ -162,7 +170,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 		case HTTP_STREAMING: /* nothing to do */
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
-			ret = read_pattern(sc->fd, HTTP_GET_MSG, MAXLINE, rfds);
+			ret = read_and_compare(sc->fd, HTTP_GET_MSG);
 			if (ret < 0)
 				phsd->status = HTTP_INVALID_GET_REQUEST;
 			else if (ret > 0) {
@@ -180,34 +188,38 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 			break;
 		}
 	}
-	sc = accept_sender_client(hss, rfds);
+	sc = accept_sender_client(hss);
 	if (!sc)
 		return;
-	phsd = para_malloc(sizeof(*phsd));
+	phsd = alloc(sizeof(*phsd));
 	sc->private_data = phsd;
 	phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_monitor(struct sched *s)
 {
 	struct sender_client *sc, *tmp;
+	unsigned n;
 
-	if (hss->listen_fd < 0)
-		return;
-	para_fd_set(hss->listen_fd, rfds, max_fileno);
+	FOR_EACH_LISTEN_FD(n, hss) {
+		if (hss->listen_fds[n] < 0)
+			continue;
+		sched_monitor_readfd(hss->listen_fds[n], s);
+	}
 	list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
 		struct private_http_sender_data *phsd = sc->private_data;
 		if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
-			para_fd_set(sc->fd, rfds, max_fileno);
+			sched_monitor_readfd(sc->fd, s);
 		if (phsd->status == HTTP_GOT_GET_REQUEST ||
 				phsd->status == HTTP_INVALID_GET_REQUEST)
-			para_fd_set(sc->fd, wfds, max_fileno);
+			sched_monitor_writefd(sc->fd, s);
 	}
 }
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-	return generic_com_on(hss, IPPROTO_TCP);
+	generic_com_on(hss, IPPROTO_TCP);
+	return 1;
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
@@ -239,16 +251,13 @@ static char *http_status(void)
  */
 static void http_send_init(void)
 {
-	int ret;
-
 	init_sender_status(hss, OPT_RESULT(HTTP_ACCESS),
+		OPT_RESULT(HTTP_LISTEN_ADDRESS),
 		OPT_UINT32_VAL(HTTP_PORT), OPT_UINT32_VAL(HTTP_MAX_CLIENTS),
 		OPT_GIVEN(HTTP_DEFAULT_DENY));
 	if (OPT_GIVEN(HTTP_NO_AUTOSTART))
 		return;
-	ret = generic_com_on(hss, IPPROTO_TCP);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	generic_com_on(hss, IPPROTO_TCP);
 }
 
 /**
@@ -264,9 +273,9 @@ static void http_send_init(void)
 const struct sender http_sender = {
 	.name = "http",
 	.init = http_send_init,
-	.shutdown = http_shutdown_clients,
-	.pre_select = http_pre_select,
-	.post_select = http_post_select,
+	.shutdown = http_shutdown,
+	.pre_monitor = http_pre_monitor,
+	.post_monitor = http_post_monitor,
 	.send = http_send,
 	.shutdown_clients = http_shutdown_clients,
 	.client_cmds = {