X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=9c42a1a85817f6cca6aa827e0ed349a01312949b;hp=d4fe29ad686846cd3ee1b6d3617bdf7e329d73f1;hb=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hpb=a19ff95e6ec4b76c13446e0687fcf2ae537529ab

diff --git a/http_recv.c b/http_recv.c
index d4fe29ad..9c42a1a8 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,12 @@
 /** \file http_recv.c paraslash's http receiver */
 
 #include <regex.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -15,12 +20,12 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
-#include "buffer_tree.h"
 
 /**
  * the possible states of a http receiver node
@@ -60,7 +65,6 @@ static void http_recv_pre_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;
 
-	t->error = 0;
 	if (generic_recv_pre_select(s, t) <= 0)
 		return;
 	if  (phd->status == HTTP_CONNECTED)
@@ -74,56 +78,63 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
  * area with data read from the socket. In any case, update the state of the
  * connection if necessary.
  */
-static void http_recv_post_select(struct sched *s, struct task *t)
+static int 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 btr_node *btrn = rn->btrn;
-	int ret;
-	char *buf;
-	size_t sz, n;
+	int ret, iovcnt;
+	struct iovec iov[2];
+	size_t num_bytes;
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 	if (ret < 0)
-		goto err;
+		goto out;
 	if (ret == 0)
-		return;
+		return 0;
 	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
 		if (!FD_ISSET(rn->fd, &s->wfds))
-			return;
+			return 0;
 		rq = make_request_msg();
 		PARA_INFO_LOG("sending http request\n");
-		ret = send_va_buffer(rn->fd, "%s", rq);
+		ret = write_va_buffer(rn->fd, "%s", rq);
 		free(rq);
 		if (ret < 0)
-			goto err;
+			goto out;
 		phd->status = HTTP_SENT_GET_REQUEST;
-		return;
+		return 0;
 	}
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
 		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
 		if (ret < 0)
-			goto err;
+			goto out;
 		if (ret == 0)
-			return;
+			return 0;
 		PARA_INFO_LOG("received ok msg, streaming\n");
 		phd->status = HTTP_STREAMING;
-		return;
+		return 0;
 	}
 	ret = -E_HTTP_RECV_OVERRUN;
-	sz = btr_pool_get_buffer(rn->btrp, &buf);
-	if (sz == 0)
-		goto err;
-	ret = read_nonblock(rn->fd, buf, sz, &s->rfds, &n);
-	if (n > 0)
-		btr_add_output_pool(rn->btrp, n, btrn);
-	if (ret >= 0)
-		return;
-err:
-	btr_remove_node(rn->btrn);
-	t->error = ret;
+	iovcnt = btr_pool_get_buffers(rn->btrp, iov);
+	if (iovcnt == 0)
+		goto out;
+	ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	if (num_bytes == 0)
+		goto out;
+	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
+		btr_add_output_pool(rn->btrp, num_bytes, btrn);
+	else { /* both buffers contain data */
+		btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn);
+		btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
+	}
+out:
+	if (ret < 0)
+		btr_remove_node(&rn->btrn);
+	return ret;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -135,12 +146,10 @@ static void http_recv_close(struct receiver_node *rn)
 
 static void *http_recv_parse_config(int argc, char **argv)
 {
-	struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));
+	struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!http_recv_cmdline_parser(argc, argv, tmp))
-		return tmp;
-	free(tmp);
-	return NULL;
+	http_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 static int http_recv_open(struct receiver_node *rn)
@@ -189,9 +198,6 @@ void http_recv_init(struct receiver *r)
 	r->post_select = http_recv_post_select;
 	r->parse_config = http_recv_parse_config;
 	r->free_config = http_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = http_recv_args_info_help,
-		.detailed_help = http_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(http_recv);
 	http_recv_cmdline_parser_free(&dummy);
 }