void
cb (const struct MeshTunnelTreeNode *n)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Desconnected %u\n", n->peer);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: CB: Disconnected %u\n", n->peer);
if(0 == cb_call)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: and it shouldn't!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: and it shouldn't!\n");
failed++;
}
cb_call--;
{
unsigned int i;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Finishing...\n");
for (i = 0; i < 10; i++)
{
GNUNET_free(pi[i]);
struct GNUNET_PeerIdentity *pi;
pi = GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity));
- pi->hashPubKey.bits[0] = id;
+ pi->hashPubKey.bits[0] = id + 1;
return pi;
}
{
struct MeshTunnelTreeNode *node;
struct MeshTunnelTreeNode *node2;
- struct MeshPeerPath *path[10];
+ struct MeshPeerPath *path;
+ struct MeshPeerPath *path1;
unsigned int i;
failed = 0;
for (i = 0; i < 10; i++)
{
pi[i] = get_pi(i);
- GNUNET_break (i != GNUNET_PEER_intern(pi[i]));
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peer %u: %s\n", i,
+ GNUNET_break (i + 1 == GNUNET_PEER_intern(pi[i]));
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peer %u: %s\n",
+ i + 1,
GNUNET_h2s(&pi[i]->hashPubKey));
}
tree = GNUNET_malloc(sizeof(struct MeshTunnelTree));
tree->first_hops = GNUNET_CONTAINER_multihashmap_create(32);
tree->root = GNUNET_malloc(sizeof(struct MeshTunnelTreeNode));
- tree->root->peer = 0;
+ tree->root->peer = 1;
tree->me = tree->root;
- path[0] = GNUNET_malloc(sizeof(struct MeshPeerPath));
- path[0]->peers = GNUNET_malloc(sizeof(GNUNET_PEER_Id) * 4);
- path[0]->peers[0] = 0;
- path[0]->peers[1] = 1;
- path[0]->peers[2] = 2;
- path[0]->peers[3] = 3;
- path[0]->length = 4;
+ path = path_new (4);
+ path->peers[0] = 1;
+ path->peers[1] = 2;
+ path->peers[2] = 3;
+ path->peers[3] = 4;
+ path->length = 4;
- finish();
- tree_add_path(tree, path[0], &cb);
- path[1] = tree_get_path_to_peer(tree, 3);
- if (path[0]->length != path[1]->length ||
- memcmp(path[0]->peers, path[1]->peers, path[0]->length) != 0)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding first path: 1 2 3 4\n");
+ tree_add_path(tree, path, &cb);
+ tree_debug(tree);
+ path1 = tree_get_path_to_peer(tree, 4);
+ if (path->length != path1->length ||
+ memcmp(path->peers, path1->peers, path->length) != 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved path != original\n");
failed++;
}
- path_destroy(path[1]);
- node = tree_find_peer(tree->root, 3);
- if (node->peer != 3)
+ path_destroy(path1);
+ node = tree_find_peer(tree->root, 4);
+ if (node->peer != 4)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- node->status = MESH_PEER_READY;
- if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "4 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 4)));
failed++;
}
- return 0;
- node = tree_find_peer(tree->root, 2);
- if (node->peer != 2)
+ node = tree_find_peer(tree->root, 3);
+ if (node->peer != 3)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "4 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 4)));
failed++;
}
- node = tree_find_peer(tree->root, 1);
- if (node->peer != 1)
+ node = tree_find_peer(tree->root, 2);
+ if (node->peer != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- path[0]->length--;
- tree_add_path(tree, path[0], &cb);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding second path: 1 2 3\n");
+ path->length--;
+ tree_add_path(tree, path, &cb);
+ tree_debug(tree);
- node = tree_find_peer(tree->root, 2);
- if (node->peer != 2)
+ node = tree_find_peer(tree->root, 4);
+ if (node->peer != 4)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
if (node->status != MESH_PEER_SEARCHING)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, " expected SEARCHING, got %u\n", node->status);
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "4 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 4)));
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 2)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "3 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 3)));
failed++;
}
- node = tree_find_peer(tree->root, 1);
- if (node->peer != 1)
+ node = tree_find_peer(tree->root, 2);
+ if (node->peer != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
if (node->status != MESH_PEER_RELAY)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, " expected RELAY\n");
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- path[0]->length++;
- path[0]->peers[3] = 4;
- tree_add_path(tree, path[0], &cb);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding third path...\n");
+ path->length++;
+ path->peers[3] = 5;
+ tree_add_path(tree, path, &cb);
+ tree_debug(tree);
- node = tree_find_peer(tree->root, 2);
- if (node->peer != 2)
+ node = tree_find_peer(tree->root, 3);
+ if (node->peer != 3)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 2)
+ if (node->children_head->next != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
failed++;
}
- node = tree_find_peer(tree->root, 1);
- if (node->peer != 1)
+ node = tree_find_peer(tree->root, 2);
+ if (node->peer != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- node = tree_find_peer(tree->root, 4);
- if (node->peer != 4)
+ node = tree_find_peer(tree->root, 5);
+ if (node->peer != 5)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
}
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Deleting third path...\n");
node->status = MESH_PEER_READY;
cb_call = 1;
- node2 = tree_del_path(tree, 4, &cb);
+ node2 = tree_del_path(tree, 5, &cb);
+ tree_debug(tree);
if (cb_call != 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%u callbacks missed!\n", cb_call);
failed++;
}
- if (node2->peer != 4)
+ if (node2->peer != 5)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
}
-// GNUNET_free(node2); FIXME destroy
- node = tree_find_peer(tree->root, 2);
- if (node->peer != 2)
+
+ node = tree_find_peer(tree->root, 3);
+ if (node->peer != 3)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 1)
+ if (node->children_head != node->children_tail)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- path[0]->length = 2;
- path[0]->peers[1] = 3;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Destroying node copy...\n");
+ GNUNET_free (node2);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding new shorter first path...\n");
+ path->length = 2;
+ path->peers[1] = 4;
cb_call = 1;
- tree_add_path(tree, path[0], cb);
+ tree_find_peer(tree->root, 4)->status = MESH_PEER_READY;
+ tree_add_path(tree, path, cb);
+ tree_debug(tree);
if (cb_call != 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%u callbacks missed!\n", cb_call);
failed++;
- }
- node = tree_find_peer(tree->root, 2);
- if (node->peer != 2)
+ }
+ node = tree_find_peer(tree->root, 3);
+ if (node->peer != 3)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 0)
+ if (node->children_head != NULL)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- node = tree_find_peer(tree->root, 3);
- if (node->peer != 3)
+ node = tree_find_peer(tree->root, 4);
+ if (node->peer != 4)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
failed++;
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
failed++;
}
- if (node->nchildren != 0)
+ if (node->children_head != NULL)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 2)) != 1)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 2)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
failed++;
}
- if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 3)
+ if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 4)
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
failed++;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%u tests failed\n", failed);
return 1;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: OK\n");
+ GNUNET_free (path);
+ finish();
+
return 0;
}