X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=4283db4ba847dcd9a75025424bd48af36f1c799f;hp=0a460adff4009428e8d457a30ff2426e4cc93deb;hb=7a0852896a75d852dbd2ac848ec5c0be3b5dea71;hpb=89b30ef7b5ee1bb73b8efa3ccbb53c229066439e

diff --git a/http_recv.c b/http_recv.c
index 0a460adf..4283db4b 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -166,37 +166,19 @@ 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 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;
+		return ret;
+
+	rn->buf = para_calloc(BUFSIZE);
+	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+
 	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);
-	if (ret < 0) {
-		close(phd->fd);
-		goto err_out;
-	}
 	mark_fd_nonblocking(phd->fd);
 	phd->status = HTTP_CONNECTED;
 	return 1;
-err_out:
-	free(rn->private_data);
-	free(rn->buf);
-	return ret;
 }
 
 /**