1 files changed, 5 insertions, 0 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation.c b/src/experimentation/gnunet-daemon-experimentation.c
index ee632ec86..085dd14b1 100644
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -54,8 +54,11 @@ static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon shutting down ...\n"));
+
+  GNUNET_EXPERIMENTATION_scheduler_stop ();
   GNUNET_EXPERIMENTATION_nodes_stop ();
   GNUNET_EXPERIMENTATION_experiments_stop ();
+  GNUNET_EXPERIMENTATION_storage_stop ();
   GNUNET_EXPERIMENTATION_capabilities_stop ();
 }
 
@@ -83,12 +86,14 @@ run (void *cls, char *const *args, const char *cfgfile,
         }
 
         GNUNET_EXPERIMENTATION_capabilities_start ();
+        GNUNET_EXPERIMENTATION_storage_start ();
         if (GNUNET_SYSERR == GNUNET_EXPERIMENTATION_experiments_start ())
         {
           GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
           return;
         }
         GNUNET_EXPERIMENTATION_nodes_start ();
+  GNUNET_EXPERIMENTATION_scheduler_start ();
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);