X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=df1afb3685ff05dea7a9278b47ef9ef7e9a8971f;hp=e04f6484981a9659fe399d9df4066c06ca6dab2b;hb=d96c06ff93493c125b9f4d36655e77d7029ca309;hpb=0d6679a8036a45c03d0c5872a4cf6e9c6f87618f

diff --git a/recv.c b/recv.c
index e04f6484..df1afb36 100644
--- a/recv.c
+++ b/recv.c
@@ -60,7 +60,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 }
 
 /**
- * the main function of para_recv
+ * The main function of para_recv.
  *
  * \param argc number of arguments
  * \param argv vector of arguments
@@ -92,31 +92,30 @@ int main(int argc, char *argv[])
 	}
 	r = &receivers[receiver_num];
 	rn.receiver = r;
-	rn.btr_root = btr_new_node("receiver", NULL /* no parent */);
+	rn.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = r->name));
 	ret = r->open(&rn);
 	if (ret < 0)
 		goto out;
 	r_opened = 1;
 
+	sot.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.parent = rn.btrn, .name = "stdout"));
 	stdout_set_defaults(&sot);
-	sot.bufp = &rn.buf;
-	sot.loaded = &rn.loaded;
-	sot.input_error = &rn.task.error;
 	register_task(&sot.task);
 
 	rn.task.pre_select = r->pre_select;
 	rn.task.post_select = r->post_select;
-	sprintf(rn.task.status, "receiver node");
+	sprintf(rn.task.status, "%s", r->name);
 	register_task(&rn.task);
 
 	ret = schedule(&s);
 out:
-	if (r_opened) {
-		btr_del_node(rn.btr_root);
+	if (r_opened)
 		r->close(&rn);
-	}
-	if (r)
-		r->shutdown();
+	btr_free_node(rn.btrn);
+	btr_free_node(sot.btrn);
+	r->free_config(rn.conf);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;