/*
This file is part of GNUnet.
- (C) 2012-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012-2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file gnunet-gns.c
va_end (apc2);
if (arglen > 0)
argp[-1] = '\0';
- p = GNUNET_OS_start_process_va (pipe_control, std_inheritance, pipe_stdin,
- pipe_stdout, filename, ap);
+ p = GNUNET_OS_start_process_va (pipe_control, std_inheritance,
+ pipe_stdin,
+ pipe_stdout,
+ NULL,
+ filename, ap);
va_end (ap);
if (NULL == p)
{
{
if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, &st, &code,
"gnunet-namestore",
- "gnunet-namestore", "-z", "master-zone", "-a", "-e", "never", "-n", "pin", "-p", "-t", "PKEY", "-V", "72QC35CO20UJN1E91KPJFNT9TG4CLKAPB4VK9S3Q758S9MLBRKOG", NULL))
+ "gnunet-namestore", "-z", "master-zone", "-a", "-e", "never", "-n", "pin", "-p", "-t", "PKEY", "-V", pin_zone_pkey, NULL))
{
ret = 10;
return;
GNUNET_NAMESTORE_zone_iterator_next (list_it);
}
+
/**
- * If listing is enabled, prints information about the egos.
+ * Get master-zone, short-zone and private-zone keys.
*
* This function is initially called for all egos and then again
* whenever a ego's identifier changes or if it is deleted. At the
* Task run on shutdown.
*
* @param cls NULL
- * @param tc unused
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
GNUNET_free_non_null (master_zone_pkey);
master_zone_pkey = NULL;
if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, &st, &code,
"gnunet-identity",
- "gnunet-identity", "-e", "short-zone", "-s", "gns-proxy", NULL))
+ "gnunet-identity", "-e", "master-zone", "-s", "gns-proxy", NULL))
+ return;
+
+ if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, &st, &code,
+ "gnunet-identity",
+ "gnunet-identity", "-e", "master-zone", "-s", "gns-intercept", NULL))
return;
if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, &st, &code,
ns = GNUNET_NAMESTORE_connect (cfg);
sh = GNUNET_IDENTITY_connect (cfg, &get_ego, NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
}