fixes for list queues

3 files changed, 11 insertions, 8 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index e3cad76bc..3d2868df7 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -428,7 +428,6 @@ static void node_make_active (struct Node *n)
         update_stats (nodes_active);
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s' as active node\n"),
                         GNUNET_i2s (&n->id));
-return;
         /* Request experiments for this node to start them */
         for (c1 = 0; c1 < n->issuer_count; c1++)
         {
@@ -1077,6 +1076,12 @@ GED_nodes_start ()
 void
 GED_nodes_stop ()
 {
+  if (NULL != ch)
+  {
+                GNUNET_CORE_disconnect (ch);
+                ch = NULL;
+  }
+
   if (NULL != nodes_requested)
   {
                 GNUNET_CONTAINER_multihashmap_iterate (nodes_requested,
@@ -1106,11 +1111,6 @@ GED_nodes_stop ()
                 GNUNET_CONTAINER_multihashmap_destroy (nodes_inactive);
                 nodes_inactive = NULL;
   }
-  if (NULL != ch)
-  {
-                GNUNET_CORE_disconnect (ch);
-                ch = NULL;
-  }
 }
 
 /* end of gnunet-daemon-experimentation_nodes.c */
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index 519caa877..c1a948efe 100644
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -258,11 +258,14 @@ GED_scheduler_handle_start_ack (struct Node *n, struct Experiment *e)
                         "START_ACK", GNUNET_i2s (&n->id), e->name);
 
         if (GNUNET_SCHEDULER_NO_TASK != se->task)
+        {
                 GNUNET_SCHEDULER_cancel (se->task); /* *Canceling timeout task */
+                se->task = GNUNET_SCHEDULER_NO_TASK;
+        }
 
         /* Remove from waiting list, add to running list */
         GNUNET_CONTAINER_DLL_remove (waiting_out_head, waiting_out_tail, se);
-        GNUNET_CONTAINER_DLL_insert (running_out_head, waiting_out_tail, se);
+        GNUNET_CONTAINER_DLL_insert (running_out_head, running_out_tail, se);
 
         /* Change state and schedule to run */
         se->state = STARTED;
diff --git a/src/experimentation/test_experimentation_clique_run.c b/src/experimentation/test_experimentation_clique_run.c
index 35f48bce2..bc325c5c9 100644
--- a/src/experimentation/test_experimentation_clique_run.c
+++ b/src/experimentation/test_experimentation_clique_run.c
@@ -179,7 +179,7 @@ check_end ()
         if (t_running_experiments == (NUM_PEERS * NUM_EXPERIMENTS))
         {
                         fprintf (stderr, "\n");
-                        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All %u peers are running experiments\n", NUM_PEERS);
+                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "All %u peers are running experiments\n", NUM_PEERS);
                         GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
         }
 }