X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftopology%2Ftest_gnunet_daemon_topology.c;h=5c54e0ee31f60289b1b1f9001c46d706664dfcde;hb=ff754768e374c38fdfe8c677e610431dcc667218;hp=f6b671dc088ffbf4c734f05cf32b275487eedc73;hpb=ffc8efb1039f1a96c415ddeec1854aec9d09e896;p=oweals%2Fgnunet.git

diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index f6b671dc0..5c54e0ee3 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -48,8 +48,6 @@ static struct GNUNET_TESTING_Daemon *first;
 
 static struct GNUNET_TESTING_Daemon *last;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 /**
  * Check whether peers successfully shut down.
  */
@@ -108,8 +106,7 @@ notify_connect_complete(void *cls,
     {
       /* FIXME: check that topology adds a few more links
 	 in addition to those that were seeded */
-      GNUNET_SCHEDULER_add_now (sched,
-				&clean_up_task,
+      GNUNET_SCHEDULER_add_now (&clean_up_task,
 				NULL);
     }
 }
@@ -131,12 +128,14 @@ static void my_cb(void *cls,
       return;
     }
   GNUNET_TESTING_daemons_connect (last, d, TIMEOUT, CONNECT_ATTEMPTS,
+                                  GNUNET_YES,
 				  &notify_connect_complete,
 				  NULL);
   if (peers_left == 0)
     {
       /* close circle */
       GNUNET_TESTING_daemons_connect (d, first, TIMEOUT, CONNECT_ATTEMPTS,
+                                      GNUNET_YES,
 				      &notify_connect_complete,
 				      NULL);
     }
@@ -145,19 +144,19 @@ static void my_cb(void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
   ok = 1;
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Starting daemons.\n");
 #endif
   peers_left = NUM_PEERS;
-  pg = GNUNET_TESTING_daemons_start (sched, cfg, 
+  pg = GNUNET_TESTING_daemons_start (cfg,
+				     peers_left,
+				     peers_left,
 				     peers_left,
 				     TIMEOUT,
 				     NULL, NULL,