X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=436b298cb8f467a25bf10c270a11ee08c74d6937;hp=964b60d4ac1323cdd9f076e67ec3f3a9a8cf317b;hb=b3644a3f5de245609dc608a947ed71e2f75b2fd5;hpb=4867d9a4948aadde4dd59436e1c5fb0fc141ba89

diff --git a/udp_recv.c b/udp_recv.c
index 964b60d4..436b298c 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,12 +15,12 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "udp_recv.cmdline.h"
 #include "string.h"
 #include "net.h"
 #include "fd.h"
-#include "buffer_tree.h"
 
 static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
@@ -49,7 +49,7 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 	return -E_RECV_EOF;
 }
 
-static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
+static int udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct btr_node *btrn = rn->btrn;
@@ -57,7 +57,9 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 	struct iovec iov[2];
 	int ret, readv_ret, iovcnt;
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 	if (ret <= 0)
 		goto out;
@@ -81,12 +83,12 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 	}
 	ret = readv_ret;
 out:
-	if (ret >= 0)
-		return;
-	btr_remove_node(btrn);
-	t->error = ret;
-	close(rn->fd);
-	rn->fd = -1;
+	if (ret < 0) {
+		btr_remove_node(&rn->btrn);
+		close(rn->fd);
+		rn->fd = -1;
+	}
+	return ret;
 }
 
 static void udp_recv_close(struct receiver_node *rn)
@@ -98,15 +100,9 @@ static void udp_recv_close(struct receiver_node *rn)
 
 static void *udp_recv_parse_config(int argc, char **argv)
 {
-	int ret;
-	struct udp_recv_args_info *tmp =
-		para_calloc(sizeof(struct udp_recv_args_info));
-
-	ret = udp_recv_cmdline_parser(argc, argv, tmp)? -E_UDP_SYNTAX : 1;
-	if (ret >= 0)
-		return tmp;
-	free(tmp);
-	return NULL;
+	struct udp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
+	udp_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 /*
@@ -224,9 +220,6 @@ void udp_recv_init(struct receiver *r)
 	r->post_select = udp_recv_post_select;
 	r->parse_config = udp_recv_parse_config;
 	r->free_config = udp_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = udp_recv_args_info_help,
-		.detailed_help = udp_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(udp_recv);
 	udp_recv_cmdline_parser_free(&dummy);
 }