Implement GNUNET_TESTBED_get_statistics() - resolves #2662

Test case for testing GNUNET_TESTBED_get_statistics()
Fix waiting for SHUTDOWN_PEERS reply when controller crashes

1 files changed, 13 insertions, 10 deletions

diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 24ca2653c..3bd6f1db8 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -800,18 +800,21 @@ controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
 
   if (status != GNUNET_OK)
   {
-    switch (rc->state)
-    {
-    case RC_INIT:
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
-      return;
-    default:
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Controller crash detected. Shutting down.\n");
-      rc->cproc = NULL;
-      shutdown_now (rc);
-      return;
+    rc->cproc = NULL;
+    if (NULL != rc->peers)
+    {
+      GNUNET_free (rc->peers);
+      rc->peers = NULL;
+    }
+    if (NULL != rc->c)
+    {
+      GNUNET_TESTBED_controller_disconnect (rc->c);
+      rc->c = NULL;
     }
+    shutdown_now (rc);
+    return;
   }
   GNUNET_CONFIGURATION_destroy (rc->cfg);
   rc->cfg = GNUNET_CONFIGURATION_dup (cfg);