WiP

1 files changed, 28 insertions, 23 deletions

diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c
index 5f988f555..6c3bd60a9 100644
--- a/src/mesh/test_mesh_api.c
+++ b/src/mesh/test_mesh_api.c
@@ -11,28 +11,40 @@ static struct GNUNET_OS_Process            *arm_pid;
 
 static struct GNUNET_MESH_Handle           *mesh;
 
-static struct GNUNET_DHT_Handle            *dht;
-
 static void
-  do_shutdown (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (NULL != mesh)
-    GNUNET_MESH_disconnect (mesh);
-    if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
+    if (NULL != mesh) {
+        GNUNET_MESH_disconnect (mesh);
+    }
+    if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    }
     GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
     GNUNET_OS_process_close (arm_pid);
 }
 
 
 static void
+error_shutdown (void *cls,
+                const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+    if (NULL != mesh) {
+        GNUNET_MESH_disconnect (mesh);
+    }
+    if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    }
+    GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
+    GNUNET_OS_process_close (arm_pid);
+}
+
+static void
 run (void *cls,
      char *const *args,
      const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) {
     GNUNET_MESH_ApplicationType         app;
-    // char                                buffer[2048];
-
 
     arm_pid = GNUNET_OS_start_process (NULL, NULL,
                                        "gnunet-service-arm",
@@ -40,13 +52,6 @@ run (void *cls,
                                        "-L", "DEBUG",
                                        "-c", "test_mesh.conf",
                                        NULL);
-    dht = GNUNET_DHT_connect(cfg, 100);
-    if(NULL == dht) {
-        GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Couldn't connect to dht :(\n");
-    } else {
-        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO DHT :D\n");
-    }
-
     app = 0;
     mesh = GNUNET_MESH_connect(cfg, NULL, NULL, handlers, &app);
     if(NULL == mesh) {
@@ -56,15 +61,13 @@ run (void *cls,
     }
 
     /* do real test work here */
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &do_shutdown,
-                                  NULL);
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                    GNUNET_TIME_UNIT_SECONDS, 5),
+                                  &do_shutdown,
+                                  NULL);
 }
 
 
-
-
-
 int main (int argc, char *argv[]) {
     int ret;
     char *const argv2[] = {"test-mesh-api",
@@ -80,7 +83,9 @@ int main (int argc, char *argv[]) {
                         argv2, "test-mesh-api", "nohelp",
                         options, &run, NULL);
     if (ret != GNUNET_OK) {
-        GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "test-mesh-api': Failed with error code %d\n", ret);
+        GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+                   "test-mesh-api': Failed with error code %d\n", ret);
+        return 1;
     }
     return 0;
 }