X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=a3167bd8626f8bc40361bfb71369079db955d9cc;hp=71aef76ad3bcd49e6eccb9d1221addb4884bc96d;hb=6d5a56308a3a833b08ae0e3692b794fb6122ea60;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a;ds=sidebyside

diff --git a/http_recv.c b/http_recv.c
index 71aef76a..a3167bd8 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-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -100,9 +100,10 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	struct receiver_node *rn = t->private_data;
 	struct private_http_recv_data *phd = rn->private_data;
 
-	t->ret = -E_HTTP_RECV_EOF;
-	if (rn->output_eof && *rn->output_eof)
+	if (rn->output_error && *rn->output_error) {
+		t->ret = *rn->output_error;
 		goto out;
+	}
 	t->ret = 1;
 	if (!s->select_ret)
 		goto out;
@@ -111,7 +112,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		if (!FD_ISSET(phd->fd, &s->wfds))
 			goto out;
 		rq = make_request_msg();
-		PARA_INFO_LOG("%s", "sending http request\n");
+		PARA_INFO_LOG("sending http request\n");
 		t->ret = send_va_buffer(phd->fd, "%s", rq);
 		free(rq);
 		if (t->ret > 0)
@@ -124,7 +125,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		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");
+		PARA_INFO_LOG("received ok msg, streaming\n");
 		t->ret = 1;
 		phd->status = HTTP_STREAMING;
 		goto out;
@@ -136,13 +137,13 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		BUFSIZE - rn->loaded);
 	if (t->ret <= 0) {
 		if (!t->ret)
-			t->ret = -E_HTTP_RECV_EOF;
+			t->ret = -E_RECV_EOF;
 		goto out;
 	}
 	rn->loaded += t->ret;
 out:
 	if (t->ret < 0)
-		rn->eof = 1;
+		rn->error = t->ret;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -166,37 +167,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;
 }
 
 /**