- leaks

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

diff --git a/src/mesh/test_mesh_2dtorus.c b/src/mesh/test_mesh_2dtorus.c
index 6d91185cc54fd6715245873f8e7ac2c4987d5e67..58777c001a12f652bd3f0947377de97402cf0333 100644 (file)
--- a/src/mesh/test_mesh_2dtorus.c
+++ b/src/mesh/test_mesh_2dtorus.c
@@ -114,6 +114,7 @@ shutdown_callback (void *cls, const char *emsg)
                 "test: All peers successfully shut down!\n");
   }
 #endif
+  GNUNET_CONFIGURATION_destroy (testing_cfg);
 }
 
 
@@ -125,7 +126,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #endif
 
   GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_CONFIGURATION_destroy (testing_cfg);
 }
 
 
@@ -171,7 +171,7 @@ topo_cb (void *cls, const struct GNUNET_PeerIdentity *first,
       if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
       {
         GNUNET_SCHEDULER_cancel (disconnect_task);
-        GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
+        disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
       }
       return;
     }
@@ -296,12 +296,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n");
-  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing_old",
                                          "use_progressbars", "YES");
 #endif
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing_old",
                                              "num_peers", &num_peers))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -316,7 +316,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                        hosts);
   GNUNET_assert (pg != NULL);
   shutdown_handle =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_get_forever (),
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                     &shutdown_task, NULL);
 }