GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* use functions from gnunet_{util,arm}_lib.h. This API is
* ONLY for writing testcases!
* @author Christian Grothoff
+ *
*/
#include "platform.h"
#include "gnunet_arm_service.h"
+#include "gnunet_core_service.h"
+#include "gnunet_constants.h"
#include "gnunet_testing_lib.h"
+#include "gnunet_transport_service.h"
+#include "gnunet_hello_lib.h"
+
+#define DEBUG_TESTING GNUNET_NO
+#define DEBUG_TESTING_RECONNECT GNUNET_YES
+
+/**
+ * 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, 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 250
+
+static struct GNUNET_CORE_MessageHandler no_handlers[] = { {NULL, 0, 0} };
/**
- * Handle for a GNUnet daemon (technically a set of
- * daemons; the handle is really for the master ARM
- * daemon) started by the testing library.
+ * Receive the HELLO from one peer, give it to the other
+ * and ask them to connect.
+ *
+ * @param cls "struct ConnectContext"
+ * @param message HELLO message of peer
*/
-struct GNUNET_TESTING_Daemon
+static void
+process_hello (void *cls, const struct GNUNET_MessageHeader *message)
{
-};
+ struct GNUNET_TESTING_Daemon *daemon = cls;
+ GNUNET_TESTING_NotifyDaemonRunning cb;
+
+ int msize;
+ if (daemon == NULL)
+ return;
+
+ GNUNET_assert (daemon->phase == SP_GET_HELLO);
+
+ cb = daemon->cb;
+ daemon->cb = NULL;
+ if (daemon->task != GNUNET_SCHEDULER_NO_TASK) /* Assertion here instead? */
+ GNUNET_SCHEDULER_cancel(daemon->task);
+
+ if (daemon->server != NULL)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' from transport service of `%4s', disconnecting core!\n",
+ "HELLO", GNUNET_i2s (&daemon->id));
+#endif
+ GNUNET_CORE_disconnect (daemon->server);
+ daemon->server = NULL;
+ }
+
+ GNUNET_assert (message != NULL);
+ msize = ntohs (message->size);
+ if (msize < 1)
+ {
+ return;
+ }
+ 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_free_non_null (daemon->hello);
+ daemon->hello = GNUNET_malloc (msize);
+ memcpy (daemon->hello, message, msize);
+
+ if (daemon->th != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect (daemon->th);
+ daemon->th = NULL;
+ }
+ daemon->phase = SP_START_DONE;
+
+ if (NULL != cb) /* FIXME: what happens when this callback calls GNUNET_TESTING_daemon_stop? */
+ cb (daemon->cb_cls, &daemon->id, daemon->cfg, daemon, NULL);
+}
+
+static void
+start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Function called after GNUNET_CORE_connect has succeeded
+ * (or failed for good). Note that the private key of the
+ * peer is intentionally not exposed here; if you need it,
+ * your process should try to read the private key file
+ * directly (which should work if you are authorized...).
+ *
+ * @param cls closure
+ * @param server handle to the server, NULL if we failed
+ * @param my_identity ID of this peer, NULL if we failed
+ * @param publicKey public key of this peer, NULL if we failed
+ */
+static void
+testing_init (void *cls,
+ struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+{
+ struct GNUNET_TESTING_Daemon *d = cls;
+
+ GNUNET_assert (d->phase == SP_START_CORE);
+ d->phase = SP_GET_HELLO;
+
+ if (server == NULL)
+ {
+ d->server = NULL;
+ if (GNUNET_YES == d->dead)
+ 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, NULL, d->cfg, d,
+ _("Failed to connect to core service\n"));
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully started peer `%4s'.\n", GNUNET_i2s (my_identity));
+#endif
+ d->id = *my_identity;
+ d->shortname = strdup (GNUNET_i2s (my_identity));
+ d->server = server;
+ d->running = GNUNET_YES;
+
+ if (GNUNET_NO == d->running)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer is dead (d->running == GNUNET_NO)\n");
+#endif
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully started peer `%4s', connecting to transport service.\n",
+ GNUNET_i2s (my_identity));
+#endif
+
+ d->th = GNUNET_TRANSPORT_connect (d->cfg, &d->id, d, NULL, NULL, NULL);
+ if (d->th == NULL)
+ {
+ if (GNUNET_YES == d->dead)
+ 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"));
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connected to transport service `%s', getting HELLO\n",
+ GNUNET_i2s (my_identity));
+#endif
+
+ GNUNET_TRANSPORT_get_hello (d->th, &process_hello, d);
+ /* wait some more */
+ if (d->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel(d->task);
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+}
+
+
+/**
+ * Finite-state machine for starting GNUnet.
+ *
+ * @param cls our "struct GNUNET_TESTING_Daemon"
+ * @param tc unused
+ */
+static void
+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,
+ "Peer FSM is in phase %u.\n", d->phase);
+#endif
+
+ d->task = GNUNET_SCHEDULER_NO_TASK;
+ switch (d->phase)
+ {
+ case SP_COPYING:
+ /* confirm copying complete */
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
+ {
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_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 (timeout copying config).\n"));
+ return;
+ }
+ /* wait some more */
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ return;
+ }
+ if ((type != GNUNET_OS_PROCESS_EXITED) || (code != 0))
+ {
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL, d->cfg, d, _("`scp' did not complete cleanly.\n"));
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully copied configuration file.\n");
+#endif
+ d->phase = SP_COPIED;
+ /* fall-through */
+ case SP_COPIED:
+ /* Start create hostkey process */
+ d->pipe_stdout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES);
+ 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->proc =
+ 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
+ if (d->ssh_port_str == NULL)
+ {
+ d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
+ "ssh",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ 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 (NULL == d->proc)
+ {
+ 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 (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 (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) 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, d->cfg, d, _("`Failed to get hostkey!\n"));
+ return;
+ }
+ GNUNET_DISK_pipe_close (d->pipe_stdout);
+ d->pipe_stdout = NULL;
+ (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");
+#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).rel_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 (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ break;
+ case SP_TOPOLOGY_SETUP:
+ /* start GNUnet on remote host */
+ if (NULL == d->hostname)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Starting `%s', with command `%s %s %s %s %s %s'.\n",
+ "gnunet-arm", "gnunet-arm", "-c", d->cfgfile,
+ "-L", "DEBUG", "-s");
+#endif
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ "gnunet-arm", "-c", d->cfgfile,
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-s", "-q", NULL);
+ }
+ 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_WARNING,
+ "Starting `%s', with command `%s %s %s %s %s %s %s %s'.\n",
+ "gnunet-arm", "ssh", dst, "gnunet-arm", "-c",
+ d->cfgfile, "-L", "DEBUG", "-s", "-q");
+#endif
+ if (d->ssh_port_str == NULL)
+ {
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ dst, "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-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 (NULL == d->proc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not start `%s' process to start GNUnet.\n"),
+ (NULL == d->hostname) ? "gnunet-arm" : "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-arm' process.\n")
+ : _("Failed to start `ssh' process.\n"));
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Started `%s', waiting for `%s' to be up.\n",
+ "gnunet-arm", "gnunet-service-core");
+#endif
+ d->phase = SP_START_ARMING;
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ break;
+ case SP_START_ARMING:
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
+ {
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
+ {
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ (NULL == d->hostname)
+ ? _("`gnunet-arm' does not seem to terminate.\n")
+ : _("`ssh' does not seem to terminate.\n"));
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ GNUNET_free(d->proc);
+ GNUNET_free(d);
+ return;
+ }
+ /* wait some more */
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Successfully started `%s'.\n", "gnunet-arm");
+#endif
+ GNUNET_free(d->proc);
+ d->phase = SP_START_CORE;
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Calling CORE_connect\n");
+#endif
+ /* Fall through */
+ case SP_START_CORE:
+ if (d->server != NULL)
+ GNUNET_CORE_disconnect(d->server);
+
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
+ {
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ _("Unable to connect to CORE service for peer!\n"));
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ GNUNET_free (d);
+ return;
+ }
+ d->server = GNUNET_CORE_connect (d->cfg, 1,
+ d,
+ &testing_init,
+ NULL, NULL, NULL,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO, no_handlers);
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_CONSTANTS_SERVICE_RETRY, 2),
+ &start_fsm, d);
+ break;
+ case SP_GET_HELLO:
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
+ {
+ if (d->server != NULL)
+ GNUNET_CORE_disconnect(d->server);
+ if (d->th != NULL)
+ GNUNET_TRANSPORT_disconnect(d->th);
+ cb = d->cb;
+ d->cb = NULL;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg,
+ d,
+ _("Unable to get HELLO for peer!\n"));
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ GNUNET_free (d);
+ return;
+ }
+ if (d->hello != NULL)
+ return;
+ GNUNET_assert(d->task == GNUNET_SCHEDULER_NO_TASK);
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_CONSTANTS_SERVICE_RETRY, 2),
+ &start_fsm, d);
+ break;
+ case SP_START_DONE:
+ GNUNET_break (0);
+ break;
+ case SP_SHUTDOWN_START:
+ /* confirm copying complete */
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
+ {
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
+ {
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls,
+ _
+ ("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
+ if (d->th != NULL)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello,
+ d);
+ GNUNET_TRANSPORT_disconnect (d->th);
+ d->th = NULL;
+ }
+ 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_free_non_null (d->proc);
+ d->proc = NULL;
+ GNUNET_free (d);
+ return;
+ }
+ /* wait some more */
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ return;
+ }
+ if ((type != GNUNET_OS_PROCESS_EXITED) || (code != 0))
+ {
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls,
+ _
+ ("shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"));
+ if (d->th != NULL)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect (d->th);
+ d->th = NULL;
+ }
+ if (d->server != NULL)
+ {
+ GNUNET_CORE_disconnect (d->server);
+ d->server = NULL;
+ }
+ 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_free_non_null (d->proc);
+ d->proc = NULL;
+ GNUNET_free (d);
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer shutdown complete.\n");
+#endif
+ 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 */
+ 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);
+ GNUNET_free_non_null (d->proc);
+ d->proc = NULL;
+ d->shortname = NULL;
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls, NULL);
+
+ if (d->churn == GNUNET_NO)
+ GNUNET_free (d);
+
+ break;
+ case SP_CONFIG_UPDATE:
+ /* confirm copying complete */
+ if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
+ {
+ 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;
+ if (NULL != cb)
+ cb (d->cb_cls,
+ NULL,
+ d->cfg, d, _("`scp' does not seem to terminate.\n"));
+ return;
+ }
+ /* wait some more */
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
+ return;
+ }
+ if ((type != GNUNET_OS_PROCESS_EXITED) || (code != 0))
+ {
+ if (NULL != d->update_cb)
+ d->update_cb (d->update_cb_cls,
+ _("`scp' did not complete cleanly.\n"));
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully copied configuration file.\n");
+#endif
+ if (NULL != d->update_cb)
+ d->update_cb (d->update_cb_cls, NULL);
+ d->phase = SP_START_DONE;
+ break;
+ }
+}
+
+/**
+ * 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;
+}
+
+/**
+ * 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
+ * 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 (&start_fsm,
+ daemon,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+}
/**
- * Starts a GNUnet daemon.
+ * Starts a GNUnet daemon. GNUnet must be installed on the target
+ * system and available in the PATH. The machine must furthermore be
+ * reachable via "ssh" (unless the hostname is "NULL") without the
+ * need to enter a password.
*
- * @param service_home directory to use as the service home directory
- * @param transports transport services that should be loaded
- * @param applications application services and daemons that should be started
- * @param port_offset offset to add to all ports for all services
+ * @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 cb function to call with the result
+ * @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 pointer to a hostkey to be written to disk (instead of being generated)
+ * @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 once peer is up, or failed to start
+ * @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 (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TIME_Relative timeout,
+ const char *hostname,
+ const char *ssh_username,
+ uint16_t sshport,
+ const char *hostkey,
+ GNUNET_TESTING_NotifyHostkeyCreated
+ hostkey_callback, void *hostkey_cls,
+ GNUNET_TESTING_NotifyDaemonRunning cb,
+ void *cb_cls)
+{
+ struct GNUNET_TESTING_Daemon *ret;
+ char *arg;
+ char *username;
+ char *servicehome;
+ char *baseservicehome;
+ char *slash;
+ char *hostkeyfile;
+ char *temp_file_name;
+ struct GNUNET_DISK_FileHandle *fn;
+
+ ret = GNUNET_malloc (sizeof (struct GNUNET_TESTING_Daemon));
+ 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;
+
+ /* Find service home and base service home directories, create it if it doesn't exist */
+ GNUNET_assert(GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "PATHS",
+ "SERVICEHOME",
+ &servicehome));
+
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_create (servicehome));
+ GNUNET_asprintf(&temp_file_name, "%s/gnunet-testing-config", servicehome);
+ ret->cfgfile = GNUNET_DISK_mktemp (temp_file_name);
+ GNUNET_free(temp_file_name);
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Setting up peer with configuration file `%s'.\n",
+ ret->cfgfile);
+#endif
+ if (NULL == ret->cfgfile)
+ {
+ GNUNET_free_non_null (ret->ssh_port_str);
+ GNUNET_free_non_null (ret->hostname);
+ 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",
+ "DEFAULTCONFIG", ret->cfgfile);
+
+ /* Write hostkey to file, if we were given one */
+ hostkeyfile = NULL;
+ if (hostkey != NULL)
+ {
+ GNUNET_asprintf(&hostkeyfile, "%s/.hostkey", servicehome);
+ fn =
+ GNUNET_DISK_file_open (hostkeyfile,
+ GNUNET_DISK_OPEN_READWRITE
+ | GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
+ GNUNET_assert(fn != NULL);
+ GNUNET_assert(HOSTKEYFILESIZE == GNUNET_DISK_file_write(fn, hostkey, HOSTKEYFILESIZE));
+ GNUNET_assert(GNUNET_OK == GNUNET_DISK_file_close(fn));
+ }
+
+ /* write configuration to temporary file */
+ if (GNUNET_OK != GNUNET_CONFIGURATION_write (ret->cfg, ret->cfgfile))
+ {
+ if (0 != UNLINK (ret->cfgfile))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink", ret->cfgfile);
+ GNUNET_CONFIGURATION_destroy (ret->cfg);
+ GNUNET_free_non_null (ret->hostname);
+ GNUNET_free (ret->cfgfile);
+ GNUNET_free (ret);
+ return NULL;
+ }
+ if (ssh_username != NULL)
+ username = GNUNET_strdup (ssh_username);
+ if ((ssh_username == NULL) && (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "TESTING",
+ "USERNAME",
+ &username)))
+ {
+ if (NULL != getenv ("USER"))
+ username = GNUNET_strdup (getenv ("USER"));
+ else
+ username = NULL;
+ }
+ ret->username = username;
+
+ /* copy directory to remote host */
+ if (NULL != hostname)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Copying configuration directory to host `%s'.\n", hostname);
+#endif
+ baseservicehome = GNUNET_strdup(servicehome);
+ /* Remove trailing /'s */
+ while (baseservicehome[strlen(baseservicehome) - 1] == '/')
+ baseservicehome[strlen(baseservicehome) - 1] = '\0';
+ /* Find next directory /, jump one ahead */
+ slash = strrchr(baseservicehome, '/');
+ if (slash != NULL)
+ *(++slash) = '\0';
+
+ ret->phase = SP_COPYING;
+ if (NULL != username)
+ GNUNET_asprintf (&arg, "%s@%s:%s", username, hostname, baseservicehome);
+ else
+ GNUNET_asprintf (&arg, "%s:%s", hostname, baseservicehome);
+
+ if (ret->ssh_port_str == NULL)
+ {
+ ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", "-r",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ servicehome, arg, NULL);
+#if DEBUG_TESTING
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "copying directory with command scp -r %s %s\n", servicehome, arg);
+#endif
+ }
+ else
+ {
+ ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp",
+ "scp", "-r", "-P", ret->ssh_port_str,
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ servicehome, arg, NULL);
+ }
+ GNUNET_free (arg);
+ if (NULL == ret->proc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Could not start `%s' process to copy configuration directory.\n"),
+ "scp");
+ if (0 != UNLINK (ret->cfgfile))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink", ret->cfgfile);
+ GNUNET_CONFIGURATION_destroy (ret->cfg);
+ GNUNET_free_non_null (ret->hostname);
+ GNUNET_free_non_null (ret->username);
+ GNUNET_free (ret->cfgfile);
+ GNUNET_free (ret);
+ if ((hostkey != NULL) && (0 != UNLINK(hostkeyfile)))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink", hostkeyfile);
+ GNUNET_free_non_null(hostkeyfile);
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (servicehome));
+ GNUNET_free(servicehome);
+ return NULL;
+ }
+ ret->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, ret);
+ GNUNET_free_non_null(hostkeyfile);
+ GNUNET_free(servicehome);
+ return ret;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No need to copy configuration file since we are running locally.\n");
+#endif
+ ret->phase = SP_COPIED;
+ GNUNET_SCHEDULER_add_continuation (&start_fsm,
+ ret,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_free_non_null(hostkeyfile);
+ GNUNET_free(servicehome);
+ return ret;
+}
+
+
+/**
+ * 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_start (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *service_home,
- const char *transports,
- const char *applications,
- uint16_t port_offset,
- const char *hostname,
- GNUNET_TESTING_NotifyDaemonRunning cb,
- void *cb_cls)
+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->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->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ 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->proc = 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 (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)
+void
+GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
+ 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;
+ }
+
+ if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) /* Peer has already been stopped in churn context! */
+ {
+ /* Free what was left from churning! */
+ GNUNET_assert (d->cfg != NULL);
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ if (delete_files == GNUNET_YES)
+ {
+ if (0 != UNLINK (d->cfgfile))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "unlink");
+ }
+ }
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls, NULL);
+ GNUNET_free (d);
+ return;
+ }
+
+ del_arg = NULL;
+ if (delete_files == GNUNET_YES)
+ {
+ GNUNET_asprintf (&del_arg, "-d");
+ }
+
+ if (d->phase == SP_CONFIG_UPDATE)
+ {
+ GNUNET_SCHEDULER_cancel (d->task);
+ d->phase = SP_START_DONE;
+ }
+ /** Move this call to scheduled shutdown as fix for CORE_connect calling daemon_stop?
+ if (d->server != NULL)
+ {
+ GNUNET_CORE_disconnect (d->server);
+ d->server = NULL;
+ }
+ */
+ /* shutdown ARM process (will terminate others) */
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id));
+#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)
+ {
+#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->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ arg, "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-c", d->cfgfile, "-e", "-q",
+ del_arg, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping gnunet-arm with command ssh %s gnunet-arm -c %s -e -q %s\n",
+ arg, "gnunet-arm", d->cfgfile, del_arg);
+ /* 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->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
+ "gnunet-arm",
+#if DEBUG_TESTING
+ "-L", "DEBUG",
+#endif
+ "-c", d->cfgfile, "-e", "-q",
+ del_arg, NULL);
+ }
+
+ GNUNET_free_non_null (del_arg);
+ d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
+ d->task = GNUNET_SCHEDULER_add_now (&start_fsm, d);
}
/**
- * Establish a connection between two GNUnet daemons.
+ * Changes the configuration of a GNUnet daemon.
*
- * @param d1 handle for the first daemon
- * @param d2 handle for the second daemon
- * @param cb function to call at the end
+ * @param d the daemon that should be modified
+ * @param cfg the new configuration for the daemon
+ * @param cb function called once the configuration was changed
* @param cb_cls closure for cb
*/
-void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
- struct GNUNET_TESTING_Daemon *d2,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls)
+void
+GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
+ struct GNUNET_CONFIGURATION_Handle *cfg,
+ GNUNET_TESTING_NotifyCompletion cb,
+ void *cb_cls)
{
+ char *arg;
+
+ if (d->phase != SP_START_DONE)
+ {
+ if (NULL != cb)
+ cb (cb_cls,
+ _
+ ("Peer not yet running, can not change configuration at this point."));
+ return;
+ }
+
+ /* 1) write configuration to temporary file */
+ if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, d->cfgfile))
+ {
+ if (NULL != cb)
+ cb (cb_cls, _("Failed to write new configuration to disk."));
+ return;
+ }
+
+ /* 2) copy file to remote host (if necessary) */
+ if (NULL == d->hostname)
+ {
+ /* signal success */
+ if (NULL != cb)
+ cb (cb_cls, NULL);
+ return;
+ }
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Copying updated configuration file to remote host `%s'.\n",
+ d->hostname);
+#endif
+ d->phase = SP_CONFIG_UPDATE;
+ if (NULL != d->username)
+ GNUNET_asprintf (&arg, "%s@%s:%s", d->username, d->hostname, d->cfgfile);
+ else
+ GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile);
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp",
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ d->cfgfile, arg, NULL);
+ GNUNET_free (arg);
+ if (NULL == d->proc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Could not start `%s' process to copy configuration file.\n"),
+ "scp");
+ if (NULL != cb)
+ cb (cb_cls, _("Failed to copy new configuration to remote machine."));
+ d->phase = SP_START_DONE;
+ return;
+ }
+ d->update_cb = cb;
+ d->update_cb_cls = cb_cls;
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
}
/**
- * Start count gnunetd processes with the same set of
- * transports and applications. The port numbers will
- * be computed by adding delta each time (zero
- * times for the first peer).
+ * Data kept for each pair of peers that we try
+ * to connect.
+ */
+struct ConnectContext
+{
+ /**
+ * Testing handle to the first daemon.
+ */
+ struct GNUNET_TESTING_Daemon *d1;
+
+ /**
+ * Handle to core of first daemon (to check connect)
+ */
+ struct GNUNET_CORE_Handle *d1core;
+
+ /**
+ * Have we actually connected to the core of the first daemon yet?
+ */
+ int d1core_ready;
+
+ /**
+ * Testing handle to the second daemon.
+ */
+ struct GNUNET_TESTING_Daemon *d2;
+
+ /**
+ * Handler for the request to core to connect to this peer.
+ */
+ struct GNUNET_CORE_PeerRequestHandle *connect_request_handle;
+
+ /**
+ * Transport handle to the first daemon (to offer the HELLO of the second daemon to).
+ */
+ struct GNUNET_TRANSPORT_Handle *d1th;
+
+ /**
+ * Function to call once we are done (or have timed out).
+ */
+ GNUNET_TESTING_NotifyConnection cb;
+
+ /**
+ * Closure for "nb".
+ */
+ void *cb_cls;
+
+ /**
+ * The relative timeout from whence this connect attempt was
+ * started. Allows for reconnect attempts.
+ */
+ struct GNUNET_TIME_Relative relative_timeout;
+
+ /**
+ * Maximum number of connect attempts, will retry connection
+ * this number of times on failures.
+ */
+ unsigned int connect_attempts;
+
+ /**
+ * Hello timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier hello_send_task;
+
+ /**
+ * Connect timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * When should this operation be complete (or we must trigger
+ * a timeout).
+ */
+ struct GNUNET_TIME_Relative timeout_hello;
+
+ /**
+ * Was the connection attempt successful?
+ */
+ int connected;
+
+ /**
+ * When connecting, do we need to send the HELLO?
+ */
+ int send_hello;
+
+ /**
+ * The distance between the two connected peers
+ */
+ uint32_t distance;
+};
+
+
+/** Forward declaration **/
+static void
+reattempt_daemons_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Notify callback about success or failure of the attempt
+ * to connect the two peers
*
- * @param total number of daemons to start
- * @param service_home_prefix path to use as the prefix for the home of the services
- * @param transports which transports should all peers use
- * @param applications which applications should be used?
- * @param timeout how long is this allowed to take?
- * @param cb function to call on each daemon that was started
- * @param cb_cls closure for cb
- * @param cbe function to call at the end
- * @param cbe_cls closure for cbe
- * @param hostname where to run the peers; can be NULL (to run
- * everything on localhost).
- * @param va Additional hosts can be specified using a NULL-terminated list of
- * varargs, hosts will then be used round-robin from that
- * list; va only contains anything if hostname != NULL.
+ * @param cls our "struct ConnectContext" (freed)
+ * @param tc reason tells us if we succeeded or failed
+ */
+static void
+notify_connect_result (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ConnectContext *ctx = cls;
+ ctx->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ if (ctx->hello_send_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (ctx->hello_send_task);
+ ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (ctx->connect_request_handle != NULL)
+ {
+ GNUNET_CORE_peer_request_connect_cancel (ctx->connect_request_handle);
+ ctx->connect_request_handle = NULL;
+ }
+
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ {
+ if (ctx->d1th != NULL)
+ GNUNET_TRANSPORT_disconnect (ctx->d1th);
+ ctx->d1th = NULL;
+ if (ctx->d1core != NULL)
+ GNUNET_CORE_disconnect (ctx->d1core);
+#if CONNECT_CORE2
+ if (ctx->d2core != NULL)
+ GNUNET_CORE_disconnect (ctx->d2core);
+ ctx->d2core = NULL;
+#endif
+ ctx->d1core = NULL;
+ GNUNET_free (ctx);
+ return;
+ }
+
+ if (ctx->d1th != NULL)
+ GNUNET_TRANSPORT_disconnect (ctx->d1th);
+ ctx->d1th = NULL;
+ if (ctx->d1core != NULL)
+ GNUNET_CORE_disconnect (ctx->d1core);
+ ctx->d1core = NULL;
+
+ if (ctx->connected == GNUNET_YES)
+ {
+ if (ctx->cb != NULL)
+ {
+ ctx->cb (ctx->cb_cls,
+ &ctx->d1->id,
+ &ctx->d2->id,
+ ctx->distance,
+ ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
+ }
+ }
+ else if (ctx->connect_attempts > 0)
+ {
+ ctx->d1core_ready = GNUNET_NO;
+#if CONNECT_CORE2
+ if (ctx->d2core != NULL)
+ {
+ GNUNET_CORE_disconnect (ctx->d2core);
+ ctx->d2core = NULL;
+ }
+#endif
+ GNUNET_SCHEDULER_add_now (&reattempt_daemons_connect, ctx);
+ return;
+ }
+ else
+ {
+ if (ctx->cb != NULL)
+ {
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
+ ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Peers failed to connect"));
+ }
+ }
+
+ GNUNET_free (ctx);
+}
+
+
+/**
+ * Success, connection is up. Signal client our success.
+ *
+ * @param cls our "struct ConnectContext"
+ * @param peer identity of the peer that has connected
+ * @param atsi performance information
+ *
+ */
+static void
+connect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ struct ConnectContext *ctx = cls;
+
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Connected peer %s to peer %s\n",
+ ctx->d1->shortname, GNUNET_i2s(peer));
+#endif
+
+ if (0 == memcmp (&ctx->d2->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+ {
+
+ ctx->connected = GNUNET_YES;
+ ctx->distance = 0; /* FIXME: distance */
+ if (ctx->hello_send_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(ctx->hello_send_task);
+ ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_SCHEDULER_cancel (ctx->timeout_task);
+ ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result,
+ ctx);
+ }
+}
+
+#if CONNECT_CORE2
+/**
+ * Success, connection is up. Signal client our success.
+ *
+ * @param cls our "struct ConnectContext"
+ * @param peer identity of the peer that has connected
+ * @param atsi performance information
+ *
+ */
+static void
+connect_notify_core2 (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ struct ConnectContext *ctx = cls;
+
+ if (memcmp (&ctx->d2->id, peer, sizeof (struct GNUNET_PeerIdentity)) == 0)
+ {
+ ctx->connected = GNUNET_YES;
+ ctx->distance = 0; /* FIXME: distance */
+ GNUNET_SCHEDULER_cancel (ctx->timeout_task);
+ ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result,
+ ctx);
+ }
+
+}
+#endif
+
+/**
+ * Task called once a core connect request has been transmitted.
+ *
+ * @param cls struct ConnectContext
+ * @param success was the request successful?
+ */
+void
+core_connect_request_cont (void *cls,
+ int success)
+{
+ struct ConnectContext *ctx = cls;
+
+ ctx->connect_request_handle = NULL;
+}
+
+static void
+send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ConnectContext *ctx = cls;
+ struct GNUNET_MessageHeader *hello;
+ ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ return;
+ if ((ctx->d1core_ready == GNUNET_YES) && (ctx->d2->hello != NULL)
+ && (NULL != GNUNET_HELLO_get_header (ctx->d2->hello)))
+ {
+ hello = GNUNET_HELLO_get_header (ctx->d2->hello);
+ GNUNET_assert (hello != NULL);
+ GNUNET_TRANSPORT_offer_hello (ctx->d1th, hello, NULL, NULL);
+ GNUNET_assert (ctx->d1core != NULL);
+ ctx->connect_request_handle =
+ GNUNET_CORE_peer_request_connect (ctx->d1core,
+ ctx->relative_timeout,
+ &ctx->d2->id,
+ &core_connect_request_cont, ctx);
+
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Sending connect request to CORE of %s for peer %s\n",
+ GNUNET_i2s (&ctx->d1->id),
+ GNUNET_h2s (&ctx->d2->id.hashPubKey));
+#endif
+ ctx->timeout_hello =
+ GNUNET_TIME_relative_add (ctx->timeout_hello,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 500));
+ }
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_delayed (ctx->timeout_hello,
+ &send_hello, ctx);
+}
+
+/**
+ * Notify of a successful connection to the core service.
+ *
+ * @param cls a ConnectContext
+ * @param server handle to the core service
+ * @param my_identity the peer identity of this peer
+ * @param publicKey the public key of the peer
*/
void
-GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int total,
- const char *service_home_prefix,
- const char *transports,
- const char *applications,
- GNUNET_TESTING_NotifyDaemonRunning cb,
- void *cb_cls,
- GNUNET_TESTING_NotifyCompletion cbe,
- void *cbe_cls,
- const char *hostname,
- va_list va)
-{
-}
-
-
-/**
- * Start count gnunetd processes with the same set of
- * transports and applications. The port numbers will
- * be computed by adding delta each time (zero
- * times for the first peer).
- *
- * @param total number of daemons to start
- * @param service_home_prefix path to use as the prefix for the home of the services
- * @param transports which transports should all peers use
- * @param applications which applications should be used?
- * @param timeout how long is this allowed to take?
- * @param cb function to call on each daemon that was started
+core_init_notify (void *cls,
+ struct GNUNET_CORE_Handle * server,
+ const struct GNUNET_PeerIdentity *
+ my_identity,
+ const struct
+ GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
+ publicKey)
+{
+ struct ConnectContext *connect_ctx = cls;
+ connect_ctx->d1core_ready = GNUNET_YES;
+
+ if (connect_ctx->send_hello == GNUNET_NO)
+ {
+ connect_ctx->connect_request_handle =
+ GNUNET_CORE_peer_request_connect (connect_ctx->d1core,
+ connect_ctx->relative_timeout,
+ &connect_ctx->d2->id,
+ &core_connect_request_cont, connect_ctx);
+ GNUNET_assert(connect_ctx->connect_request_handle != NULL);
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending connect request to CORE of %s for peer %s\n",
+ connect_ctx->d1->shortname,
+ connect_ctx->d2->shortname);
+#endif
+ }
+
+}
+
+
+static void
+reattempt_daemons_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ConnectContext *ctx = cls;
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ {
+ GNUNET_free(ctx);
+ return;
+ }
+#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
+ ctx->connect_attempts--;
+ GNUNET_assert (ctx->d1core == NULL);
+ ctx->d1core_ready = GNUNET_NO;
+ ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, 1,
+ ctx,
+ &core_init_notify,
+ &connect_notify, NULL, NULL,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO, no_handlers);
+ if (ctx->d1core == NULL)
+ {
+ if (NULL != ctx->cb)
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
+ ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Failed to connect to core service of first peer!\n"));
+ GNUNET_free (ctx);
+ return;
+ }
+
+ if (ctx->send_hello == GNUNET_YES)
+ {
+ ctx->d1th = GNUNET_TRANSPORT_connect (ctx->d1->cfg,
+ &ctx->d1->id,
+ ctx->d1, NULL, NULL, NULL);
+ if (ctx->d1th == NULL)
+ {
+ GNUNET_CORE_disconnect (ctx->d1core);
+ GNUNET_free (ctx);
+ if (NULL != ctx->cb)
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
+ ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Failed to connect to transport service!\n"));
+ return;
+ }
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx);
+ }
+ else
+ {
+ ctx->connect_request_handle =
+ GNUNET_CORE_peer_request_connect (ctx->d1core,
+ ctx->relative_timeout,
+ &ctx->d2->id,
+ &core_connect_request_cont, ctx);
+ }
+ ctx->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (ctx->relative_timeout,
+ ¬ify_connect_result, ctx);
+}
+
+/**
+ * Iterator for currently known peers, to ensure
+ * that we don't try to send duplicate connect
+ * requests to core.
+ *
+ * @param cls our "struct ConnectContext"
+ * @param peer identity of the peer that has connected,
+ * NULL when iteration has finished
+ * @param atsi performance information
+ *
+ */
+static void
+core_initial_iteration (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ struct ConnectContext *ctx = cls;
+
+ if ((peer != NULL) &&
+ (0 == memcmp (&ctx->d2->id, peer, sizeof (struct GNUNET_PeerIdentity))))
+ {
+ ctx->connected = GNUNET_YES;
+ ctx->distance = 0; /* FIXME: distance */
+ return;
+ }
+ else if (peer == NULL) /* End of iteration over peers */
+ {
+ if (ctx->connected == GNUNET_YES)
+ {
+ ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result,
+ ctx);
+ return;
+ }
+
+ /* Peer not already connected, need to schedule connect request! */
+ if (ctx->d1core == NULL)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers are NOT connected, connecting to core!\n");
+#endif
+ ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, 1,
+ ctx,
+ &core_init_notify,
+ &connect_notify, NULL, NULL,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO, no_handlers);
+ }
+
+ if (ctx->d1core == NULL)
+ {
+ GNUNET_free (ctx);
+ if (NULL != ctx->cb)
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Failed to connect to core service of first peer!\n"));
+ return;
+ }
+
+ if (ctx->send_hello == GNUNET_YES)
+ {
+ ctx->d1th = GNUNET_TRANSPORT_connect (ctx->d1->cfg,
+ &ctx->d1->id, ctx->d1, NULL, NULL, NULL);
+ if (ctx->d1th == NULL)
+ {
+ GNUNET_CORE_disconnect (ctx->d1core);
+ GNUNET_free (ctx);
+ if (NULL != ctx->cb)
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Failed to connect to transport service!\n"));
+ return;
+ }
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx);
+ }
+
+ ctx->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (ctx->relative_timeout,
+ ¬ify_connect_result, ctx);
+ }
+}
+
+
+/**
+ * Establish a connection between two GNUnet daemons.
+ *
+ * @param d1 handle for the first daemon
+ * @param d2 handle for the second daemon
+ * @param timeout how long is the connection attempt
+ * allowed to take?
+ * @param max_connect_attempts how many times should we try to reconnect
+ * (within timeout)
+ * @param send_hello GNUNET_YES to send the HELLO, GNUNET_NO to assume
+ * the HELLO has already been exchanged
+ * @param cb function to call at the end
* @param cb_cls closure for cb
- * @param cbe function to call at the end
- * @param cbe_cls closure for cbe
- * @param hostname where to run the peers; can be NULL (to run
- * everything on localhost). Additional
- * hosts can be specified using a NULL-terminated list of
- * varargs, hosts will then be used round-robin from that
- * list.
*/
void
-GNUNET_TESTING_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int total,
- const char *service_home_prefix,
- const char *transports,
- const char *applications,
- GNUNET_TESTING_NotifyDaemonRunning cb,
- void *cb_cls,
- GNUNET_TESTING_NotifyCompletion cbe,
- void *cbe_cls,
- const char *hostname,
- ...)
-{
- va_list va;
-
- va_start (va, hostname);
- GNUNET_TESTING_daemons_start_va (sched, cfg,
- total, service_home_prefix,
- transports, applications,
- cb, cb_cls, cbe, cbe_cls, hostname,
- va);
- va_end (va);
+GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
+ struct GNUNET_TESTING_Daemon *d2,
+ struct GNUNET_TIME_Relative timeout,
+ unsigned int max_connect_attempts,
+ int send_hello,
+ GNUNET_TESTING_NotifyConnection cb,
+ void *cb_cls)
+{
+ struct ConnectContext *ctx;
+
+ if ((d1->running == GNUNET_NO) || (d2->running == GNUNET_NO))
+ {
+ if (NULL != cb)
+ cb (cb_cls, &d1->id, &d2->id, 0, d1->cfg, d2->cfg, d1, d2,
+ _("Peers are not fully running yet, can not connect!\n"));
+ return;
+ }
+
+ ctx = GNUNET_malloc (sizeof (struct ConnectContext));
+ ctx->d1 = d1;
+ ctx->d2 = d2;
+ ctx->timeout_hello =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500);
+ ctx->relative_timeout = GNUNET_TIME_relative_divide(timeout, max_connect_attempts);
+ ctx->cb = cb;
+ ctx->cb_cls = cb_cls;
+ ctx->connect_attempts = max_connect_attempts;
+ ctx->connected = GNUNET_NO;
+ ctx->send_hello = send_hello;
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to connect peer %s to peer %s\n",
+ d1->shortname, d2->shortname);
+#endif
+
+ /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */
+ GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx));
+ /*GNUNET_assert(GNUNET_OK == GNUNET_CORE_iterate_peers (ctx->d1->cfg, &core_initial_iteration, ctx));*/
}
/* end of testing.c */
projects / oweals / gnunet.git / blobdiff