Fix testcase

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

diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c
index 8e7bca807efd5ab56ff188d8077f2e289546387c..1699097f6cfcc8fa30ae578037e4cb1de17d8f3f 100644 (file)
--- 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.
@@ -54,9 +55,9 @@ static int
 callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
           const struct GNUNET_PeerIdentity *sender,
           const struct GNUNET_MessageHeader *message,
-          const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+          const struct GNUNET_ATS_Information *atsi)
 {
-  return 0;
+  return GNUNET_OK;
 }
 
 static struct GNUNET_MESH_MessageHandler handlers[] = { {&callback, 1, 0},
@@ -99,31 +100,29 @@ static void
 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;
+  static const GNUNET_MESH_ApplicationType app[] =
+      { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
 
   test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0;
-  mesh = GNUNET_MESH_connect (cfg, NULL, NULL, handlers, app);
+  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);
-
-  GNUNET_MESH_tunnel_destroy(t);
+  t = GNUNET_MESH_tunnel_create (mesh, NULL, NULL, NULL, NULL);
+  if (NULL != t)
+  {
+    GNUNET_MESH_tunnel_destroy (t);
+  }
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 5), &do_shutdown,
-                                NULL);
+                                    (GNUNET_TIME_UNIT_SECONDS, 5), &do_shutdown, NULL);
 }
 
 
@@ -151,7 +150,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                     (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
                                     NULL);
 
-  test_task = GNUNET_SCHEDULER_add_now (&test, (void *)cfg);
+  test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg);
 
 }