authentication of ciphertexts (+ seed)

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

diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index 3d03d76117d2fca36310130c9310659faf0cec6b..8e28a837262e2741f667218d785c34960248a744 100644 (file)
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -40,7 +40,7 @@
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 500)
 
-#define SECONDS_PER_PEER_START 45
+#define SECONDS_PER_PEER_START 120
 
 #define DEFAULT_NUM_PEERS 4
 
@@ -200,8 +200,6 @@ finish_testing ()
               "Called finish testing, stopping daemons.\n");
 #endif
 
-  int count;
-  count = 0;
   pos = test_messages;
   while (pos != NULL)
     {
@@ -272,7 +270,6 @@ disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
 
 static void stats_finished (void *cls, int result)
 {
-  fprintf(stderr, "Finished getting all peers statistics!\n");
   GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
 }
 
@@ -294,7 +291,7 @@ static int stats_print  (void *cls,
                          uint64_t value,
                          int is_persistent)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
   return GNUNET_OK;
 }
 
@@ -377,6 +374,7 @@ process_mtype (void *cls,
       GNUNET_SCHEDULER_cancel (sched, die_task);
       GNUNET_asprintf(&dotOutFileNameFinished, "%s.dot", "final_topology");
       dotOutFileFinished = fopen (dotOutFileNameFinished, "w");
+      GNUNET_free(dotOutFileNameFinished);
       if (dotOutFileFinished != NULL)
       {
         fprintf(dotOutFileFinished, "strict graph G {\n");
@@ -1001,6 +999,7 @@ run (void *cls,
                                            GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
                                            &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
 
+  GNUNET_assert(num_peers > 0 && num_peers < (unsigned int)-1);
   pg = GNUNET_TESTING_daemons_start (sched, cfg,
                                      peers_left, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers), &hostkey_callback, NULL, &peers_started_callback, NULL,
                                      &topology_callback, NULL, NULL);
@@ -1046,6 +1045,7 @@ main (int argc, char *argv[])
   char *our_binary_name;
 
   binary_start_pos = rindex(argv[0], '/');
+  GNUNET_assert(binary_start_pos != NULL);
   topology_string = strstr (binary_start_pos,
                            "_topology");
   GNUNET_assert (topology_string != NULL);