/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 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
/**
* Task identifier for the read task
*/
-static GNUNET_SCHEDULER_TaskIdentifier read_task_id;
+static struct GNUNET_SCHEDULER_Task * read_task_id;
/**
* Task identifier for the write task
*/
-static GNUNET_SCHEDULER_TaskIdentifier write_task_id;
+static struct GNUNET_SCHEDULER_Task * write_task_id;
/**
* Task to kill the child
*/
-static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id;
+static struct GNUNET_SCHEDULER_Task * child_death_task_id;
/**
* shutdown task id
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
+static struct GNUNET_SCHEDULER_Task * shutdown_task_id;
/**
* Are we done reading messages from stdin?
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG_DEBUG ("Shutting down\n");
- shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
+ shutdown_task_id = NULL;
if (NULL != testbed)
{
LOG_DEBUG ("Killing testbed\n");
GNUNET_break (0 == GNUNET_OS_process_kill (testbed, GNUNET_TERM_SIG));
}
- if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
+ if (NULL != read_task_id)
{
GNUNET_SCHEDULER_cancel (read_task_id);
- read_task_id = GNUNET_SCHEDULER_NO_TASK;
+ read_task_id = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != write_task_id)
+ if (NULL != write_task_id)
{
GNUNET_SCHEDULER_cancel (write_task_id);
- write_task_id = GNUNET_SCHEDULER_NO_TASK;
+ write_task_id = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != child_death_task_id)
+ if (NULL != child_death_task_id)
{
GNUNET_SCHEDULER_cancel (child_death_task_id);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ child_death_task_id = NULL;
}
if (NULL != stdin_fd)
(void) GNUNET_DISK_file_close (stdin_fd);
static void
shutdown_now (void)
{
- if (GNUNET_SCHEDULER_NO_TASK != shutdown_task_id)
+ if (NULL != shutdown_task_id)
GNUNET_SCHEDULER_cancel (shutdown_task_id);
shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
ssize_t bytes_wrote;
GNUNET_assert (NULL != wc);
- write_task_id = GNUNET_SCHEDULER_NO_TASK;
+ write_task_id = NULL;
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
{
GNUNET_free (wc->data);
int ret;
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ child_death_task_id = NULL;
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
{
child_death_task_id =
char *config;
char *xconfig;
char *evstr;
- char *str;
+ //char *str;
size_t config_size;
uLongf ul_config_size;
size_t xconfig_size;
evstr = getenv (GNUNET_TESTING_PREFIX);
if (NULL != evstr)
{
-#if WINDOWS
- GNUNET_break (0 == putenv (GNUNET_TESTING_PREFIX "="));
+ /* unsetting the variable will invalidate the pointer! */
+ evstr = GNUNET_strdup (evstr);
+#ifdef WINDOWS
+ GNUNET_break (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, NULL));
#else
GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
#endif
NULL);
if (NULL != evstr)
{
- GNUNET_assert (0 < GNUNET_asprintf (&str,
+#ifdef WINDOWS
+ GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
+#else
+ static char evar[2* PATH_MAX];
+
+ GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
GNUNET_TESTING_PREFIX "=%s", evstr));
- putenv (str);
- /* do not free str will be consumed by putenv */
+ putenv (evar);
+#endif
GNUNET_free (evstr);
+ evstr = NULL;
}
GNUNET_free_non_null (hostname);
hostname = NULL;
GNUNET_assert (GNUNET_OK ==
GNUNET_TESTING_configuration_create (test_system, cfg));
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS",
"DEFAULTCONFIG",
&config));
if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config))
}
LOG_DEBUG ("Staring testbed with config: %s\n", config);
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
- /* expose testbed configuration through env variable */
- GNUNET_assert (0 < GNUNET_asprintf (&evstr, "%s=%s", ENV_TESTBED_CONFIG, config));
- GNUNET_assert (0 == putenv (evstr)); /* Do NOT free evstr; it is consumed by putenv */
+ {
+ static char evar[2 * PATH_MAX];
+
+ /* expose testbed configuration through env variable */
+ GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
+ "%s=%s", ENV_TESTBED_CONFIG, config));
+ GNUNET_assert (0 == putenv (evar));
+ evstr = NULL;
+ }
testbed =
GNUNET_OS_start_process (PIPE_CONTROL,
- GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
- NULL, binary, "gnunet-service-testbed", "-c",
+ GNUNET_OS_INHERIT_STD_ERR /*verbose? */ ,
+ NULL, NULL, NULL,
+ binary, "gnunet-service-testbed", "-c",
config, NULL);
GNUNET_free (binary);
GNUNET_free (config);
xconfig_size =
GNUNET_TESTBED_compress_config_ (config, config_size, &xconfig);
GNUNET_free (config);
- wc = GNUNET_malloc (sizeof (struct WriteContext));
+ wc = GNUNET_new (struct WriteContext);
wc->length = xconfig_size + sizeof (struct GNUNET_TESTBED_HelperReply);
reply = GNUNET_realloc (xconfig, wc->length);
memmove (&reply[1], reply, xconfig_size);
char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
ssize_t sread;
- read_task_id = GNUNET_SCHEDULER_NO_TASK;
+ read_task_id = NULL;
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
return;
sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf));