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

diff --git a/http_recv.c b/http_recv.c
index 6a2f60f1..8b550391 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -51,7 +51,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 +69,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 +87,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;
 }
@@ -185,7 +185,7 @@ static int http_recv_open(struct receiver_node *rn)
 	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)
+	if (ret < 0)
 		goto err_out;
 	/* get new socket */
 	ret = get_socket();
@@ -198,8 +198,10 @@ static int http_recv_open(struct receiver_node *rn)
 	PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
 		conf->port_arg);
 	ret = para_connect(phd->fd, &their_addr);
-	if (ret < 0)
+	if (ret < 0) {
+		close(phd->fd);
 		goto err_out;
+	}
 	mark_fd_nonblock(phd->fd);
 	phd->status = HTTP_CONNECTED;
 	return 1;