-also start identity service if it is not yet running

1 files changed, 39 insertions, 0 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 0b5c2634..6a4aee80 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -65,6 +65,11 @@ static struct GNUNET_OS_Process *resolver;
 static struct GNUNET_OS_Process *namestore;
 
 /**
+ * Identity process handle.
+ */
+static struct GNUNET_OS_Process *identity;
+
+/**
  * Run autoconfig-only and then exit immediately.
  */
 static int do_autoconfig;
@@ -381,6 +386,12 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_OS_process_destroy (namestore);
     namestore = NULL;
   }
+  if (NULL != identity)
+  {
+    GNUNET_break (0 == GNUNET_OS_process_kill (identity, SIGTERM));
+    GNUNET_OS_process_destroy (identity);
+    identity = NULL;
+  }
 }
 
 
@@ -450,6 +461,30 @@ start_resolver (void *cls,
 
 
 /**
+ * If the test failed, start the identity process.
+ *
+ * @param cls closure, NULL
+ * @param result #GNUNET_YES if the service is running
+ */
+static void
+start_identity (void *cls,
+                int result)
+{
+  char *binary;
+
+  if (GNUNET_YES == result)
+    return;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-identity");
+  identity =
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
+                             NULL, NULL,
+                             binary,
+                             "gnunet-service-identity", NULL);
+  GNUNET_free (binary);
+}
+
+
+/**
  * If the test failed, start the namestore process.
  *
  * @param cls closure, NULL
@@ -598,6 +633,10 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                               cfg,
                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &start_namestore, NULL);
+  GNUNET_CLIENT_service_test ("identity",
+                              cfg,
+                              GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                              &start_identity, NULL);
   load_options ();
   GNUNET_SETUP_gns_init ();
 #ifndef MINGW