[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] GTK+ user interface(s) for GNUnet. branch master u
From: |
gitolite |
Subject: |
[GNUnet-SVN] [gnunet] GTK+ user interface(s) for GNUnet. branch master updated. initial-import-from-subversion-38251-2-g94b81ac |
Date: |
Tue, 8 Nov 2016 14:00:05 +0100 (CET) |
The branch, master has been updated
via 94b81ac1842414650ce542c8f336c250224c34c2 (commit)
from 03601cb008dae2d1ac3bf49205259e42e9776065 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 94b81ac1842414650ce542c8f336c250224c34c2
Author: Christian Grothoff <address@hidden>
Date: Tue Nov 8 14:00:03 2016 +0100
hotfix for #4760, full fix is more complex
-----------------------------------------------------------------------
Summary of changes:
src/setup/gnunet-setup-namestore-config.c | 4 +-
src/setup/gnunet-setup.c | 145 ------------------------------
src/setup/gnunet-setup.h | 11 ---
3 files changed, 2 insertions(+), 158 deletions(-)
diff --git a/src/setup/gnunet-setup-namestore-config.c
b/src/setup/gnunet-setup-namestore-config.c
index d03ca55..a664d39 100644
--- a/src/setup/gnunet-setup-namestore-config.c
+++ b/src/setup/gnunet-setup-namestore-config.c
@@ -88,8 +88,8 @@ GNUNET_setup_namestore_postgres_tab_test_button_clicked_cb
(GtkWidget * widget,
static void
restart_namestore ()
{
- GNUNET_SCHEDULER_add_now (&GNUNET_SETUP_restart_namestore,
- NULL);
+ /* FIXME */
+ GNUNET_break (0); /* not implemented */
}
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 7ab9ca7..d4da055 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -54,21 +54,6 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
static int gret;
/**
- * Resolver process handle.
- */
-static struct GNUNET_OS_Process *resolver;
-
-/**
- * Namestore process handle.
- */
-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;
@@ -378,51 +363,6 @@ cleanup_task (void *cls)
if (GNUNET_OK != write_configuration ())
gret = 1;
cfg = NULL;
- if (NULL != resolver)
- {
- GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
- 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;
- }
- if (NULL != identity)
- {
- GNUNET_break (0 == GNUNET_OS_process_kill (identity, SIGTERM));
- GNUNET_OS_process_destroy (identity);
- identity = NULL;
- }
-}
-
-
-/**
- * Write configuration to dis, (re)start the namestore process and
- * reload the namestore models.
- *
- *
- * @param cls closure (unused)
- */
-void
-GNUNET_SETUP_restart_namestore (void *cls)
-{
- 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_break (GNUNET_OK == GNUNET_OS_process_wait (namestore));
- GNUNET_OS_process_destroy (namestore);
- namestore = NULL;
- }
- namestore =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
- NULL, NULL, NULL,
- "gnunet-service-namestore",
- "gnunet-service-namestore", NULL);
}
@@ -436,79 +376,6 @@ GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
}
-/**
- * If the test failed, start the resolver process.
- *
- * @param cls closure, NULL
- * @param result #GNUNET_YES if the service is running
- */
-static void
-start_resolver (void *cls,
- int result)
-{
- char *binary;
-
- if (GNUNET_YES == result)
- return;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
- resolver =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
- NULL,NULL, NULL,
- binary,
- "gnunet-service-resolver", NULL);
- GNUNET_free (binary);
-}
-
-
-/**
- * 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, NULL,
- binary,
- "gnunet-service-identity", NULL);
- GNUNET_free (binary);
-}
-
-
-/**
- * If the test failed, start the namestore process.
- *
- * @param cls closure, NULL
- * @param result #GNUNET_YES if the service is running
- */
-static void
-start_namestore (void *cls,
- int result)
-{
- char *binary;
-
- if (GNUNET_YES == result)
- return;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore");
- namestore =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
- NULL, NULL, NULL,
- binary,
- "gnunet-service-namestore", NULL);
- GNUNET_free (binary);
-}
-
-
-
#ifndef MINGW
/**
* Try elevating user priviledges to run as user 'gnunet' or 'root'.
@@ -650,18 +517,6 @@ run (void *cls)
main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
main_window);
- GNUNET_CLIENT_service_test ("resolver",
- cfg,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &start_resolver, NULL);
- GNUNET_CLIENT_service_test ("namestore",
- cfg,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &start_namestore, NULL);
- GNUNET_CLIENT_service_test ("identity",
- cfg,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &start_identity, NULL);
load_options ();
GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
if (do_autoconfig)
diff --git a/src/setup/gnunet-setup.h b/src/setup/gnunet-setup.h
index 40fd6e2..fde0b27 100644
--- a/src/setup/gnunet-setup.h
+++ b/src/setup/gnunet-setup.h
@@ -58,17 +58,6 @@ enum GNUNET_GTK_SETUP_HostlistUrlModelColumns
GObject *
GNUNET_SETUP_get_object (const char *name);
-
-/**
- * Write configuration to dis, (re)start the namestore process and
- * reload the namestore models.
- *
- *
- * @param cls closure (unused)
- */
-void
-GNUNET_SETUP_restart_namestore (void *cls);
-
/**
* Our configuration.
*/
hooks/post-receive
--
GTK+ user interface(s) for GNUnet.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] GTK+ user interface(s) for GNUnet. branch master updated. initial-import-from-subversion-38251-2-g94b81ac,
gitolite <=