#include "mesh.h"
#include "mesh_tunnel_tree.h"
+#define MESH_TREE_DEBUG GNUNET_YES
+
/**
* Create a new path
path_get_first_hop (struct MeshTunnelTree *t, GNUNET_PEER_Id peer)
{
struct GNUNET_PeerIdentity id;
+ struct GNUNET_PeerIdentity *r;
GNUNET_PEER_resolve (peer, &id);
- return GNUNET_CONTAINER_multihashmap_get (t->first_hops,
- &id.hashPubKey);
+ r = GNUNET_CONTAINER_multihashmap_get (t->first_hops, &id.hashPubKey);
+ GNUNET_break (NULL != r);
+
+ return r;
}
int
path_destroy (struct MeshPeerPath *p)
{
+ if (NULL == p)
+ return GNUNET_OK;
GNUNET_PEER_decrement_rcs (p->peers, p->length);
GNUNET_free (p->peers);
GNUNET_free (p);
tree_node_debug(struct MeshTunnelTreeNode *n, uint16_t level)
{
struct MeshTunnelTreeNode *c;
+ struct GNUNET_PeerIdentity id;;
uint16_t i;
for (i = 0; i < level; i++)
if (n->status == MESH_PEER_RECONNECTING)
fprintf(stderr, "*");
- fprintf(stderr, "%u [%p] ", n->peer, n);
+ GNUNET_PEER_resolve(n->peer, &id);
+ fprintf(stderr, "%s, [%u, %p] ", GNUNET_i2s (&id), n->peer, n);
if (NULL != n->parent)
- fprintf(stderr, "(-> %u)\n", n->parent->peer);
+ {
+ GNUNET_PEER_resolve(n->parent->peer, &id);
+ fprintf(stderr, "(-> %s [%u])\n", GNUNET_i2s(&id), n->parent->peer);
+ }
else
fprintf(stderr, "(root)\n");
for (c = n->children_head; NULL != c; c = c->next)
{
struct MeshTunnelTreeNode *n;
struct MeshTunnelTreeNode *next;
+#if MESH_TREE_DEBUG
+ struct GNUNET_PeerIdentity id;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "tree: Destroying node %u\n",
+ parent->peer);
+ GNUNET_PEER_resolve (parent->peer, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "tree: (%s)\n",
+ GNUNET_i2s (&id));
+#endif
n = parent->children_head;
while (NULL != n)
{
tree = GNUNET_malloc(sizeof (struct MeshTunnelTree));
tree->first_hops = GNUNET_CONTAINER_multihashmap_create(32);
tree->root = tree_node_new(NULL, peer);
+ tree->root->status = MESH_PEER_ROOT;
tree->t = t;
tree->root->t = t;
{
tree_mark_peers_disconnected (tree, n, cb);
}
- if (MESH_PEER_READY == parent->status && NULL != cb)
+ if (MESH_PEER_READY == parent->status)
{
- cb (parent);
+ if (NULL != cb)
+ cb (parent);
+ parent->status = MESH_PEER_RECONNECTING;
}
- parent->status = MESH_PEER_RECONNECTING;
/* Remove and free info about first hop */
GNUNET_PEER_resolve(parent->peer, &id);
struct GNUNET_PeerIdentity id;
struct MeshTunnelTreeNode *n;
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(parent->peer, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Finding first hop for %u.\n",
- parent->peer);
+ "tree: Finding first hop for %s.\n",
+ GNUNET_i2s (&id));
+#endif
if (NULL == hop)
{
struct MeshTunnelTreeNode *aux;
struct MeshTunnelTreeNode *old;
- old = parent;
- aux = old->parent;
+ aux = old = parent;
while (aux != tree->me)
{
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(old->peer, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: ... its not %u.\n",
- old->peer);
+ "tree: ... its not %s.\n",
+ GNUNET_i2s (&id));
+#endif
old = aux;
aux = aux->parent;
GNUNET_assert(NULL != aux);
}
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(old->peer, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: It's %u!!\n",
- old->peer);
+ "tree: It's %s!\n",
+ GNUNET_i2s (&id));
+#endif
hop = π
GNUNET_PEER_resolve(old->peer, hop);
}
copy = GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity));
*copy = *hop;
GNUNET_PEER_resolve(parent->peer, &id);
- GNUNET_CONTAINER_multihashmap_put(tree->first_hops, &id.hashPubKey, copy,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ GNUNET_CONTAINER_multihashmap_put(
+ tree->first_hops,
+ &id.hashPubKey,
+ copy,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
for (n = parent->children_head; NULL != n; n = n->next)
{
* NULL when not found
*/
struct MeshTunnelTreeNode *
-tree_del_path (struct MeshTunnelTree *t, GNUNET_PEER_Id peer_id,
- MeshNodeDisconnectCB cb)
+tree_del_path (struct MeshTunnelTree *t,
+ GNUNET_PEER_Id peer_id,
+ MeshNodeDisconnectCB cb)
{
struct MeshTunnelTreeNode *parent;
struct MeshTunnelTreeNode *node;
struct MeshTunnelTreeNode *n;
+#if MESH_TREE_DEBUG
+ struct GNUNET_PeerIdentity id;
+ GNUNET_PEER_resolve(peer_id, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Deleting path to %u.\n", peer_id);
+ "tree: Deleting path to %s.\n",
+ GNUNET_i2s (&id));
+#endif
if (peer_id == t->root->peer)
return NULL;
GNUNET_CONTAINER_DLL_remove(parent->children_head, parent->children_tail, n);
n->parent = NULL;
- while (t->root != parent && 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_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Deleting node %u.\n",
- parent->peer);
+ "tree: Deleting node %s.\n",
+ GNUNET_i2s (&id));
+#endif
n = parent->parent;
tree_node_destroy(parent);
parent = n;
}
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(parent->peer, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Not deleted peer %u.\n",
- parent->peer);
+ "tree: Not deleted peer %s.\n",
+ GNUNET_i2s (&id));
+#endif
tree_mark_peers_disconnected (t, node, cb);
struct GNUNET_PeerIdentity id;
GNUNET_PEER_Id myid;
int me;
+// int oldnode_is_me;
unsigned int i;
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(p->peers[p->length - 1], &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Adding path [%u] towards peer %u.\n",
- p->length,
- p->peers[p->length - 1]);
+ "tree: Adding path [%u] towards peer %s.\n",
+ p->length,
+ GNUNET_i2s (&id));
+#endif
if (NULL != t->me)
myid = t->me->peer;
me = t->root->peer == myid ? 0 : -1;
for (i = 1; i < p->length; i++)
{
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(p->peers[i], &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Looking for peer %u.\n",
- p->peers[i]);
+ "tree: Looking for peer %s.\n",
+ GNUNET_i2s (&id));
+#endif
parent = n;
if (p->peers[i] == myid)
me = i;
{
if (c->peer == p->peers[i])
{
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(parent->peer, &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Found in children of %u.\n",
- parent->peer);
+ "tree: Found in children of %s.\n",
+ GNUNET_i2s (&id));
+#endif
n = c;
break;
}
if (parent == n)
break;
}
+#if MESH_TREE_DEBUG
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"tree: All childen visited.\n");
+#endif
/* Add the rest of the path as a branch from parent. */
while (i < p->length)
{
+#if MESH_TREE_DEBUG
+ GNUNET_PEER_resolve(p->peers[i], &id);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "tree: Adding peer %u, to %u.\n",
- p->peers[i],
- parent->peer);
+ "tree: Adding peer %s.\n",
+ GNUNET_i2s (&id));
+ GNUNET_PEER_resolve(parent->peer, &id);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "tree: to %s.\n",
+ GNUNET_i2s (&id));
+#endif
if (i == p->length - 1 && NULL != oldnode)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "tree: Putting old node into place.\n");
+#if MESH_TREE_DEBUG
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "tree: Putting old node into place.\n");
+#endif
oldnode->parent = parent;
GNUNET_CONTAINER_DLL_insert(parent->children_head,
parent->children_tail,
}
else
{
+#if MESH_TREE_DEBUG
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "tree: Creating new node.\n");
+#endif
n = tree_node_new(parent, p->peers[i]);
n->t = t->t;
n->status = MESH_PEER_RELAY;
/* Add info about first hop into hashmap. */
if (-1 != me && me < p->length - 1)
{
+#if MESH_TREE_DEBUG
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: finding first hop (own pos %d/%u)\n",
+ me, p->length - 1);
+#endif
GNUNET_PEER_resolve (p->peers[me + 1], &id);
tree_update_first_hops(t,
tree_find_peer(t->root, p->peers[p->length - 1]),
&id);
}
+#if MESH_TREE_DEBUG
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "tree: New node added.\n");
+#endif
return GNUNET_OK;
}
/**
- * Deletes a peer from a tunnel, marking its children as disconnected.
+ * Deletes a peer from a tunnel, liberating all unused resources on the path to
+ * it. It shouldn't have children, if it has they will be destroyed as well.
+ * If the tree is not local and no longer has any paths, the root node will be
+ * destroyed and marked as NULL.
*
* @param t Tunnel tree to use.
* @param peer Short ID of the peer to remove from the tunnel tree.
MeshNodeDisconnectCB cb)
{
struct MeshTunnelTreeNode *n;
- struct MeshTunnelTreeNode *c;
- struct MeshTunnelTreeNode *aux;
n = tree_del_path(t, peer, cb);
- c = n->children_head;
- while (NULL != c)
+ if (NULL == n)
+ return GNUNET_SYSERR;
+ GNUNET_break_op (NULL == n->children_head);
+ tree_node_destroy(n);
+ if (NULL == t->root->children_head && t->me != t->root)
{
- aux = c->next;
- GNUNET_CONTAINER_DLL_remove(n->children_head,
- n->children_tail,
- c);
- GNUNET_CONTAINER_DLL_insert(t->disconnected_head,
- t->disconnected_tail,
- c);
- cb (c);
- c = aux;
+ tree_node_destroy (t->root);
+ t->root = NULL;
}
- tree_node_destroy(n);
return GNUNET_OK;
}
void
tree_destroy (struct MeshTunnelTree *t)
{
+#if MESH_TREE_DEBUG
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree: Destroying tree\n");
+#endif
tree_node_destroy(t->root);
GNUNET_CONTAINER_multihashmap_iterate(t->first_hops, &iterate_free, NULL);
GNUNET_CONTAINER_multihashmap_destroy(t->first_hops);
projects / oweals / gnunet.git / blobdiff