X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=7f130341d16e1f0cc36cb43d691da66a92775235;hp=71aef76ad3bcd49e6eccb9d1221addb4884bc96d;hb=ca659e6bf0d7f783849244105a077e79fcf741ad;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a

diff --git a/http_recv.c b/http_recv.c
index 71aef76a..7f130341 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -14,6 +14,7 @@
 #include "http.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "net.h"
@@ -84,10 +85,10 @@ static char *make_request_msg(void)
 
 static void http_recv_pre_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = t->private_data;
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_http_recv_data *phd = rn->private_data;
 
-	t->ret = 1;
+	t->error = 0;
 	if  (phd->status == HTTP_CONNECTED)
 		para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
 	else
@@ -97,52 +98,47 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = t->private_data;
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_http_recv_data *phd = rn->private_data;
 
-	t->ret = -E_HTTP_RECV_EOF;
-	if (rn->output_eof && *rn->output_eof)
-		goto out;
-	t->ret = 1;
-	if (!s->select_ret)
-		goto out;
+	if (rn->output_error && *rn->output_error < 0) {
+		t->error = *rn->output_error;
+		return;
+	}
 	if  (phd->status == HTTP_CONNECTED) {
 		char *rq;
 		if (!FD_ISSET(phd->fd, &s->wfds))
-			goto out;
+			return;
 		rq = make_request_msg();
-		PARA_INFO_LOG("%s", "sending http request\n");
-		t->ret = send_va_buffer(phd->fd, "%s", rq);
+		PARA_INFO_LOG("sending http request\n");
+		t->error = send_va_buffer(phd->fd, "%s", rq);
 		free(rq);
-		if (t->ret > 0)
+		if (t->error >= 0)
 			phd->status = HTTP_SENT_GET_REQUEST;
-		goto out;
+		return;
 	}
 	if (!FD_ISSET(phd->fd, &s->rfds))
-		goto out;
+		return;
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
-		t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
-		if (t->ret < 0)
-			goto out;
-		PARA_INFO_LOG("%s", "received ok msg, streaming\n");
-		t->ret = 1;
-		phd->status = HTTP_STREAMING;
-		goto out;
+		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;
+		}
+		return;
+	}
+	if (rn->loaded >= BUFSIZE) {
+		t->error = -E_HTTP_RECV_OVERRUN;
+		return;
 	}
-	t->ret = -E_HTTP_RECV_OVERRUN;
-	if (rn->loaded >= BUFSIZE)
-		goto out;
-	t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+	t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
 		BUFSIZE - rn->loaded);
-	if (t->ret <= 0) {
-		if (!t->ret)
-			t->ret = -E_HTTP_RECV_EOF;
-		goto out;
+	if (t->error > 0) {
+		rn->loaded += t->error;
+		return;
 	}
-	rn->loaded += t->ret;
-out:
-	if (t->ret < 0)
-		rn->eof = 1;
+	if (!t->error)
+		t->error = -E_RECV_EOF;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -166,37 +162,23 @@ static void *http_recv_parse_config(int argc, char **argv)
 static int http_recv_open(struct receiver_node *rn)
 {
 	struct private_http_recv_data *phd;
-	struct hostent *he;
 	struct http_recv_args_info *conf = rn->conf;
-	struct sockaddr_in their_addr;
-	int ret;
+	int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+		conf->port_arg);
 
-	rn->buf = para_calloc(BUFSIZE);
-	rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
-	phd = rn->private_data;
-	ret = get_host_info(conf->host_arg, &he);
-	if (ret < 0)
-		goto err_out;
-	ret = get_stream_socket(AF_INET);
 	if (ret < 0)
-		goto err_out;
-	phd->fd = ret;
-	/* init their_addr */
-	init_sockaddr(&their_addr, conf->port_arg, he);
-	PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
-		conf->port_arg);
-	ret = PARA_CONNECT(phd->fd, &their_addr);
+		return ret;
+	fd = ret;
+	ret = mark_fd_nonblocking(fd);
 	if (ret < 0) {
-		close(phd->fd);
-		goto err_out;
+		close(fd);
+		return ret;
 	}
-	mark_fd_nonblock(phd->fd);
+	rn->buf = para_calloc(BUFSIZE);
+	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+	phd->fd = fd;
 	phd->status = HTTP_CONNECTED;
 	return 1;
-err_out:
-	free(rn->private_data);
-	free(rn->buf);
-	return ret;
 }
 
 /**
@@ -208,10 +190,17 @@ err_out:
  */
 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
+	};
 }