X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=07f616657a7db4ca0dfe5b9d318f542c215a18c6;hp=755473c9e1f3a556302b7e7890959d919a80b1a9;hb=80e46ec589d14be2fa4b0704f613a04ecb1b64c4;hpb=7a0852896a75d852dbd2ac848ec5c0be3b5dea71

diff --git a/dccp_recv.c b/dccp_recv.c
index 755473c9..07f61665 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -57,17 +57,32 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
 	struct dccp_recv_args_info *conf = rn->conf;
-	int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg);
+	int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
+		conf->port_arg);
 
 	if (ret < 0)
 		return ret;
-
+	fd = ret;
+	/*
+	 * Disable unused CCIDs: the receiver does not send any application
+	 * data to the server. By shutting down this unused path we reduce
+	 * internal processing costs, as the unused CCIDs (in the kernel) are
+	 * then bypassed.
+	 */
+	if (shutdown(fd, SHUT_WR) < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto err;
+	}
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
+		goto err;
 	rn->buf = para_calloc(DCCP_BUFSIZE);
 	rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
-
-	pdd->fd = ret;
-	mark_fd_nonblocking(pdd->fd);
+	pdd->fd = fd;
 	return 1;
+err:
+	close(fd);
+	return ret;
 }
 
 static void dccp_shutdown(void)
@@ -99,9 +114,10 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 	struct receiver_node *rn = t->private_data;
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	t->ret = -E_DCCP_RECV_EOF;
-	if (rn->output_eof && *rn->output_eof)
+	if (rn->output_error && *rn->output_error) {
+		t->ret = *rn->output_error;
 		goto out;
+	}
 	t->ret = 1;
 	if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
 		goto out; /* nothing to do */
@@ -112,14 +128,14 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 		DCCP_BUFSIZE - rn->loaded);
 	if (t->ret <= 0) {
 		if (!t->ret)
-			t->ret = -E_DCCP_RECV_EOF;
+			t->ret = -E_RECV_EOF;
 		goto out;
 	}
 	rn->loaded += t->ret;
 	return;
 out:
 	if (t->ret < 0)
-		rn->eof = 1;
+		rn->error = t->ret;
 }
 
 /**