if (NULL != testbed)
{
LOG_DEBUG ("Killing testbed\n");
- GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
+ GNUNET_break (0 == GNUNET_OS_process_kill (testbed, GNUNET_TERM_SIG));
}
if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
{
GNUNET_OS_process_destroy (testbed);
testbed = NULL;
/* Send SIGTERM to our process group */
- if (0 != PLIBC_KILL (0, SIGTERM))
+ if (0 != PLIBC_KILL (0, GNUNET_TERM_SIG))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "signal");
shutdown_now (); /* Couldn't send the signal, we shutdown frowning */
char *config;
char *xconfig;
char *evstr;
+ //char *str;
size_t config_size;
uLongf ul_config_size;
size_t xconfig_size;
hostname_size);
hostname[hostname_size] = '\0';
}
+ /* unset GNUNET_TESTING_PREFIX if present as it is more relevant for testbed */
+ evstr = getenv (GNUNET_TESTING_PREFIX);
+ if (NULL != evstr)
+ {
+ /* 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
+ }
test_system =
- GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname, NULL);
+ GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname,
+ NULL);
+ if (NULL != evstr)
+ {
+#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 (evar);
+#endif
+ GNUNET_free (evstr);
+ evstr = NULL;
+ }
GNUNET_free_non_null (hostname);
hostname = NULL;
GNUNET_assert (NULL != test_system);
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,
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);