recv: Init and teardown btr node.

diff --git a/buffer_tree.h b/buffer_tree.h
index 18b9e8a29576ce7bd25dae68a2640add87bb14b0..8a7a33b8316c8aee5b6156cb4dd64f7749999d6e 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -2,5 +2,6 @@
 struct btr_node;
 
 struct btr_node *btr_new_node(char *name, struct btr_node *parent);
 struct btr_node;
 
 struct btr_node *btr_new_node(char *name, struct btr_node *parent);

+void btr_del_node(struct btr_node *btrn);

 void btr_add_output(char *buf, size_t size, struct btr_node *btrn);
 bool btr_is_leaf_node(struct btr_node *btrn);
 void btr_add_output(char *buf, size_t size, struct btr_node *btrn);
 bool btr_is_leaf_node(struct btr_node *btrn);

diff --git a/recv.c b/recv.c
index d2af64418ec12a623dd78ca717cec2a832e3eb87..e04f6484981a9659fe399d9df4066c06ca6dab2b 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -92,6 +92,7 @@ int main(int argc, char *argv[])
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
        }
        r = &receivers[receiver_num];
        rn.receiver = r;

+       rn.btr_root = btr_new_node("receiver", NULL /* no parent */);

        ret = r->open(&rn);
        if (ret < 0)
                goto out;
        ret = r->open(&rn);
        if (ret < 0)
                goto out;


@@ -110,8 +111,10 @@ int main(int argc, char *argv[])
 
        ret = schedule(&s);
 out:
 
        ret = schedule(&s);
 out:

-       if (r_opened)
+       if (r_opened) {
+               btr_del_node(rn.btr_root);

                r->close(&rn);
                r->close(&rn);

+       }

        if (r)
                r->shutdown();
        if (ret < 0)
        if (r)
                r->shutdown();
        if (ret < 0)