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

diff --git a/http_recv.c b/http_recv.c
index 8c19d6d7..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.
  */
@@ -112,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)
@@ -125,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;
@@ -168,16 +168,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;
 }