{
case SP_COPYING:
/* confirm copying complete */
- if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
{
cb = d->cb;
d->cb = NULL;
/* fall-through */
case SP_COPIED:
/* Start create hostkey process */
- d->pipe_stdout = GNUNET_DISK_pipe(GNUNET_NO);
+ d->pipe_stdout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES);
if (d->pipe_stdout == NULL)
{
cb = d->cb;
"gnunet-peerinfo", "gnunet-peerinfo", "-c", d->cfgfile,
"-sq");
#endif
- d->pid = GNUNET_OS_start_process (NULL, d->pipe_stdout, "gnunet-peerinfo",
+ d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "gnunet-peerinfo",
"gnunet-peerinfo",
"-c", d->cfgfile,
"-sq", NULL);
"gnunet-peerinfo", "ssh", dst, "gnunet-peerinfo", "-c", d->cfgfile,
"-sq");
#endif
- d->pid = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
- "ssh",
+ if (d->ssh_port_str == NULL)
+ {
+ d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
+ "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-peerinfo",
- "-c", d->cfgfile, "-sq", NULL);
+ dst,
+ "gnunet-peerinfo",
+ "-c", d->cfgfile, "-sq", NULL);
+ }
+ else
+ {
+ d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
+ "ssh", "-p", d->ssh_port_str,
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ dst,
+ "gnunet-peerinfo",
+ "-c", d->cfgfile, "-sq", NULL);
+ }
GNUNET_DISK_pipe_close_end(d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
GNUNET_free (dst);
}
- if (-1 == d->pid)
+ if (NULL == d->proc)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not start `%s' process to create hostkey.\n"),
d->cb = NULL;
GNUNET_DISK_pipe_close(d->pipe_stdout);
d->pipe_stdout = NULL;
- (void) PLIBC_KILL (d->pid, SIGKILL);
- GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->pid));
- d->pid = 0;
+ (void) GNUNET_OS_process_kill (d->proc, SIGKILL);
+ GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc));
+ GNUNET_OS_process_close (d->proc);
+ d->proc = NULL;
if (NULL != cb)
cb (d->cb_cls,
NULL,
}
GNUNET_DISK_pipe_close(d->pipe_stdout);
d->pipe_stdout = NULL;
- (void) PLIBC_KILL (d->pid, SIGKILL);
- GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->pid));
- d->pid = 0;
+ (void) GNUNET_OS_process_kill (d->proc, SIGKILL);
+ GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc));
+ GNUNET_OS_process_close (d->proc);
+ d->proc = NULL;
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Successfully got hostkey!\n");
/* Fall through */
case SP_HOSTKEY_CREATED:
/* wait for topology finished */
- if ((GNUNET_YES == d->dead) || (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0))
+ if ((GNUNET_YES == d->dead) || (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0))
{
cb = d->cb;
d->cb = NULL;
"-L", "DEBUG",
"-s");
#endif
- d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
"gnunet-arm",
"-c", d->cfgfile,
#if DEBUG_TESTING
"gnunet-arm", "ssh", dst, "gnunet-arm", "-c", d->cfgfile,
"-L", "DEBUG", "-s", "-q");
#endif
- d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh",
- "ssh",
+ if (d->ssh_port_str == NULL)
+ {
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
+ "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-arm",
+ dst,
+ "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-s", "-q", NULL);
+ "-c", d->cfgfile, "-s", "-q", NULL);
+ }
+ else
+ {
+
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
+ "ssh", "-p", d->ssh_port_str,
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ dst,
+ "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-c", d->cfgfile, "-s", "-q", NULL);
+ }
GNUNET_free (dst);
}
- if (-1 == d->pid)
+ if (NULL == d->proc)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not start `%s' process to start GNUnet.\n"),
&start_fsm, d);
break;
case SP_START_ARMING:
- if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
{
cb = d->cb;
d->cb = NULL;
break;
case SP_SHUTDOWN_START:
/* confirm copying complete */
- if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
{
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls,
break;
case SP_CONFIG_UPDATE:
/* confirm copying complete */
- if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0) /* FIXME: config update should take timeout parameter! */
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0) /* FIXME: config update should take timeout parameter! */
{
cb = d->cb;
d->cb = NULL;
daemon->phase = SP_TOPOLOGY_SETUP;
}
+/**
+ * Check whether the given daemon is running.
+ *
+ * @param daemon the daemon to check
+ *
+ * @return GNUNET_YES if the daemon is up, GNUNET_NO if the
+ * daemon is down, GNUNET_SYSERR on error.
+ */
+int
+GNUNET_TESTING_daemon_running (struct GNUNET_TESTING_Daemon *daemon)
+{
+ if (daemon == NULL)
+ return GNUNET_SYSERR;
+
+ if (daemon->running == GNUNET_YES)
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
+
/**
* Start a peer that has previously been stopped using the daemon_stop
* @param timeout how long to wait starting up peers
* @param hostname name of the machine where to run GNUnet
* (use NULL for localhost).
+ * @param ssh_username ssh username to use when connecting to hostname
+ * @param sshport port to pass to ssh process when connecting to hostname
* @param hostkey_callback function to call once the hostkey has been
* generated for this peer, but it hasn't yet been started
* (NULL to start immediately, otherwise waits on GNUNET_TESTING_daemon_continue_start)
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TIME_Relative timeout,
const char *hostname,
+ const char *ssh_username,
+ uint16_t sshport,
GNUNET_TESTING_NotifyHostkeyCreated hostkey_callback,
void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
ret = GNUNET_malloc (sizeof (struct GNUNET_TESTING_Daemon));
ret->sched = sched;
ret->hostname = (hostname == NULL) ? NULL : GNUNET_strdup (hostname);
+ if (sshport != 0)
+ {
+ GNUNET_asprintf(&ret->ssh_port_str, "%d", sshport);
+ }
+ else
+ ret->ssh_port_str = NULL;
ret->cfgfile = GNUNET_DISK_mktemp ("gnunet-testing-config");
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_free (ret);
return NULL;
}
- if (GNUNET_OK !=
+ if (ssh_username != NULL)
+ username = GNUNET_strdup(ssh_username);
+ if ((ssh_username == NULL) && (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"TESTING",
- "USERNAME", &username))
+ "USERNAME", &username)))
{
if (NULL != getenv ("USER"))
username = GNUNET_strdup (getenv ("USER"));
GNUNET_asprintf (&arg, "%s@%s:%s", username, hostname, ret->cfgfile);
else
GNUNET_asprintf (&arg, "%s:%s", hostname, ret->cfgfile);
- ret->pid = GNUNET_OS_start_process (NULL, NULL, "scp",
- "scp",
+
+ if (ret->ssh_port_str == NULL)
+ {
+ ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp",
+ "scp",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ ret->cfgfile, arg, NULL);
+ }
+ else
+ {
+ ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp",
+ "scp", "-P", ret->ssh_port_str,
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- ret->cfgfile, arg, NULL);
+ ret->cfgfile, arg, NULL);
+ }
GNUNET_free (arg);
- if (-1 == ret->pid)
+ if (NULL == ret->proc)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
else
arg = GNUNET_strdup (d->hostname);
- d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
#if !DEBUG_TESTING
"-q",
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
#endif
- d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
"gnunet-arm",
#if DEBUG_TESTING
"-L", "DEBUG",
GNUNET_free_non_null (d->username);
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls, NULL);
+ GNUNET_free(d);
return;
}
else
arg = GNUNET_strdup (d->hostname);
- d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
#if !DEBUG_TESTING
"-q",
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
#endif
- d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
"gnunet-arm",
#if DEBUG_TESTING
"-L", "DEBUG",
GNUNET_asprintf (&arg, "%s@%s:%s", d->username, d->hostname, d->cfgfile);
else
GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile);
- d->pid = GNUNET_OS_start_process (NULL, NULL, "scp", "scp",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp",
#if !DEBUG_TESTING
"-q",
#endif
d->cfgfile, arg, NULL);
GNUNET_free (arg);
- if (-1 == d->pid)
+ if (NULL == d->proc)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
}
}
- else if (remaining.value > 0)
+ else if (remaining.rel_value > 0)
{
if (ctx->d1core != NULL)
{