X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=af8e6b1657e86777af5f6360c573c60bcc46e93c;hp=a0f8371efae6b0974a4f9c88ef1365b208a48eda;hb=e9ac00becb2aba5bbbf51b4803b81b10ed4d6788;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7

diff --git a/dccp_recv.c b/dccp_recv.c
index a0f8371e..af8e6b16 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -39,7 +38,6 @@ struct private_dccp_recv_data {
 	struct btr_pool *btrp;
 };
 
-
 static void dccp_recv_close(struct receiver_node *rn)
 {
 
@@ -52,7 +50,6 @@ static void dccp_recv_close(struct receiver_node *rn)
 	rn->private_data = NULL;
 }
 
-
 static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
@@ -105,10 +102,11 @@ err:
  */
 static bool dccp_recv_ccid_support_check(struct dccp_recv_args_info *conf)
 {
-	uint8_t ccids[DCCP_MAX_HOST_CCIDS];
-	uint8_t nccids = sizeof(ccids), i, j;
+	uint8_t *ccids;
+	int i, j, nccids;
 
-	if (dccp_available_ccids(ccids, &nccids) == NULL)
+	nccids = dccp_available_ccids(&ccids);
+	if (nccids <= 0)
 		return false;
 
 	for (i = 0; i < conf->ccid_given; i++) {
@@ -152,31 +150,27 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 	struct btr_node *btrn = rn->btrn;
 	struct iovec iov[2];
 	int ret, iovcnt;
+	size_t num_bytes;
 
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-	if (ret < 0)
-		goto err;
-	if (ret == 0)
-		return;
-	if (!FD_ISSET(pdd->fd, &s->rfds))
-		return; /* nothing to do */
+	if (ret <= 0)
+		goto out;
 	iovcnt = btr_pool_get_buffers(pdd->btrp, iov);
 	ret = -E_DCCP_OVERRUN;
 	if (iovcnt == 0)
-		goto err;
-	ret = para_readv(pdd->fd, iov, iovcnt);
-	if (ret == 0)
-		ret = -E_RECV_EOF;
-	if (ret < 0)
-		goto err;
-	if (ret <= iov[0].iov_len) /* only the first buffer was filled */
-		btr_add_output_pool(pdd->btrp, ret, btrn);
+		goto out;
+	ret = readv_nonblock(pdd->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	if (num_bytes == 0)
+		goto out;
+	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
+		btr_add_output_pool(pdd->btrp, num_bytes, btrn);
 	else { /* both buffers contain data */
 		btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn);
-		btr_add_output_pool(pdd->btrp, ret - iov[0].iov_len, btrn);
+		btr_add_output_pool(pdd->btrp, num_bytes - iov[0].iov_len, btrn);
 	}
-	return;
-err:
+out:
+	if (ret >= 0)
+		return;
 	btr_remove_node(rn->btrn);
 	t->error = ret;
 }