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

diff --git a/http_send.c b/http_send.c
index 330b45ac..429b4662 100644
--- a/http_send.c
+++ b/http_send.c
@@ -20,8 +20,8 @@
 #include "server.h"
 #include "http.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
 #include "close_on_fork.h"
 #include "fd.h"
@@ -80,6 +80,7 @@ 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,
@@ -157,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;
@@ -169,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) {
@@ -187,15 +188,15 @@ 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;
@@ -203,15 +204,15 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 	FOR_EACH_LISTEN_FD(n, hss) {
 		if (hss->listen_fds[n] < 0)
 			continue;
-		para_fd_set(hss->listen_fds[n], rfds, max_fileno);
+		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);
 	}
 }
 
@@ -273,8 +274,8 @@ const struct sender http_sender = {
 	.name = "http",
 	.init = http_send_init,
 	.shutdown = http_shutdown,
-	.pre_select = http_pre_select,
-	.post_select = http_post_select,
+	.pre_monitor = http_pre_monitor,
+	.post_monitor = http_post_monitor,
 	.send = http_send,
 	.shutdown_clients = http_shutdown_clients,
 	.client_cmds = {