struct MeshTunnelTreeNode *n;
struct MeshTunnelTreeNode *next;
+ if (NULL == parent)
+ return;
#if MESH_TREE_DEBUG
struct GNUNET_PeerIdentity id;
struct MeshTunnelTreeNode *n;
if (NULL == tree->me)
- {
- GNUNET_break (0);
return;
- }
for (n = tree->me->children_head; NULL != n; n = n->next)
{
cb (cb_cls, n->peer);
}
+/**
+ * Iterator to count the children in a tree.
+ */
+static void
+count_children_cb (void *cls, GNUNET_PEER_Id peer)
+{
+ unsigned int *i = cls;
+
+ (*i)++;
+}
+
+
+/**
+ * Count how many children does the local node have in the tree.
+ *
+ * @param tree Tree to use. Must have "me" set.
+ */
+unsigned int
+tree_count_children (struct MeshTunnelTree *tree)
+{
+ unsigned int i;
+
+ i = 0;
+ tree_iterate_children(tree, &count_children_cb, &i);
+ return i;
+}
+
+
/**
* Recusively update the info about what is the first hop to reach the node
*
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree: Deleting path to %s.\n",
GNUNET_i2s (&id));
#endif
- if (peer_id == t->root->peer)
+ if (NULL == t->root || peer_id == t->root->peer)
return NULL;
for (n = t->disconnected_head; NULL != n; n = n->next)
GNUNET_CONTAINER_DLL_remove (parent->children_head, parent->children_tail, n);
n->parent = NULL;
- while (MESH_PEER_RELAY == parent->status && NULL == parent->children_head)
+ while (MESH_PEER_RELAY == parent->status &&
+ NULL == parent->children_head)
{
#if MESH_TREE_DEBUG
GNUNET_PEER_resolve (parent->peer, &id);
GNUNET_i2s (&id));
#endif
n = parent->parent;
+ if (parent == t->me)
+ t->me = NULL;
tree_node_destroy (parent);
parent = n;
}
GNUNET_break (0);
return GNUNET_YES;
}
- GNUNET_break_op (NULL == n->children_head);
tree_node_destroy (n);
if (NULL == t->root->children_head && t->me != t->root)
{
tree_debug (struct MeshTunnelTree *t)
{
tree_node_debug (t->root, 0);
+ FPRINTF (stderr, "root: %p\n", t->root);
+ FPRINTF (stderr, "me: %p\n", t->me);
}