1 files changed, 59 insertions, 9 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 506a861f..f93cb853 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -53,7 +53,12 @@ static int gret;
 /**
  * Resolver process handle.
  */
-struct GNUNET_OS_Process *resolver;
+static struct GNUNET_OS_Process *resolver;
+
+/**
+ * Namestore process handle.
+ */
+static struct GNUNET_OS_Process *namestore;
 
 
 /**
@@ -278,6 +283,25 @@ load_options ()
 
 
 /**
+ * Write final configuration to disk.
+ *
+ * @return GNUNET_OK on success
+ */
+static int 
+write_configuration ()
+{
+  struct GNUNET_CONFIGURATION_Handle *cfgDefault;
+  int ret;
+
+  cfgDefault = GNUNET_CONFIGURATION_create ();
+  (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL);  /* load defaults only */
+  ret = GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, cfgName);
+  GNUNET_CONFIGURATION_destroy (cfgDefault);
+  return ret;
+}
+
+
+/**
  * Actual main method that sets up the configuration window.
  *
  * @param cls the main loop handle
@@ -286,8 +310,6 @@ load_options ()
 static void
 cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfgDefault;
-
   if (NULL == ml)
   {
     GNUNET_break (0);
@@ -295,12 +317,8 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
-  cfgDefault = GNUNET_CONFIGURATION_create ();
-  (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL);  /* load defaults only */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, cfgName))
+  if (GNUNET_OK != write_configuration ())
     gret = 1;
-  GNUNET_CONFIGURATION_destroy (cfgDefault);
-  GNUNET_CONFIGURATION_destroy (cfg);
   cfg = NULL;
   if (NULL != resolver)
   {
@@ -308,6 +326,38 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_OS_process_destroy (resolver);
     resolver = NULL;
   }
+  if (NULL != namestore)
+  {
+    GNUNET_break (0 == GNUNET_OS_process_kill (namestore, SIGTERM));
+    GNUNET_OS_process_destroy (namestore);
+    namestore = NULL;
+  }
+}
+
+
+/**
+ * Write configuration to dis, (re)start the namestore process and
+ * reload the namestore models.
+ * 
+ *
+ * @param cls closure (unused)
+ * @param tc scheduler context (unused)
+ */
+void
+GNUNET_SETUP_restart_namestore (void *cls,
+                                const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (GNUNET_OK != write_configuration ())
+    return; /* no point in re-starting namestore ... */
+  if (NULL != namestore)
+  {
+    GNUNET_break (0 == GNUNET_OS_process_kill (namestore, SIGTERM));
+    GNUNET_OS_process_destroy (namestore);
+    namestore = NULL;
+  }
+  /* FIXME: start namestore */
+  /* FIXME: refresh namestore model! */
+  GNUNET_break (0); // not implemented...
 }