X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=cf93076d0c9bcea5705d624b980f6a8eda5a1f41;hp=c7eb485a7797f282917c8c4d4b4d34889cba603b;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=7ddeb416451e763677f1638263e26e0855d79d91;ds=sidebyside

diff --git a/http_recv.c b/http_recv.c
index c7eb485a..cf93076d 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_recv.c paraslash's http receiver */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -14,11 +15,13 @@
 #include "http.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "buffer_tree.h"
 
 /** the output buffer size of the http receiver */
 #define BUFSIZE (32 * 1024)
@@ -94,17 +97,20 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 		para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
 }
 
+#define HTTP_RECV_MAX_PENDING (1024 * 1024)
+#define HTTP_RECV_READ_BUF_SIZE 4096
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_http_recv_data *phd = rn->private_data;
+	struct http_recv_args_info *conf = rn->conf;
 
 	if (rn->output_error && *rn->output_error < 0) {
 		t->error = *rn->output_error;
-		return;
+		goto err;
 	}
-	if  (phd->status == HTTP_CONNECTED) {
+	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
 		if (!FD_ISSET(phd->fd, &s->wfds))
 			return;
@@ -112,37 +118,68 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		PARA_INFO_LOG("sending http request\n");
 		t->error = send_va_buffer(phd->fd, "%s", rq);
 		free(rq);
-		if (t->error >= 0)
-			phd->status = HTTP_SENT_GET_REQUEST;
+		if (t->error < 0)
+			goto err;
+		phd->status = HTTP_SENT_GET_REQUEST;
 		return;
 	}
 	if (!FD_ISSET(phd->fd, &s->rfds))
 		return;
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
 		t->error = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
-		if (t->error >= 0) {
-			PARA_INFO_LOG("received ok msg, streaming\n");
-			phd->status = HTTP_STREAMING;
-		}
+		if (t->error < 0)
+			goto err;
+		PARA_INFO_LOG("received ok msg, streaming\n");
+		phd->status = HTTP_STREAMING;
 		return;
 	}
-	if (rn->loaded >= BUFSIZE) {
-		t->error = -E_HTTP_RECV_OVERRUN;
+	if (conf->buffer_tree_given) {
+		char *buf;
+
+		if (btr_no_children(rn->btrn)) {
+			t->error = -E_HTTP_RECV_NO_CHILD;
+			goto err;
+		}
+		if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) {
+			t->error = -E_HTTP_RECV_OVERRUN;
+			goto err;
+		}
+		buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
+		t->error = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE);
+		if (t->error == 0)
+			t->error = -E_RECV_EOF;
+		if (t->error < 0) {
+			free(buf);
+			goto err;
+		}
+		btr_add_output(buf, t->error, rn->btrn);
 		return;
 	}
+	t->error = -E_HTTP_RECV_OVERRUN;
+	if (rn->loaded >= BUFSIZE)
+		goto err;
 	t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
 		BUFSIZE - rn->loaded);
-	if (t->error > 0) {
-		rn->loaded += t->error;
-		return;
-	}
-	if (!t->error)
+	if (t->error == 0)
 		t->error = -E_RECV_EOF;
+	if (t->error < 0)
+		goto err;
+	rn->loaded += t->error;
+	return;
+err:
+	if (conf->buffer_tree_given) {
+		btr_del_node(rn->btrn);
+		rn->btrn = NULL;
+	}
 }
 
 static void http_recv_close(struct receiver_node *rn)
 {
 	struct private_http_recv_data *phd = rn->private_data;
+	struct http_recv_args_info *conf = rn->conf;
+
+	if (conf->buffer_tree_given)
+		btr_del_node(rn->btrn);
 	close(phd->fd);
 	free(rn->buf);
 	free(rn->private_data);
@@ -177,6 +214,8 @@ static int http_recv_open(struct receiver_node *rn)
 	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
 	phd->fd = fd;
 	phd->status = HTTP_CONNECTED;
+	if (conf->buffer_tree_given)
+		rn->btrn = btr_new_node("receiver", NULL, NULL, NULL);
 	return 1;
 }
 
@@ -189,10 +228,18 @@ static int http_recv_open(struct receiver_node *rn)
  */
 void http_recv_init(struct receiver *r)
 {
+	struct http_recv_args_info dummy;
+
+	http_recv_cmdline_parser_init(&dummy);
 	r->open = http_recv_open;
 	r->close = http_recv_close;
 	r->pre_select = http_recv_pre_select;
 	r->post_select = http_recv_post_select;
 	r->shutdown = http_shutdown;
 	r->parse_config = http_recv_parse_config;
+	r->help = (struct ggo_help) {
+		.short_help = http_recv_args_info_help,
+		.detailed_help = http_recv_args_info_detailed_help
+	};
+	http_recv_cmdline_parser_free(&dummy);
 }