#include "gnunet_hello_lib.h"
#define DEBUG_TESTING GNUNET_NO
+#define DEBUG_TESTING_RECONNECT GNUNET_NO
/**
* How long do we wait after starting gnunet-service-arm
* for the core service to be alive?
*/
-#define ARM_START_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define ARM_START_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
/**
* How many times are we willing to try to wait for "scp" or
* "gnunet-service-arm" to complete (waitpid) before giving up?
*/
-#define MAX_EXEC_WAIT_RUNS 50
+#define MAX_EXEC_WAIT_RUNS 250
static struct GNUNET_CORE_MessageHandler no_handlers[] = { {NULL, 0, 0} };
process_hello (void *cls, const struct GNUNET_MessageHeader *message)
{
struct GNUNET_TESTING_Daemon *daemon = cls;
- GNUNET_TRANSPORT_get_hello_cancel(daemon->th, &process_hello, daemon);
+ if (daemon == NULL)
+ return;
+
+ if (daemon->server != NULL)
+ {
+ GNUNET_CORE_disconnect(daemon->server);
+ daemon->server = NULL;
+ }
+
+ GNUNET_assert (message != NULL);
+ if (daemon->th != NULL)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel(daemon->th, &process_hello, daemon);
+ }
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s' from transport service of `%4s'\n",
"HELLO", GNUNET_i2s (&daemon->id));
#endif
- GNUNET_assert (message != NULL);
GNUNET_free_non_null(daemon->hello);
daemon->hello = GNUNET_malloc(ntohs(message->size));
memcpy(daemon->hello, message, ntohs(message->size));
{
d->server = NULL;
if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, d->dead_cb, d->dead_cb_cls);
+ GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
else if (NULL != cb)
cb (d->cb_cls, NULL, d->cfg, d,
_("Failed to connect to core service\n"));
d->id = *my_identity;
d->shortname = strdup (GNUNET_i2s (my_identity));
d->server = server;
+ d->running = GNUNET_YES;
if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, d->dead_cb, d->dead_cb_cls);
+ GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
else if (NULL != cb)
cb (d->cb_cls, my_identity, d->cfg, d, NULL);
#if DEBUG_TESTING
if (d->th == NULL)
{
if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, d->dead_cb, d->dead_cb_cls);
+ GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
else if (NULL != d->cb)
d->cb (d->cb_cls, &d->id, d->cfg, d,
_("Failed to connect to transport service!\n"));
* @param tc unused
*/
static void
-start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+start_fsm (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TESTING_Daemon *d = cls;
GNUNET_TESTING_NotifyDaemonRunning cb;
enum GNUNET_OS_ProcessStatusType type;
unsigned long code;
char *dst;
+ int bytes_read;
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
{
- d->wait_runs++;
- if (d->wait_runs > MAX_EXEC_WAIT_RUNS)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
{
cb = d->cb;
d->cb = NULL;
if (NULL != cb)
cb (d->cb_cls,
NULL,
- d->cfg, d, _("`scp' does not seem to terminate.\n"));
+ d->cfg, d, _("`scp' does not seem to terminate (timeout copying config).\n"));
return;
}
/* wait some more */
d->phase = SP_COPIED;
/* fall-through */
case SP_COPIED:
+ /* Start create hostkey process */
+ d->pipe_stdout = GNUNET_DISK_pipe(GNUNET_NO);
+ if (d->pipe_stdout == NULL)
+ {
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ (NULL == d->hostname)
+ ? _("Failed to create pipe for `gnunet-peerinfo' process.\n")
+ : _("Failed to create pipe for `ssh' process.\n"));
+ return;
+ }
+ if (NULL == d->hostname)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting `%s', with command `%s %s %s %s'.\n",
+ "gnunet-peerinfo", "gnunet-peerinfo", "-c", d->cfgfile,
+ "-sq");
+#endif
+ d->pid = GNUNET_OS_start_process (NULL, d->pipe_stdout, "gnunet-peerinfo",
+ "gnunet-peerinfo",
+ "-c", d->cfgfile,
+ "-sq", NULL);
+ GNUNET_DISK_pipe_close_end(d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+ }
+ else
+ {
+ if (d->username != NULL)
+ GNUNET_asprintf (&dst, "%s@%s", d->username, d->hostname);
+ else
+ dst = GNUNET_strdup (d->hostname);
+
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting `%s', with command `%s %s %s %s %s %s'.\n",
+ "gnunet-peerinfo", "ssh", dst, "gnunet-peerinfo", "-c", d->cfgfile,
+ "-sq");
+#endif
+ d->pid = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
+ "ssh",
+ 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)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not start `%s' process to create hostkey.\n"),
+ (NULL == d->hostname) ? "gnunet-peerinfo" : "ssh");
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ (NULL == d->hostname)
+ ? _("Failed to start `gnunet-peerinfo' process.\n")
+ : _("Failed to start `ssh' process.\n"));
+ GNUNET_DISK_pipe_close(d->pipe_stdout);
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Started `%s', waiting for hostkey.\n",
+ "gnunet-peerinfo");
+#endif
+ d->phase = SP_HOSTKEY_CREATE;
+ d->task
+ = GNUNET_SCHEDULER_add_read_file (d->sched,
+ GNUNET_TIME_absolute_get_remaining(d->max_timeout),
+ GNUNET_DISK_pipe_handle(d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_READ),
+ &start_fsm,
+ d);
+ break;
+ case SP_HOSTKEY_CREATE:
+ bytes_read = GNUNET_DISK_file_read(GNUNET_DISK_pipe_handle(d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_READ),
+ &d->hostkeybuf[d->hostkeybufpos],
+ sizeof(d->hostkeybuf) - d->hostkeybufpos);
+ if (bytes_read > 0)
+ d->hostkeybufpos += bytes_read;
+
+ if ( (d->hostkeybufpos < 104) &&
+ (bytes_read > 0) )
+ {
+ /* keep reading */
+ d->task
+ = GNUNET_SCHEDULER_add_read_file (d->sched,
+ GNUNET_TIME_absolute_get_remaining(d->max_timeout),
+ GNUNET_DISK_pipe_handle(d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_READ),
+ &start_fsm,
+ d);
+ return;
+ }
+ d->hostkeybuf[103] = '\0';
+ if ( (bytes_read < 0) ||
+ (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (d->hostkeybuf,
+ &d->id.hashPubKey)) )
+ {
+ /* error */
+ if (bytes_read < 0)
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ _("Error reading from gnunet-peerinfo: %s\n"),
+ STRERROR (errno));
+ else
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ _("Malformed output from gnunet-peerinfo!\n"));
+ cb = d->cb;
+ 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;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ _("`Failed to get hostkey!\n"));
+ return;
+ }
+ 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;
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully got hostkey!\n");
+#endif
+ if (d->hostkey_callback != NULL)
+ {
+ d->hostkey_callback(d->hostkey_cls, &d->id, d, NULL);
+ d->phase = SP_HOSTKEY_CREATED;
+ }
+ else
+ {
+ d->phase = SP_TOPOLOGY_SETUP;
+ }
+ /* 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))
+ {
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ _("`Failed while waiting for topology setup!\n"));
+ return;
+ }
+
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (d->sched,
+ GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ break;
+ case SP_TOPOLOGY_SETUP:
/* start GNUnet on remote host */
if (NULL == d->hostname)
{
(NULL == d->hostname)
? _("Failed to start `gnunet-arm' process.\n")
: _("Failed to start `ssh' process.\n"));
+ return;
}
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"gnunet-arm", "gnunet-service-core");
#endif
d->phase = SP_START_ARMING;
- d->wait_runs = 0;
d->task
= GNUNET_SCHEDULER_add_delayed (d->sched,
GNUNET_CONSTANTS_EXEC_WAIT,
case SP_START_ARMING:
if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
{
- d->wait_runs++;
- if (d->wait_runs > MAX_EXEC_WAIT_RUNS)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
{
cb = d->cb;
d->cb = NULL;
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
{
- d->wait_runs++;
- if (d->wait_runs > MAX_EXEC_WAIT_RUNS)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
{
d->dead_cb (d->dead_cb_cls,
_("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
}
GNUNET_CONFIGURATION_destroy (d->cfg);
GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null(d->hello);
GNUNET_free_non_null (d->hostname);
GNUNET_free_non_null (d->username);
GNUNET_free_non_null (d->shortname);
}
GNUNET_CONFIGURATION_destroy (d->cfg);
GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null(d->hello);
GNUNET_free_non_null (d->hostname);
GNUNET_free_non_null (d->username);
GNUNET_free_non_null (d->shortname);
d->th = NULL;
}
/* state clean up and notifications */
- GNUNET_CONFIGURATION_destroy (d->cfg);
- GNUNET_free (d->cfgfile);
- GNUNET_free_non_null (d->hostname);
- GNUNET_free_non_null (d->username);
+ if (d->churn == GNUNET_NO)
+ {
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ }
+
+ GNUNET_free_non_null(d->hello);
+ d->hello = NULL;
GNUNET_free_non_null (d->shortname);
+ d->shortname = NULL;
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls, NULL);
- GNUNET_free (d);
+
+ if (d->churn == GNUNET_NO)
+ GNUNET_free (d);
+
break;
case SP_CONFIG_UPDATE:
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
{
- d->wait_runs++;
- if (d->wait_runs > MAX_EXEC_WAIT_RUNS)
+ if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0) /* FIXME: config update should take timeout parameter! */
{
cb = d->cb;
d->cb = NULL;
}
}
+/**
+ * Continues GNUnet daemon startup when user wanted to be notified
+ * once a hostkey was generated (for creating friends files, blacklists,
+ * etc.).
+ *
+ * @param daemon the daemon to finish starting
+ */
+void
+GNUNET_TESTING_daemon_continue_startup(struct GNUNET_TESTING_Daemon *daemon)
+{
+ GNUNET_assert(daemon->phase == SP_HOSTKEY_CREATED);
+ daemon->phase = SP_TOPOLOGY_SETUP;
+}
+
+
+/**
+ * Start a peer that has previously been stopped using the daemon_stop
+ * call (and files weren't deleted and the allow restart flag)
+ *
+ * @param daemon the daemon to start (has been previously stopped)
+ * @param timeout how long to wait for restart
+ * @param cb the callback for notification when the peer is running
+ * @param cb_cls closure for the callback
+ */
+void
+GNUNET_TESTING_daemon_start_stopped (struct GNUNET_TESTING_Daemon *daemon,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyDaemonRunning cb,
+ void *cb_cls)
+{
+ if (daemon->running == GNUNET_YES)
+ {
+ cb(cb_cls, &daemon->id, daemon->cfg, daemon, "Daemon already running, can't restart!");
+ return;
+ }
+
+ daemon->cb = cb;
+ daemon->cb_cls = cb_cls;
+ daemon->phase = SP_TOPOLOGY_SETUP;
+ daemon->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
+
+ GNUNET_SCHEDULER_add_continuation (daemon->sched,
+ &start_fsm,
+ daemon,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+}
/**
* Starts a GNUnet daemon. GNUnet must be installed on the target
*
* @param sched scheduler to use
* @param cfg configuration to use
+ * @param timeout how long to wait starting up peers
* @param hostname name of the machine where to run GNUnet
* (use NULL for localhost).
+ * @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)
+ * @param hostkey_cls closure for hostkey callback
* @param cb function to call with the result
* @param cb_cls closure for cb
* @return handle to the daemon (actual start will be completed asynchronously)
struct GNUNET_TESTING_Daemon *
GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched,
const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TIME_Relative timeout,
const char *hostname,
+ GNUNET_TESTING_NotifyHostkeyCreated hostkey_callback,
+ void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls)
{
GNUNET_free (ret);
return NULL;
}
+ ret->hostkey_callback = hostkey_callback;
+ ret->hostkey_cls = hostkey_cls;
ret->cb = cb;
ret->cb_cls = cb_cls;
+ ret->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
ret->cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_CONFIGURATION_set_value_string (ret->cfg,
"PATHS",
}
+/**
+ * Restart (stop and start) a GNUnet daemon.
+ *
+ * @param d the daemon that should be restarted
+ * @param cb function called once the daemon is (re)started
+ * @param cb_cls closure for cb
+ */
+void
+GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
+ GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls)
+{
+ char *arg;
+ char *del_arg;
+
+ del_arg = NULL;
+ if (NULL != d->cb)
+ {
+ d->dead = GNUNET_YES;
+ return;
+ }
+
+ d->cb = cb;
+ d->cb_cls = cb_cls;
+
+ if (d->phase == SP_CONFIG_UPDATE)
+ {
+ GNUNET_SCHEDULER_cancel (d->sched, d->task);
+ d->phase = SP_START_DONE;
+ }
+ if (d->server != NULL)
+ {
+ GNUNET_CORE_disconnect (d->server);
+ d->server = NULL;
+ }
+
+ if (d->th != NULL)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect(d->th);
+ d->th = NULL;
+ }
+ /* state clean up and notifications */
+ GNUNET_free_non_null(d->hello);
+
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id));
+#endif
+
+ d->phase = SP_START_ARMING;
+
+ /* Check if this is a local or remote process */
+ if (NULL != d->hostname)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping gnunet-arm with config `%s' on host `%s'.\n", d->cfgfile, d->hostname);
+#endif
+
+ if (d->username != NULL)
+ GNUNET_asprintf (&arg, "%s@%s", d->username, d->hostname);
+ else
+ arg = GNUNET_strdup (d->hostname);
+
+ d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+ arg, "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-c", d->cfgfile, "-e", "-r", NULL);
+ /* Use -r to restart arm and all services */
+
+ GNUNET_free (arg);
+ }
+ else
+ {
+#if DEBUG_TESTING
+ 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",
+ "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-c", d->cfgfile, "-e", "-r", NULL);
+ }
+
+ GNUNET_free_non_null(del_arg);
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (d->sched,
+ GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+
+}
+
+
/**
* Stops a GNUnet daemon.
*
* @param d the daemon that should be stopped
+ * @param timeout how long to wait for process for shutdown to complete
* @param cb function called once the daemon was stopped
* @param cb_cls closure for cb
+ * @param delete_files GNUNET_YES to remove files, GNUNET_NO
+ * to leave them
+ * @param allow_restart GNUNET_YES to restart peer later (using this API)
+ * GNUNET_NO to kill off and clean up for good
*/
void
GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
- GNUNET_TESTING_NotifyCompletion cb, void *cb_cls)
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls,
+ int delete_files, int allow_restart)
{
char *arg;
-
+ char *del_arg;
d->dead_cb = cb;
d->dead_cb_cls = cb_cls;
if (NULL != d->cb)
{
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Setting d->dead on peer `%4s'\n"), GNUNET_i2s (&d->id));
+#endif
d->dead = GNUNET_YES;
return;
}
+
+ del_arg = NULL;
+ if (delete_files == GNUNET_YES)
+ {
+ GNUNET_asprintf(&del_arg, "-d");
+ }
+
if (d->phase == SP_CONFIG_UPDATE)
{
GNUNET_SCHEDULER_cancel (d->sched, d->task);
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id));
- /* sleep(15); Manual check for running */
#endif
d->phase = SP_SHUTDOWN_START;
+ d->running = GNUNET_NO;
+
+ if (allow_restart == GNUNET_YES)
+ d->churn = GNUNET_YES;
+ if (d->th != NULL)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect(d->th);
+ d->th = NULL;
+ }
/* Check if this is a local or remote process */
if (NULL != d->hostname)
{
arg = GNUNET_strdup (d->hostname);
d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
- arg, "gnunet-arm",
+ arg, "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-d", "-q", NULL);
+ "-c", d->cfgfile, "-e", "-q", del_arg, NULL);
/* Use -e to end arm, and -d to remove temp files */
GNUNET_free (arg);
}
else
- {
+ {
#if DEBUG_TESTING
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",
- "gnunet-arm",
+ d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-d", "-q", NULL);
- }
-
- GNUNET_free_non_null(d->hello);
+ "-c", d->cfgfile, "-e", "-q", del_arg, NULL);
+ }
- d->wait_runs = 0;
+ GNUNET_free_non_null(del_arg);
+ d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
d->task
- = GNUNET_SCHEDULER_add_delayed (d->sched,
- GNUNET_CONSTANTS_EXEC_WAIT,
- &start_fsm, d);
- return;
+ = GNUNET_SCHEDULER_add_now (d->sched,
+ &start_fsm, d);
}
struct ConnectContext *ctx = cls;
struct GNUNET_TIME_Relative remaining;
+ ctx->timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (ctx->hello_send_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel(ctx->d1->sched, ctx->hello_send_task);
ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
}
-
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
{
if (ctx->d2th != NULL)
ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg,
ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
}
- GNUNET_SCHEDULER_cancel(ctx->d1->sched, ctx->timeout_task);
}
else if (remaining.value > 0)
{
+ if (ctx->d1core != NULL)
+ {
+ GNUNET_CORE_disconnect(ctx->d1core);
+ ctx->d1core = NULL;
+ }
+
+ if (ctx->d2th != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect(ctx->d2th);
+ ctx->d2th = NULL;
+ }
GNUNET_SCHEDULER_add_now(ctx->d1->sched, &reattempt_daemons_connect, ctx);
return;
}
}
}
-
GNUNET_TRANSPORT_disconnect (ctx->d2th);
ctx->d2th = NULL;
GNUNET_CORE_disconnect (ctx->d1core);
if (memcmp(&ctx->d2->id, peer, sizeof(struct GNUNET_PeerIdentity)) == 0)
{
ctx->connected = GNUNET_YES;
- GNUNET_SCHEDULER_add_now (ctx->d1->sched,
- ¬ify_connect_result,
- ctx);
+ GNUNET_SCHEDULER_cancel(ctx->d1->sched, ctx->timeout_task);
+ ctx->timeout_task = GNUNET_SCHEDULER_add_now (ctx->d1->sched,
+ ¬ify_connect_result,
+ ctx);
}
}
{
struct ConnectContext *ctx = cls;
+ ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
-
if (ctx->d1->hello != NULL)
{
GNUNET_TRANSPORT_offer_hello (ctx->d2th, GNUNET_HELLO_get_header(ctx->d1->hello));
{
struct ConnectContext *ctx;
- if ((d1->server == NULL) || (d2->server == NULL))
+ if ((d1->running == GNUNET_NO) || (d2->running == GNUNET_NO))
{
if (NULL != cb)
cb (cb_cls, &d1->id, &d2->id, d1->cfg, d2->cfg, d1, d2,
d2->cfg, d2, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
+ GNUNET_CORE_disconnect(ctx->d1core);
GNUNET_free (ctx);
if (NULL != cb)
cb (cb_cls, &d1->id, &d2->id, d1->cfg, d2->cfg, d1, d2,
}
ctx->timeout_task = GNUNET_SCHEDULER_add_delayed (d1->sched,
- GNUNET_TIME_relative_divide(ctx->relative_timeout, max_connect_attempts), /* Allow up to 8 reconnect attempts */
+ GNUNET_TIME_relative_divide(ctx->relative_timeout,
+ max_connect_attempts),
¬ify_connect_result, ctx);
ctx->hello_send_task = GNUNET_SCHEDULER_add_now(ctx->d1->sched, &send_hello, ctx);
{
return;
}
-#if DEBUG_TESTING
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "re-attempting connect of peer %s to peer %s\n",
+#if DEBUG_TESTING_RECONNECT
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "re-attempting connect of peer %s to peer %s\n",
ctx->d1->shortname, ctx->d2->shortname);
#endif
- if (ctx->d1core != NULL)
- {
- GNUNET_CORE_disconnect(ctx->d1core);
- ctx->d1core = NULL;
- }
-
- if (ctx->d2th != NULL)
- {
- GNUNET_TRANSPORT_disconnect(ctx->d2th);
- ctx->d2th = NULL;
- }
+ GNUNET_assert(ctx->d1core == NULL);
ctx->d1core = GNUNET_CORE_connect (ctx->d1->sched,
ctx->d1->cfg,
ctx->d2->cfg, ctx->d2, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
+ GNUNET_CORE_disconnect(ctx->d1core);
GNUNET_free (ctx);
if (NULL != ctx->cb)
ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,