#define MESH_TUNNEL_TREE_C
#endif
-#define VERBOSE 1
+static int failed;
+static int cb_call;
+static struct GNUNET_PeerIdentity *pi[10];
+static struct MeshTunnelTree *tree;
-int failed;
-int cb_call;
-struct GNUNET_PeerIdentity *pi[10];
-struct MeshTunnelTree *tree;
+/**
+ * Whole tree iterator.
+ *
+ * @param cls Closure (unused).
+ * @param peer_id Short ID of the node.
+ * @param parent_id Short ID of the parent node.
+ */
+static void
+tree_cb (void *cls, GNUNET_PEER_Id peer_id, GNUNET_PEER_Id parent_id)
+{
+ fprintf (stdout, "%u -> %u\n", peer_id, parent_id);;
+}
+
+
+/**
+ * Node children iterator.
+ *
+ * @param cls Closure (unused).
+ * @param peer_idShort ID of the child.
+ */
static void
cb (void *cls, GNUNET_PEER_Id peer_id)
{
}
+/**
+ * Print debug information about the state of the tree.
+ *
+ * @param tree Tree to debug-print.
+ */
+static void
+test_debug (struct MeshTunnelTree *tree)
+{
+ tree_debug (tree);
+ tree_iterate_all (tree, &tree_cb, NULL);
+}
+
+
/**
* Check if a node has all expected properties.
*
}
+/**
+ * Clean up and free all memory.
+ */
static void
finish (void)
{
failed = 0;
cb_call = 0;
GNUNET_log_setup ("test_mesh_api_tree",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
for (i = 0; i < 10; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Adding first path: 1 2 3 4\n");
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
path1 = tree_get_path_to_peer (tree, 4);
if (NULL == path1 || path->length != path1->length ||
memcmp (path->peers, path1->peers, path->length) != 0)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Adding second path: 1 2 3\n");
path->length--;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (4, MESH_PEER_SEARCHING, 0, 2);
test_assert (3, MESH_PEER_SEARCHING, 1, 2);
path->length++;
path->peers[3] = 5;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (5, MESH_PEER_SEARCHING, 0, 2);
test_assert (4, MESH_PEER_SEARCHING, 0, 2);
tree_set_status (tree, 5, MESH_PEER_READY);
cb_call = 1;
node = tree_del_path (tree, 5, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
if (cb_call != 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%u callbacks missed!\n", cb_call);
cb_call = 1;
tree_find_peer (tree, 4)->status = MESH_PEER_READY;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
if (cb_call != 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%u callbacks missed!\n", cb_call);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Adding first path: 2 1 3\n");
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (3, MESH_PEER_SEARCHING, 0, 3);
test_assert (1, MESH_PEER_RELAY, 1, 0);
path->peers[4] = 3;
path->length = 5;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (3, MESH_PEER_SEARCHING, 0, 4);
test_assert (5, MESH_PEER_RELAY, 1, 4);
path->peers[7] = 3;
path->length = 8;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (3, MESH_PEER_SEARCHING, 0, 7);
test_assert (5, MESH_PEER_RELAY, 1, 7);
path->peers[2] = 3;
path->length = 3;
tree_add_path (tree, path, &cb, NULL);
- tree_debug (tree);
+ test_debug (tree);
test_assert (3, MESH_PEER_SEARCHING, 0, 3);
test_assert (1, MESH_PEER_RELAY, 1, 0);