Changed tree children magement from array to DLL, fixed bugs, extended testcase.

1 files changed, 27 insertions, 4 deletions

diff --git a/src/mesh/mesh_tunnel_tree.h b/src/mesh/mesh_tunnel_tree.h
index 6573a85bd..a929f7a6d 100644
--- a/src/mesh/mesh_tunnel_tree.h
+++ b/src/mesh/mesh_tunnel_tree.h
@@ -76,14 +76,24 @@ struct MeshTunnelTreeNode
   struct MeshTunnelTreeNode *parent;
 
   /**
-   * Array of children
+   * DLL of siblings
    */
-  struct MeshTunnelTreeNode *children;
+  struct MeshTunnelTreeNode *next;
 
   /**
-   * Number of children
+   * DLL of siblings
    */
-  unsigned int nchildren;
+  struct MeshTunnelTreeNode *prev;
+
+  /**
+   * DLL of children
+   */
+  struct MeshTunnelTreeNode *children_head;
+
+  /**
+   * DLL of children
+   */
+  struct MeshTunnelTreeNode *children_tail;
 
     /**
      * Status of the peer in the tunnel
@@ -257,6 +267,19 @@ tree_add_path (struct MeshTunnelTree *t, const struct MeshPeerPath *p,
 
 
 /**
+ * Allocates and initializes a new node.
+ * Sets ID and parent of the new node and inserts it in the DLL of the parent
+ *
+ * @param parent Node that will be the parent from the new node, NULL for root
+ * @param id Short Id of the new node
+ *
+ * @return Newly allocated node
+ */
+struct MeshTunnelTreeNode *
+tree_node_new(struct MeshTunnelTreeNode *parent, GNUNET_PEER_Id id);
+
+
+/**
  * Destroy the node and all children
  * 
  * @param n Parent node to be destroyed