- start test only after warmup

[oweals/gnunet.git] / src / mesh / gnunet-mesh.c

diff --git a/src/mesh/gnunet-mesh.c b/src/mesh/gnunet-mesh.c
index 97b0e26b470c69120ff031e4d70044d3f9c4bf91..a502ab5fbf9a3ca4900eac44c5aca1712045e482 100644 (file)
--- a/src/mesh/gnunet-mesh.c
+++ b/src/mesh/gnunet-mesh.c
@@ -439,12 +439,13 @@ data_callback (void *cls,
  * @param cls Closure.
  * @param peer Peer, or NULL on "EOF".
  * @param tunnel Do we have a tunnel towards this peer?
+ * @param n_paths Number of known paths towards this peer.
  * @param best_path How long is the best path?
  *                  (0 = unknown, 1 = ourselves, 2 = neighbor)
  */
 static void
 peers_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
-                int tunnel, unsigned int best_path)
+                int tunnel, unsigned int n_paths, unsigned int best_path)
 {
   if (NULL == peer)
   {
@@ -454,8 +455,8 @@ peers_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
     }
     return;
   }
-  FPRINTF (stdout, "%s tunnel: %c, best path %u hops]\n",
-           GNUNET_i2s_full (peer), tunnel ? 'Y' : 'N', best_path);
+  FPRINTF (stdout, "%s tunnel: %c, paths: %u\n",
+           GNUNET_i2s_full (peer), tunnel ? 'Y' : 'N', n_paths);
 }
 
 
@@ -513,11 +514,17 @@ tunnel_callback (void *cls,
                  unsigned int estate,
                  unsigned int cstate)
 {
+  unsigned int i;
+
   if (NULL != peer)
   {
     FPRINTF (stdout, "Tunnel %s\n", GNUNET_i2s_full (peer));
     FPRINTF (stdout, "- %u channels\n", n_channels);
+    for (i = 0; i < n_channels; i++)
+      FPRINTF (stdout, "   %u\n", channels[i]);
     FPRINTF (stdout, "- %u connections\n", n_connections);
+    for (i = 0; i < n_connections; i++)
+      FPRINTF (stdout, "   %s\n", GNUNET_h2s_full (&connections[i]));
     FPRINTF (stdout, "- enc state: %u\n", estate);
     FPRINTF (stdout, "- con state: %u\n", cstate);
   }