btr: Rename btr_bytes_pending() and make it public.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 42fd335f1466a7c01419b59872d29d5be679f907..df1afb3685ff05dea7a9278b47ef9ef7e9a8971f 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -9,6 +9,7 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -20,9 +21,10 @@
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
 static int loglevel;
 /** Always log to stderr. */
@@ -53,11 +55,12 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        HANDLE_VERSION_FLAG("recv", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
 /**
- * the main function of para_recv
+ * The main function of para_recv.
  *
  * \param argc number of arguments
  * \param argv vector of arguments
@@ -87,31 +90,32 @@ int main(int argc, char *argv[])
                PARA_EMERG_LOG("parse failed\n");
                goto out;
        }
-       loglevel = get_loglevel_by_name(conf.loglevel_arg);
        r = &receivers[receiver_num];
        rn.receiver = r;
+       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)
                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;