X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=13c7fb57033d0a56dce0b685de741cb65dd88230;hp=6a2f60f1b1b945befd179a28d609ea88e54938e4;hb=7f9340341574044e16e1ffc30f856f13d1e3ba6c;hpb=786010c598f79d20280e6ea9ea458cad4a7e9af7

diff --git a/http_recv.c b/http_recv.c
index 6a2f60f1..13c7fb57 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,31 +1,21 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * 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"
@@ -51,7 +41,7 @@ struct private_http_recv_data {
  *
  * the current status of the http receiver node
  *
- * It gets initialized to #HTTP_CONNECTED by the open function of the
+ * It gets initialized to \p HTTP_CONNECTED by the open function of the
  * http receiver.
  *
  * \sa receiver::open, receiver_node.
@@ -69,11 +59,11 @@ struct private_http_recv_data {
  *
  * The post_select function of the http receiver uses \a fd, if ready, to
  * establish the http connection, and updates \a status according to the new
- * state of the connection.  As soon as \a status is #HTTP_STREAMING, \a fd is
+ * state of the connection.  As soon as \a status is \p HTTP_STREAMING, \a fd is
  * going to be only checked for reading. If data is available, it is read into
  * the output buffer of the receiver node by post_select.
  *
- * \sa receiver::pre_select receiver::post_select receiver_node
+ * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status
  */
 	int fd;
 };
@@ -87,7 +77,7 @@ static char *make_request_msg(void)
 {
 	char *ret, *hn = para_hostname();
 	ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
-		HTTP_GET_MSG, hn, VERSION);
+		HTTP_GET_MSG, hn, PACKAGE_VERSION);
 	free(hn);
 	return ret;
 }
@@ -139,7 +129,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		phd->status = HTTP_STREAMING;
 		goto out;
 	}
-	t->ret = -E_OVERRUN;
+	t->ret = -E_HTTP_RECV_OVERRUN;
 	if (rn->loaded >= BUFSIZE)
 		goto out;
 	t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
@@ -176,31 +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)
-		goto err_out;
-	mark_fd_nonblock(phd->fd);
+	mark_fd_nonblocking(phd->fd);
 	phd->status = HTTP_CONNECTED;
 	return 1;
 err_out: