X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_recv.c;h=94e24d1b34c8c14170826ede5c1982456f6d1b3a;hb=742c8b3f79a59278ced71e1855da1846b157b494;hp=3a723299e78b241a9ac4f44a13caf91651f36b6a;hpb=3998a8c581623224b7b56bce593646b2c8516a0f;p=paraslash.git

diff --git a/http_recv.c b/http_recv.c
index 3a723299..94e24d1b 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -64,9 +64,9 @@ static void http_recv_pre_select(struct sched *s, void *context)
 	if (generic_recv_pre_select(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);
 }
 
 /*
@@ -93,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");
@@ -105,7 +105,7 @@ 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);
+		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
 		if (ret < 0) {
 			PARA_ERROR_LOG("did not receive HTTP OK message\n");
 			goto out;
@@ -120,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 */
@@ -167,7 +167,6 @@ static int http_recv_open(struct receiver_node *rn)
 	return 1;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_http_user_data = {
 	.open = http_recv_open,
 	.close = http_recv_close,