X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=d4fe29ad686846cd3ee1b6d3617bdf7e329d73f1;hp=107bfdcdf576bb452bb8d32d38b3ebe71488b9e1;hb=a19ff95e6ec4b76c13446e0687fcf2ae537529ab;hpb=ed0c68b07ddbc130e033035baa1cc0862e511b46

diff --git a/http_recv.c b/http_recv.c
index 107bfdcd..d4fe29ad 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -45,24 +44,6 @@ struct private_http_recv_data {
 	 * \sa receiver::open, receiver_node.
 	 */
 	enum http_recv_status status;
-	/**
-	 * The file descriptor used for receiving the http stream.
-	 *
-	 * The pre_select function of the http receiver adds this file descriptor to
-	 * the set of file decriptors which are checked for reading/writing (depending
-	 * on the current status) by the select loop of the application (para_audiod or
-	 * para_recv).
-	 *
-	 * 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 \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, http_recv_status
-	 */
-	int fd;
-	struct btr_pool *btrp;
 };
 
 static char *make_request_msg(void)
@@ -83,11 +64,16 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 	if (generic_recv_pre_select(s, t) <= 0)
 		return;
 	if  (phd->status == HTTP_CONNECTED)
-		para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
+		para_fd_set(rn->fd, &s->wfds, &s->max_fileno);
 	else
-		para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
+		para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
 }
 
+/*
+ * Establish the http connection. If already established, fill the buffer pool
+ * area with data read from the socket. In any case, update the state of the
+ * connection if necessary.
+ */
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
@@ -95,7 +81,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	struct btr_node *btrn = rn->btrn;
 	int ret;
 	char *buf;
-	size_t sz;
+	size_t sz, n;
 
 	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
@@ -105,38 +91,36 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 		return;
 	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
-		if (!FD_ISSET(phd->fd, &s->wfds))
+		if (!FD_ISSET(rn->fd, &s->wfds))
 			return;
 		rq = make_request_msg();
 		PARA_INFO_LOG("sending http request\n");
-		ret = send_va_buffer(phd->fd, "%s", rq);
+		ret = send_va_buffer(rn->fd, "%s", rq);
 		free(rq);
 		if (ret < 0)
 			goto err;
 		phd->status = HTTP_SENT_GET_REQUEST;
 		return;
 	}
-	if (!FD_ISSET(phd->fd, &s->rfds))
-		return;
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
-		ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
 		if (ret < 0)
 			goto err;
+		if (ret == 0)
+			return;
 		PARA_INFO_LOG("received ok msg, streaming\n");
 		phd->status = HTTP_STREAMING;
 		return;
 	}
 	ret = -E_HTTP_RECV_OVERRUN;
-	sz = btr_pool_get_buffer(phd->btrp, &buf);
+	sz = btr_pool_get_buffer(rn->btrp, &buf);
 	if (sz == 0)
 		goto err;
-	ret = recv_bin_buffer(phd->fd, buf, sz);
-	if (ret == 0)
-		ret = -E_RECV_EOF;
-	if (ret < 0)
-		goto err;
-	btr_add_output_pool(phd->btrp, ret, btrn);
-	return;
+	ret = read_nonblock(rn->fd, buf, sz, &s->rfds, &n);
+	if (n > 0)
+		btr_add_output_pool(rn->btrp, n, btrn);
+	if (ret >= 0)
+		return;
 err:
 	btr_remove_node(rn->btrn);
 	t->error = ret;
@@ -144,10 +128,8 @@ err:
 
 static void http_recv_close(struct receiver_node *rn)
 {
-	struct private_http_recv_data *phd = rn->private_data;
-
-	close(phd->fd);
-	btr_pool_free(phd->btrp);
+	close(rn->fd);
+	btr_pool_free(rn->btrp);
 	free(rn->private_data);
 }
 
@@ -165,8 +147,8 @@ static int http_recv_open(struct receiver_node *rn)
 {
 	struct private_http_recv_data *phd;
 	struct http_recv_args_info *conf = rn->conf;
-	int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
-	                       conf->port_arg, NULL);
+	int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg,
+						       conf->port_arg);
 
 	if (ret < 0)
 		return ret;
@@ -177,9 +159,9 @@ static int http_recv_open(struct receiver_node *rn)
 		return ret;
 	}
 	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
-	phd->fd = fd;
+	rn->fd = fd;
 	phd->status = HTTP_CONNECTED;
-	phd->btrp = btr_pool_new("http_recv", 320 * 1024);
+	rn->btrp = btr_pool_new("http_recv", 320 * 1024);
 	return 1;
 }