X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=2e518b2063a8c81946b27d971ad80f5fca3c070e;hp=8c19d6d743c38c58398087029fddf1ddc7a1f348;hb=98e61f7563ae284e058ce6251b89626ab6254ff7;hpb=19d9318abf42debb15d833d4e56ab636893285c3

diff --git a/http_recv.c b/http_recv.c
index 8c19d6d7..2e518b20 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.
  */
@@ -84,10 +84,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,53 +97,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;
 
-	if (rn->output_error && *rn->output_error) {
-		t->ret = *rn->output_error;
-		goto out;
+	if (rn->output_error && *rn->output_error < 0) {
+		t->error = *rn->output_error;
+		return;
 	}
-	t->ret = 1;
-	if (!s->select_ret)
-		goto out;
 	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, MAXLINE);
+		if (t->error >= 0) {
+			PARA_INFO_LOG("received ok msg, streaming\n");
+			phd->status = HTTP_STREAMING;
+		}
+		return;
 	}
-	t->ret = -E_HTTP_RECV_OVERRUN;
-	if (rn->loaded >= BUFSIZE)
-		goto out;
-	t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+	if (rn->loaded >= BUFSIZE) {
+		t->error = -E_HTTP_RECV_OVERRUN;
+		return;
+	}
+	t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
 		BUFSIZE - rn->loaded);
-	if (t->ret <= 0) {
-		if (!t->ret)
-			t->ret = -E_RECV_EOF;
-		goto out;
+	if (t->error > 0) {
+		rn->loaded += t->error;
+		return;
 	}
-	rn->loaded += t->ret;
-out:
-	if (t->ret < 0)
-		rn->error = t->ret;
+	if (!t->error)
+		t->error = -E_RECV_EOF;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -168,16 +162,20 @@ static int http_recv_open(struct receiver_node *rn)
 {
 	struct private_http_recv_data *phd;
 	struct http_recv_args_info *conf = rn->conf;
-	int ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, conf->port_arg);
+	int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+		conf->port_arg);
 
 	if (ret < 0)
 		return ret;
-
+	fd = ret;
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0) {
+		close(fd);
+		return ret;
+	}
 	rn->buf = para_calloc(BUFSIZE);
 	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
-
-	phd->fd = ret;
-	mark_fd_nonblocking(phd->fd);
+	phd->fd = fd;
 	phd->status = HTTP_CONNECTED;
 	return 1;
 }