X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=c751f2f7ce5d85464d506c8c6582556bb424aa7d;hp=21c69322715572758697c2573e62bbfd5de6665c;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/dccp_recv.c b/dccp_recv.c
index 21c69322..c751f2f7 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,11 +19,11 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"
 #include "fd.h"
-#include "buffer_tree.h"
 
 #include "dccp_recv.cmdline.h"
 
@@ -107,11 +107,10 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 {
 	struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!dccp_recv_cmdline_parser(argc, argv, tmp) &&
-	    dccp_recv_ccid_support_check(tmp))
-		return tmp;
-	free(tmp);
-	return NULL;
+	dccp_recv_cmdline_parser(argc, argv, tmp);
+	if (!dccp_recv_ccid_support_check(tmp))
+		exit(EXIT_FAILURE);
+	return tmp;
 }
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
@@ -124,7 +123,7 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
 	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
 }
 
-static void dccp_recv_post_select(struct sched *s, struct task *t)
+static int dccp_recv_post_select(struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct btr_node *btrn = rn->btrn;
@@ -132,6 +131,9 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 	int ret, iovcnt;
 	size_t num_bytes;
 
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 	if (ret <= 0)
 		goto out;
@@ -149,10 +151,9 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 		btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
 	}
 out:
-	if (ret >= 0)
-		return;
-	btr_remove_node(rn->btrn);
-	t->error = ret;
+	if (ret < 0)
+		btr_remove_node(&rn->btrn);
+	return ret;
 }
 
 static void dccp_recv_free_config(void *conf)
@@ -179,9 +180,6 @@ void dccp_recv_init(struct receiver *r)
 	r->post_select = dccp_recv_post_select;
 	r->parse_config = dccp_recv_parse_config;
 	r->free_config = dccp_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = dccp_recv_args_info_help,
-		.detailed_help = dccp_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(dccp_recv);
 	dccp_recv_cmdline_parser_free(&dummy);
 }