X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=4283db4ba847dcd9a75025424bd48af36f1c799f;hp=a36038ad23ddad69a7139891ff07404e05671182;hb=d080286b39f943baf22f1b531816d8209d8685d6;hpb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44

diff --git a/http_recv.c b/http_recv.c
index a36038ad..4283db4b 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,31 +1,21 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \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"
@@ -176,39 +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;
-	/* get new socket */
-	ret = get_socket();
 	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);
-	/* 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:
-	free(rn->private_data);
-	free(rn->buf);
-	return ret;
 }
 
 /**