clique topology optimization, progress meter for connecting

[oweals/gnunet.git] / src / testing / test_testing_connect.c

diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index 8563014f2a3c91b0331e2aac81c33dd8e6ea9c22..6c65077377013ef8580b9032648d439c1a2094d9 100644 (file)
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -26,7 +26,6 @@
 
 #define VERBOSE GNUNET_NO
 
-
 /**
  * How long until we give up on connecting the peers?
  */
@@ -44,8 +43,6 @@ static struct GNUNET_CONFIGURATION_Handle *c1;
 
 static struct GNUNET_CONFIGURATION_Handle *c2;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static void
 end2_cb (void *cls, const char *emsg)
 {
@@ -70,7 +67,8 @@ end1_cb (void *cls, const char *emsg)
 {
   if (emsg != NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping daemon 1 gave: %s\n", emsg);
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping daemon 1 gave: %s\n",
+                  emsg);
       ok = 1;
     }
   else
@@ -78,14 +76,16 @@ end1_cb (void *cls, const char *emsg)
       ok = 0;
     }
 
-  GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL, GNUNET_YES, GNUNET_NO);
+  GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL, GNUNET_YES,
+                              GNUNET_NO);
   d2 = NULL;
 }
 
 static void
-finish_testing(void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &end1_cb, NULL, GNUNET_YES, GNUNET_NO);
+  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &end1_cb, NULL, GNUNET_YES,
+                              GNUNET_NO);
   d1 = NULL;
 }
 
@@ -100,7 +100,7 @@ my_connect_complete (void *cls,
                      struct GNUNET_TESTING_Daemon *second_daemon,
                      const char *emsg)
 {
-  GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+  GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
 }
 
 
@@ -116,7 +116,9 @@ my_cb2 (void *cls,
               "Daemon `%s' started.\n", GNUNET_i2s (id));
 #endif
   GNUNET_TESTING_daemons_connect (d1, d2,
-                                  TIMEOUT, CONNECT_ATTEMPTS, &my_connect_complete, NULL);
+                                  TIMEOUT, CONNECT_ATTEMPTS,
+                                  GNUNET_YES,
+                                  &my_connect_complete, NULL);
 }
 
 
@@ -131,7 +133,9 @@ my_cb1 (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemon `%s' started.\n", GNUNET_i2s (id));
 #endif
-  d2 = GNUNET_TESTING_daemon_start (sched, c2, TIMEOUT, NULL, NULL, NULL, &my_cb2, NULL);
+  d2 =
+    GNUNET_TESTING_daemon_start (c2, TIMEOUT, NULL, NULL, 0, NULL, NULL, NULL,
+                                 &my_cb2, NULL);
   GNUNET_assert (d2 != NULL);
 
 }
@@ -139,11 +143,9 @@ my_cb1 (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 daemon.\n");
@@ -152,7 +154,9 @@ run (void *cls,
   GNUNET_CONFIGURATION_parse (c1, "test_testing_connect_peer1.conf");
   c2 = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_parse (c2, "test_testing_connect_peer2.conf");
-  d1 = GNUNET_TESTING_daemon_start (sched, c1, TIMEOUT, NULL, NULL, NULL, &my_cb1, NULL);
+  d1 =
+    GNUNET_TESTING_daemon_start (c1, TIMEOUT, NULL, NULL, 0, NULL, NULL, NULL,
+                                 &my_cb1, NULL);
   GNUNET_assert (d1 != NULL);
 }