X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=e46fa1a3f50008faffb5c1f66038e53d54b48c44;hp=2618fd8e7ab34a202ef5971cf5918c5df8cf0338;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7

diff --git a/recv.c b/recv.c
index 2618fd8e..e46fa1a3 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,20 +8,24 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
-#include "buffer_tree.h"
+#include "version.h"
+
+extern void afh_recv_init(struct receiver *r);
+#undef AFH_RECEIVER
+#define AFH_RECEIVER {.name = "afh", .init = afh_recv_init},
+DEFINE_RECEIVER_ARRAY;
 
 /** The gengetopt args info struct. */
 static struct recv_args_info conf;
@@ -102,21 +106,22 @@ int main(int argc, char *argv[])
 	sot.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.parent = rn.btrn, .name = "stdout"));
 	stdout_set_defaults(&sot);
-	register_task(&sot.task);
+	register_task(&s, &sot.task);
 
 	rn.task.pre_select = r->pre_select;
-	rn.task.post_select = r->post_select;
+	rn.task.new_post_select = r->new_post_select;
 	sprintf(rn.task.status, "%s", r->name);
-	register_task(&rn.task);
+	register_task(&s, &rn.task);
 
 	ret = schedule(&s);
 out:
 	if (r_opened)
 		r->close(&rn);
-	btr_free_node(rn.btrn);
-	btr_free_node(sot.btrn);
+	btr_remove_node(&rn.btrn);
+	btr_remove_node(&sot.btrn);
 	if (rn.conf)
 		r->free_config(rn.conf);
+
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;