X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=1fb60bad810d86dbbb0098a3714c2caa3d9e835b;hp=67691a34f121db02365a884ef1fd4e63cc63d918;hb=HEAD;hpb=1f12ea375358a0b30689e01efe82796ea4fcb14f

diff --git a/http_recv.c b/http_recv.c
index 67691a34..8d2add19 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file http_recv.c paraslash's http receiver */
 
@@ -60,17 +56,17 @@ static char *make_request_msg(void)
 	return ret;
 }
 
-static void http_recv_pre_select(struct sched *s, void *context)
+static void http_recv_pre_monitor(struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct private_http_recv_data *phd = rn->private_data;
 
-	if (generic_recv_pre_select(s, rn) <= 0)
+	if (generic_recv_pre_monitor(s, rn) <= 0)
 		return;
 	if  (phd->status == HTTP_CONNECTED)
-		para_fd_set(rn->fd, &s->wfds, &s->max_fileno);
+		sched_monitor_writefd(rn->fd, s);
 	else
-		para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(rn->fd, s);
 }
 
 /*
@@ -78,7 +74,7 @@ static void http_recv_pre_select(struct sched *s, void *context)
  * area with data read from the socket. In any case, update the state of the
  * connection if necessary.
  */
-static int http_recv_post_select(struct sched *s, void *context)
+static int http_recv_post_monitor(struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct private_http_recv_data *phd = rn->private_data;
@@ -97,7 +93,7 @@ static int http_recv_post_select(struct sched *s, void *context)
 		return 0;
 	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
-		if (!FD_ISSET(rn->fd, &s->wfds))
+		if (!sched_write_ok(rn->fd, s))
 			return 0;
 		rq = make_request_msg();
 		PARA_INFO_LOG("sending http request\n");
@@ -109,9 +105,11 @@ static int http_recv_post_select(struct sched *s, void *context)
 		return 0;
 	}
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
-		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
-		if (ret < 0)
+		ret = read_and_compare(rn->fd, HTTP_OK_MSG);
+		if (ret < 0) {
+			PARA_ERROR_LOG("did not receive HTTP OK message\n");
 			goto out;
+		}
 		if (ret == 0)
 			return 0;
 		PARA_INFO_LOG("received ok msg, streaming\n");
@@ -122,7 +120,7 @@ static int http_recv_post_select(struct sched *s, void *context)
 	iovcnt = btr_pool_get_buffers(rn->btrp, iov);
 	if (iovcnt == 0)
 		goto out;
-	ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	ret = readv_nonblock(rn->fd, iov, iovcnt, &num_bytes);
 	if (num_bytes == 0)
 		goto out;
 	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
@@ -132,8 +130,10 @@ static int http_recv_post_select(struct sched *s, void *context)
 		btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
 	}
 out:
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		btr_remove_node(&rn->btrn);
+	}
 	return ret;
 }
 
@@ -150,7 +150,7 @@ static int http_recv_open(struct receiver_node *rn)
 	struct lls_parse_result *lpr = rn->lpr;
 	const char *r_i = RECV_CMD_OPT_STRING_VAL(HTTP, HOST, lpr);
 	uint32_t r_p = RECV_CMD_OPT_UINT32_VAL(HTTP, PORT, lpr);
-	int fd, ret = para_connect_simple(IPPROTO_TCP, r_i, r_p);
+	int fd, ret = para_connect(IPPROTO_TCP, r_i, r_p);
 
 	if (ret < 0)
 		return ret;
@@ -160,17 +160,16 @@ static int http_recv_open(struct receiver_node *rn)
 		close(fd);
 		return ret;
 	}
-	rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+	rn->private_data = phd = zalloc(sizeof(struct private_http_recv_data));
 	rn->fd = fd;
 	phd->status = HTTP_CONNECTED;
 	rn->btrp = btr_pool_new("http_recv", 320 * 1024);
 	return 1;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_http_user_data = {
 	.open = http_recv_open,
 	.close = http_recv_close,
-	.pre_select = http_recv_pre_select,
-	.post_select = http_recv_post_select,
+	.pre_monitor = http_recv_pre_monitor,
+	.post_monitor = http_recv_post_monitor,
 };