Added new test for multiple clients on one peer

Fixed dumb obvious bug in api

1 files changed, 10 insertions, 9 deletions

diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c
index 060db9c8a..ada8e10e7 100644
--- a/src/mesh/test_mesh_api.c
+++ b/src/mesh/test_mesh_api.c
@@ -34,9 +34,10 @@
 
 static struct GNUNET_OS_Process *arm_pid;
 static struct GNUNET_MESH_Handle *mesh;
+static struct GNUNET_MESH_Tunnel *t;
 static int result;
-GNUNET_SCHEDULER_TaskIdentifier abort_task;
-GNUNET_SCHEDULER_TaskIdentifier test_task;
+static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static GNUNET_SCHEDULER_TaskIdentifier test_task;
 
 /**
  * Function is called whenever a message is received.
@@ -101,26 +102,26 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   static const GNUNET_MESH_ApplicationType app[] =
       { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
-  struct GNUNET_MESH_Tunnel *t;
 
   test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0;
   mesh = GNUNET_MESH_connect (cfg, 10, NULL, NULL, NULL, handlers, app);
   if (NULL == mesh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't connect to mesh :(\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n");
     return;
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO MESH :D\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n");
   }
 
   t = GNUNET_MESH_tunnel_create (mesh, NULL, NULL, NULL, NULL);
+  if (NULL != t)
+  {
+    GNUNET_MESH_tunnel_destroy (t);
+  }
 
-  GNUNET_MESH_tunnel_destroy (t);
-
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 1), &do_shutdown,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown,
                                 NULL);
 }