[GNUnet-SVN] r16999 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2011-09-21 22:50:20 +0200 (Wed, 21 Sep 2011)
New Revision: 16999

Modified:
   gnunet/src/mesh/mesh_tunnel_tree.c
   gnunet/src/mesh/mesh_tunnel_tree.h
   gnunet/src/mesh/test_mesh_path_api.c
Log:
Added debug print of tree structure

Modified: gnunet/src/mesh/mesh_tunnel_tree.c
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.c  2011-09-21 20:42:20 UTC (rev 16998)
+++ gnunet/src/mesh/mesh_tunnel_tree.c  2011-09-21 20:50:20 UTC (rev 16999)
@@ -28,6 +28,28 @@
 #include "mesh_tunnel_tree.h"
 
 
+static void
+debug_node(struct MeshTunnelTreeNode *n, uint16_t level)
+{
+  uint16_t i;
+
+  for (i = 0; i < level; i++)
+    fprintf(stderr, " ");
+  fprintf(stderr, "%u\n", n->peer);
+  for (i = 0; i < n->nchildren; i++)
+    debug_node(&n->children[i], level + 1);
+}
+
+
+
+void
+tree_debug(struct MeshTunnelTree *t)
+{
+  debug_node(t->root, 0);
+}
+
+
+
 /**
  * Invert the path
  *

Modified: gnunet/src/mesh/mesh_tunnel_tree.h
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.h  2011-09-21 20:42:20 UTC (rev 16998)
+++ gnunet/src/mesh/mesh_tunnel_tree.h  2011-09-21 20:50:20 UTC (rev 16999)
@@ -271,4 +271,8 @@
  * @param t Tree to be destroyed
  */
 void
-tree_destroy (struct MeshTunnelTree *t);
\ No newline at end of file
+tree_destroy (struct MeshTunnelTree *t);
+
+
+void
+tree_debug(struct MeshTunnelTree *t);
\ No newline at end of file

Modified: gnunet/src/mesh/test_mesh_path_api.c
===================================================================
--- gnunet/src/mesh/test_mesh_path_api.c        2011-09-21 20:42:20 UTC (rev 
16998)
+++ gnunet/src/mesh/test_mesh_path_api.c        2011-09-21 20:50:20 UTC (rev 
16999)
@@ -233,15 +233,16 @@
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
     failed++;
   }
-  path->length++;
-  path_destroy(path);
-  finish();
 
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding third path...\n");
   path->length++;
   path->peers[3] = 4;
   tree_add_path(tree, path, &cb);
 
+  path_destroy(path);
+  tree_debug(tree);
+  finish();
+
   node = tree_find_peer(tree->root, 2);
   if (node->peer != 2)
   {