- fix handling of duplicate incoming channel create with respect to queued retransmis...

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

diff --git a/src/mesh/mesh_test_lib.c b/src/mesh/mesh_test_lib.c
index 7ad888da865f1a81881051ef9e6b1531c0d7a96b..3fa73df4d8f7baf71ba9ae5ecfc950f3724eceaf 100644 (file)
--- a/src/mesh/mesh_test_lib.c
+++ b/src/mesh/mesh_test_lib.c
@@ -177,7 +177,10 @@ mesh_connect_cb (void *cls,
   }
   for (i = 0; i < ctx->num_peers; i++)
     if (op == ctx->ops[i])
+    {
       ctx->meshes[i] = ca_result;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "...mesh %u connected\n", i);
+    }
   for (i = 0; i < ctx->num_peers; i++)
     if (NULL == ctx->meshes[i])
       return; /* still some MESH connections missing */
@@ -232,14 +235,20 @@ mesh_test_run (void *cls,
   struct GNUNET_MESH_TEST_Context *ctx = cls;
   unsigned int i;
 
-  GNUNET_assert (num_peers == ctx->num_peers);
+  if  (num_peers != ctx->num_peers)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers started %u/%u, ending\n",
+                num_peers, ctx->num_peers);
+    exit (1);
+  }
   ctx->peers = peers;
   for (i = 0; i < num_peers; i++)
   {
     struct GNUNET_MESH_TEST_AdapterContext *newctx;
-    newctx = GNUNET_malloc (sizeof (struct GNUNET_MESH_TEST_AdapterContext));
+    newctx = GNUNET_new (struct GNUNET_MESH_TEST_AdapterContext);
     newctx->peer = i;
     newctx->ctx = ctx;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connecting to mesh %u\n", i);
     ctx->ops[i] = GNUNET_TESTBED_service_connect (ctx,
                                                   peers[i],
                                                   "mesh",
@@ -248,6 +257,7 @@ mesh_test_run (void *cls,
                                                   &mesh_connect_adapter,
                                                   &mesh_disconnect_adapter,
                                                   newctx);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "op handle %p\n", ctx->ops[i]);
   }
 }
 
@@ -265,7 +275,7 @@ GNUNET_MESH_TEST_run (const char *testname,
 {
   struct GNUNET_MESH_TEST_Context *ctx;
 
-  ctx = GNUNET_malloc (sizeof (struct GNUNET_MESH_TEST_Context));
+  ctx = GNUNET_new (struct GNUNET_MESH_TEST_Context);
   ctx->num_peers = num_peers;
   ctx->ops = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Operation *));
   ctx->meshes = GNUNET_malloc (num_peers * sizeof (struct GNUNET_MESH_Handle *));