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

[gnunet]

Author: nevans
Date: 2010-06-29 15:25:57 +0200 (Tue, 29 Jun 2010)
New Revision: 12047

Modified:
   gnunet/src/testing/testing_group.c
Log:
fix for null hostkey callback on daemons_start call

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-06-29 12:56:48 UTC (rev 12046)
+++ gnunet/src/testing/testing_group.c  2010-06-29 13:25:57 UTC (rev 12047)
@@ -365,6 +365,11 @@
    * How many peers are being started right now?
    */
   unsigned int starting;
+
+  /**
+   * How many peers have already been started?
+   */
+  unsigned int started;
 };
 
 struct UpdateContext
@@ -2850,7 +2855,14 @@
 {
   struct InternalStartContext *internal_context = cls;
   internal_context->peer->pg->starting--;
-  internal_context->hostkey_callback(internal_context->hostkey_cls, id, d, 
emsg);
+  internal_context->peer->pg->started++;
+  if (internal_context->hostkey_callback != NULL)
+    internal_context->hostkey_callback(internal_context->hostkey_cls, id, d, 
emsg);
+  else if (internal_context->peer->pg->started == 
internal_context->peer->pg->total)
+    {
+      internal_context->peer->pg->started = 0; /* Internal startup may use 
this counter! */
+      GNUNET_TESTING_daemons_continue_startup(internal_context->peer->pg);
+    }
 }
 
 /**
@@ -2871,7 +2883,8 @@
 {
   struct InternalStartContext *internal_context = cls;
   internal_context->peer->pg->starting--;
-  internal_context->start_cb(internal_context->start_cb_cls, id, cfg, d, emsg);
+  if (internal_context->start_cb != NULL)
+    internal_context->start_cb(internal_context->start_cb_cls, id, cfg, d, 
emsg);
 }
 
 static void