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

[gnunet]

Author: bartpolot
Date: 2012-12-20 14:24:15 +0100 (Thu, 20 Dec 2012)
New Revision: 25579

Modified:
   gnunet/src/mesh/test_mesh_small.c
Log:
- fixes, consistency, test name

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-12-20 11:20:30 UTC (rev 25578)
+++ gnunet/src/mesh/test_mesh_small.c   2012-12-20 13:24:15 UTC (rev 25579)
@@ -233,7 +233,6 @@
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  fprintf(stderr, "b");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
   shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
 }
@@ -251,7 +250,6 @@
   long line = (long) cls;
   unsigned int i;
 
-  fprintf(stderr, "a");
   for (i = 0; i < 3; i++)
     if (NULL != t_op[i])
     {
@@ -673,7 +671,7 @@
   struct GNUNET_PeerIdentity *dest;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "peer %s connected\n", GNUNET_i2s (peer));
+              "%ld peer %s connected\n", i, GNUNET_i2s (peer));
 
   if (0 == memcmp (p_id[2], peer, sizeof (struct GNUNET_PeerIdentity)) &&
       i == 0L)
@@ -792,6 +790,7 @@
     return;
   }
   p_id[i] = pinfo->result.id;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  id: %s\n", GNUNET_i2s (p_id[i]));
   p_ids++;
   if ((MULTICAST == test && p_ids < 3) || p_ids < 2)
     return;
@@ -822,7 +821,7 @@
   peers_running = num_peers;
   h1 = meshes[0];
   h2 = meshes[num_peers - 1];
-  t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
+  t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 0L);
   if (SPEED_MIN == test)
   {
     GNUNET_MESH_tunnel_speed_min(t);
@@ -949,7 +948,7 @@
   }
 
   p_ids = 0;
-  GNUNET_MESH_TEST_run (test_name,
+  GNUNET_MESH_TEST_run ("test_mesh_small",
                         "test_mesh_small.conf",
                         5,
                         &tmain,