* gnunet-service-testbed. This binary also receives configuration
* from the remove controller which is put in a temporary location
* with ports and paths fixed so that gnunet-service-testbed runs
- * without any hurdles.
- *
+ * without any hurdles.
+ *
* This helper monitors for three termination events. They are: (1)The
* stdin of the helper is closed for reading; (2)the helper received
* SIGTERM/SIGINT; (3)the testbed crashed. In case of events 1 and 2
#define LOG_DEBUG(...) \
LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-/**
- * Log an error message at log-level 'level' that indicates a failure of the
- * command 'cmd' with the message given by gai_strerror(rc).
- */
-#define LOG_GAI(level, cmd, rc) do { LOG(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, gai_strerror(rc)); } while(0)
-
/**
* We need pipe control only on WINDOWS
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- LOG_DEBUG ("Shutting down\n");
+ LOG_DEBUG ("Shutting down\n");
shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
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_SCHEDULER_cancel (read_task_id);
GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (testbed));
GNUNET_OS_process_destroy (testbed);
testbed = NULL;
- }
+ }
if (NULL != test_system)
{
GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
GNUNET_break (0);
return;
}
- GNUNET_break (GNUNET_SYSERR !=
+ GNUNET_break (GNUNET_SYSERR !=
(ret = GNUNET_OS_process_status (testbed, &type, &code)));
if (GNUNET_NO != ret)
{
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 */
}
-/**
- * Resolves a hostname using getaddrinfo
- *
- * @param host the hostname
- * @return the string representing the IPv4 address of the given host; NULL upon error
- */
-const char *
-simple_resolve (const char *host)
-{
- struct addrinfo *res;
- const struct sockaddr_in *in_addr;
- char *hostip;
- struct addrinfo hint;
- unsigned int rc;
-
- hint.ai_family = AF_INET; /* IPv4 */
- hint.ai_socktype = 0;
- hint.ai_protocol = 0;
- hint.ai_addrlen = 0;
- hint.ai_addr = NULL;
- hint.ai_canonname = NULL;
- hint.ai_next = NULL;
- hint.ai_flags = AI_NUMERICSERV;
- res = NULL;
- LOG_DEBUG ("Resolving [%s]\n", host);
- if (0 != (rc = getaddrinfo (host, "22", &hint, &res)))
- {
- LOG_GAI (GNUNET_ERROR_TYPE_ERROR, "getaddrinfo", rc);
- return NULL;
- }
- GNUNET_assert (NULL != res);
- GNUNET_assert (NULL != res->ai_addr);
- GNUNET_assert (sizeof (struct sockaddr_in) == res->ai_addrlen);
- in_addr = (const struct sockaddr_in *) res->ai_addr;
- hostip = inet_ntoa (in_addr->sin_addr);
- GNUNET_assert (NULL != hostip);
- freeaddrinfo (res);
- LOG_DEBUG ("Resolved [%s] to [%s]\n", host, hostip);
- return hostip;
-}
-
-
/**
* Functions with this signature are called whenever a
* complete message is received by the tokenizer.
char *binary;
char *trusted_ip;
char *hostname;
- const char *hostip;
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';
}
- hostip = NULL;
- if ( (NULL != hostname) && (NULL == (hostip = simple_resolve (hostname))) )
+ /* unset GNUNET_TESTING_PREFIX if present as it is more relevant for testbed */
+ evstr = getenv (GNUNET_TESTING_PREFIX);
+ if (NULL != evstr)
{
- GNUNET_free (hostname);
- hostname = NULL;
- }
+ /* 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, hostip, 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;
- hostip = 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");
+ {
+ 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);
wc->data = reply;
write_task_id =
GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
- &write_task, wc);
+ &write_task, wc);
child_death_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_DISK_pipe_handle (sigpipe,
read_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
&read_task, NULL);
- shutdown_task_id =
+ shutdown_task_id =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
}
int ret;
status = GNUNET_OK;
- if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
+ if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
GNUNET_NO, GNUNET_NO)))
{
GNUNET_break (0);
- ret = GNUNET_SYSERR;
return 1;
}
shc_chld =