[GNUnet-SVN] r17975 - gnunet/src/testing

[gnunet]

Author: bartpolot
Date: 2011-11-04 02:00:45 +0100 (Fri, 04 Nov 2011)
New Revision: 17975

Modified:
   gnunet/src/testing/testing_peergroup.c
Log:
Fixed error handling

Modified: gnunet/src/testing/testing_peergroup.c
===================================================================
--- gnunet/src/testing/testing_peergroup.c      2011-11-03 21:21:36 UTC (rev 
17974)
+++ gnunet/src/testing/testing_peergroup.c      2011-11-04 01:00:45 UTC (rev 
17975)
@@ -559,10 +559,12 @@
     GNUNET_SCHEDULER_cancel (pg_start_ctx->die_task);
     /* Set up task in case topology creation doesn't finish
      * within a reasonable amount of time */
+    GNUNET_free_non_null (pg_start_ctx->fail_reason);
+    pg_start_ctx->fail_reason = GNUNET_strdup ("from create_topology");
     pg_start_ctx->die_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
                                       (pg_start_ctx->timeout), &end_badly,
-                                      "from create_topology");
+                                      pg_start_ctx);
     pg_start_ctx->peers_left = pg_start_ctx->total;     /* Reset counter */
     create_expected_connections =
         GNUNET_TESTING_create_topology (pg_start_ctx->pg,
@@ -579,17 +581,22 @@
     else
     {
       GNUNET_SCHEDULER_cancel (pg_start_ctx->die_task);
+      GNUNET_free_non_null (pg_start_ctx->fail_reason);
+      pg_start_ctx->fail_reason =
+          GNUNET_strdup ("from create topology (bad return)");
       pg_start_ctx->die_task =
-          GNUNET_SCHEDULER_add_now (&end_badly,
-                                    "from create topology (bad return)");
+          GNUNET_SCHEDULER_add_now (&end_badly, pg_start_ctx);
       return;
     }
 
     GNUNET_SCHEDULER_cancel (pg_start_ctx->die_task);
+    GNUNET_free_non_null (pg_start_ctx->fail_reason);
+      pg_start_ctx->fail_reason =
+          GNUNET_strdup ("from continue startup (timeout)");
     pg_start_ctx->die_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
                                       (pg_start_ctx->timeout), &end_badly,
-                                      "from continue startup (timeout)");
+                                      pg_start_ctx);
   }
 }