X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=13c7fb57033d0a56dce0b685de741cb65dd88230;hp=56783b72a16379612973f61a288d18a93bb6fd45;hb=e1890028c21d233087266fd7997d68a88cb9afce;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/http_recv.c b/http_recv.c
index 56783b72..13c7fb57 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -6,14 +6,16 @@
 
 /** \file http_recv.c paraslash's http receiver */
 
-#include "para.h"
+#include <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
+#include "error.h"
 #include "http.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
-#include "error.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
@@ -164,33 +166,17 @@ 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;
 
 	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;
-	/* get new socket */
-	ret = get_socket();
+	ret = tcp_connect(conf->host_arg, conf->port_arg);
 	if (ret < 0)
 		goto err_out;
 	phd->fd = ret;
-	/* init their_addr */
-	init_sockaddr(&their_addr, conf->port_arg, he);
-	/* connect */
-	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_nonblock(phd->fd);
+	mark_fd_nonblocking(phd->fd);
 	phd->status = HTTP_CONNECTED;
 	return 1;
 err_out: