X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftesting%2Ftesting.c;h=31bea068cfe84836f6d643a87237cf0cf3ab2fba;hb=0c0e1876f6fbd88b15ab5bad49ab6ce22706d03c;hp=6edc1fc8c7010eae6232005b76f5d2f2f0a458c2;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git diff --git a/src/testing/testing.c b/src/testing/testing.c index 6edc1fc8c..31bea068c 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -37,10 +37,6 @@ #include "gnunet_transport_service.h" #include "gnunet_hello_lib.h" -#define DEBUG_TESTING GNUNET_EXTRA_LOGGING - -#define DEBUG_TESTING_RECONNECT GNUNET_EXTRA_LOGGING - /** * Hack to deal with initial HELLO's being often devoid of addresses. * This hack causes 'process_hello' to ignore HELLOs without addresses. @@ -65,9 +61,8 @@ static struct GNUNET_CORE_MessageHandler no_handlers[] = { {NULL, 0, 0} }; #if EMPTY_HACK static int -test_address (void *cls, const char *tname, - struct GNUNET_TIME_Absolute expiration, const void *addr, - uint16_t addrlen) +test_address (void *cls, const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) { int *empty = cls; @@ -80,7 +75,7 @@ test_address (void *cls, const char *tname, * Receive the HELLO from one peer, give it to the other * and ask them to connect. * - * @param cls "struct ConnectContext" + * @param cls Closure (daemon whose hello is this). * @param message HELLO message of peer */ static void @@ -98,25 +93,23 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) GNUNET_NO, &test_address, &empty); if (GNUNET_YES == empty) { -#if DEBUG_TESTING - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Skipping empty HELLO address\n"); -#endif + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Skipping empty HELLO address of peer %s\n", + GNUNET_i2s (&daemon->id)); return; } #endif GNUNET_assert (daemon->phase == SP_GET_HELLO || daemon->phase == SP_START_DONE); - daemon->cb = NULL; + daemon->cb = NULL; // FIXME: why??? (see fsm:SP_START_CORE, notify_daemon_started) 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; } @@ -124,18 +117,19 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) msize = ntohs (message->size); if (msize < 1) { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "HELLO message of peer %s is of size 0\n", + GNUNET_i2s (&daemon->id)); return; } if (daemon->ghh != NULL) { GNUNET_TRANSPORT_get_hello_cancel (daemon->ghh); + daemon->ghh = NULL; } -#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); @@ -148,13 +142,12 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) daemon->phase = SP_START_DONE; } -static void -start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); /** * Notify of a peer being up and running. Scheduled as a task * so that variables which may need to be set are set before * the connect callback can set up new operations. + * FIXME: what variables?????? where from???? * * @param cls the testing daemon * @param tc task scheduler context @@ -188,16 +181,14 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) char *dst; int bytes_read; -#if DEBUG_TESTING - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer FSM is in phase %u.\n", d->phase); -#endif - + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %s FSM is in phase %u.\n", + GNUNET_i2s (&d->id), d->phase); 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_OK != GNUNET_OS_process_status (d->proc_arm_copying, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) { @@ -223,18 +214,18 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) cb (d->cb_cls, NULL, d->cfg, d, _("`scp' did not complete cleanly.\n")); return; } - GNUNET_OS_process_close (d->proc); -#if DEBUG_TESTING + GNUNET_OS_process_destroy (d->proc_arm_copying); + d->proc_arm_copying = NULL; 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 if we don't already know the peer identity! */ if (GNUNET_NO == d->have_hostkey) { - d->pipe_stdout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES); + GNUNET_assert (NULL == d->proc_arm_peerinfo); + d->pipe_stdout = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_YES); if (d->pipe_stdout == NULL) { cb = d->cb; @@ -249,14 +240,12 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } 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", + d->proc_arm_peerinfo = + GNUNET_OS_start_process (GNUNET_YES, 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); @@ -268,36 +257,30 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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 + d->proc_arm_peerinfo = GNUNET_OS_start_process (GNUNET_NO, NULL, d->pipe_stdout, "ssh", "ssh", "-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->proc_arm_peerinfo = + GNUNET_OS_start_process (GNUNET_NO, 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) + if (NULL == d->proc_arm_peerinfo) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not start `%s' process to create hostkey.\n"), @@ -312,10 +295,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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 @@ -379,10 +360,10 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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; + (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); + GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); + GNUNET_OS_process_destroy (d->proc_arm_peerinfo); + d->proc_arm_peerinfo = NULL; if (NULL != cb) cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); return; @@ -390,10 +371,10 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) d->shortname = GNUNET_strdup (GNUNET_i2s (&d->id)); 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; + (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); + GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); + GNUNET_OS_process_destroy (d->proc_arm_peerinfo); + d->proc_arm_peerinfo = NULL; d->have_hostkey = GNUNET_YES; if (d->hostkey_callback != NULL) { @@ -405,9 +386,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { d->phase = SP_TOPOLOGY_SETUP; } -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully got hostkey!\n"); -#endif /* Fall through */ case SP_HOSTKEY_CREATED: /* wait for topology finished */ @@ -430,18 +409,13 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /* start GNUnet on remote host */ if (NULL == d->hostname) { -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Starting `%s', with command `%s %s %s %s %s %s'.\n", - "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-L", "DEBUG", + "Starting `%s', with command `%s %s %s %s'.\n", + "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-s"); -#endif - d->proc = - GNUNET_OS_start_process (NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", + d->proc_arm_start = + GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-s", "-q", "-T", GNUNET_TIME_relative_to_string (GNUNET_TIME_absolute_get_remaining @@ -454,22 +428,15 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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", + "Starting `%s', with command `%s %s %s %s %s %s %s'.\n", "gnunet-arm", "ssh", dst, "gnunet-arm", "-c", d->cfgfile, - "-L", "DEBUG", "-s", "-q"); -#endif + "-s", "-q"); if (d->ssh_port_str == NULL) { - d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", -#if !DEBUG_TESTING + d->proc_arm_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-q", -#endif dst, "gnunet-arm", -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-c", d->cfgfile, "-s", "-q", "-T", GNUNET_TIME_relative_to_string (GNUNET_TIME_absolute_get_remaining @@ -478,16 +445,11 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) else { - d->proc = - GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", "-p", + d->proc_arm_start = + GNUNET_OS_start_process (GNUNET_NO, 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", "-T", GNUNET_TIME_relative_to_string (GNUNET_TIME_absolute_get_remaining @@ -495,7 +457,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } GNUNET_free (dst); } - if (NULL == d->proc) + if (NULL == d->proc_arm_start) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not start `%s' process to start GNUnet.\n"), @@ -509,18 +471,17 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) _("Failed to start `ssh' process.\n")); return; } -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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); + // FIXME: busy wait? break; case SP_START_ARMING: - if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code)) + if (GNUNET_OK != GNUNET_OS_process_status (d->proc_arm_start, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) { @@ -531,29 +492,40 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) (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); + if (d->cfg != NULL) + { + GNUNET_CONFIGURATION_destroy (d->cfg); + d->cfg = NULL; + } + if (d->cfgfile != NULL) + { + GNUNET_free (d->cfgfile); + d->cfgfile = NULL; + } GNUNET_free_non_null (d->hostname); GNUNET_free_non_null (d->username); - GNUNET_free (d->proc); - GNUNET_free (d); + GNUNET_OS_process_destroy (d->proc_arm_start); + d->proc_arm_start = NULL; + d->username = NULL; + d->hostname = NULL; // Quick hack to avoid crashing (testing need to be + d->cfg = NULL; // overhauled anyway, and the error managing is + // GNUNET_free (d); // FIXME (could this leak) + // pretty broken anyway. return; } /* wait some more */ d->task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT, &start_fsm, d); + // FIXME: busy wait? return; } -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully started `%s'.\n", "gnunet-arm"); -#endif - GNUNET_free (d->proc); + GNUNET_OS_process_destroy (d->proc_arm_start); + d->proc_arm_start = NULL; d->phase = SP_START_CORE; -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling CORE_connect\n"); -#endif /* Fall through */ case SP_START_CORE: if (d->server != NULL) @@ -572,12 +544,9 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) _("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 (&d->id)); -#endif - d->ghh = GNUNET_TRANSPORT_get_hello (d->th, &process_hello, d); /* FIXME: store task ID somewhere! */ GNUNET_SCHEDULER_add_now (¬ify_daemon_started, d); @@ -619,7 +588,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) break; case SP_SERVICE_START: /* confirm gnunet-arm exited */ - if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code)) + if (GNUNET_OK != GNUNET_OS_process_status (d->proc_arm_srv_start, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) { @@ -653,18 +622,18 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) return; } #endif -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service startup complete!\n"); -#endif cb = d->cb; d->cb = NULL; d->phase = SP_START_DONE; if (NULL != cb) cb (d->cb_cls, &d->id, d->cfg, d, NULL); + GNUNET_OS_process_destroy (d->proc_arm_srv_start); + d->proc_arm_srv_start = NULL; break; case SP_SERVICE_SHUTDOWN_START: /* confirm copying complete */ - if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code)) + if (GNUNET_OK != GNUNET_OS_process_status (d->proc_arm_srv_stop, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) { @@ -690,15 +659,13 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) return; } #endif -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service shutdown complete.\n"); -#endif if (NULL != d->dead_cb) d->dead_cb (d->dead_cb_cls, NULL); break; case SP_SHUTDOWN_START: - /* confirm copying complete */ - if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code)) + /* confirm copying complete !??? */ + if (GNUNET_OK != GNUNET_OS_process_status (d->proc_arm_stop, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) { @@ -713,14 +680,22 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TRANSPORT_disconnect (d->th); d->th = NULL; } - GNUNET_CONFIGURATION_destroy (d->cfg); - GNUNET_free (d->cfgfile); + if (d->cfg != NULL) + { + GNUNET_CONFIGURATION_destroy (d->cfg); + d->cfg = NULL; + } + if (d->cfgfile != NULL) + { + GNUNET_free (d->cfgfile); + d->cfgfile = NULL; + } 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_OS_process_destroy (d->proc_arm_stop); + d->proc_arm_stop = NULL; GNUNET_free (d); return; } @@ -749,19 +724,18 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) d->server = NULL; } GNUNET_CONFIGURATION_destroy (d->cfg); + d->cfg = NULL; 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_OS_process_destroy (d->proc_arm_stop); + d->proc_arm_stop = 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); @@ -783,6 +757,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (d->churn == GNUNET_NO) { GNUNET_CONFIGURATION_destroy (d->cfg); + d->cfg = NULL; GNUNET_free (d->cfgfile); GNUNET_free_non_null (d->hostname); GNUNET_free_non_null (d->username); @@ -791,8 +766,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_free_non_null (d->hello); d->hello = NULL; GNUNET_free_non_null (d->shortname); - GNUNET_free_non_null (d->proc); - d->proc = NULL; + GNUNET_OS_process_destroy (d->proc_arm_stop); + d->proc_arm_stop = NULL; d->shortname = NULL; if (d->churn == GNUNET_NO) GNUNET_free (d); @@ -800,7 +775,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) break; case SP_CONFIG_UPDATE: /* confirm copying complete */ - if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code)) + if (GNUNET_OK != GNUNET_OS_process_status (d->proc_arm_copying, &type, &code)) { if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) /* FIXME: config update should take timeout parameter! */ { @@ -823,10 +798,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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; @@ -911,25 +884,17 @@ GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d, /* Check if this is a local or remote process */ if (NULL != d->hostname) { -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting 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 + d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-q", -#endif arg, "gnunet-arm", -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-c", d->cfgfile, "-i", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -941,14 +906,9 @@ GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d, } else { -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting 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 + d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-i", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -984,36 +944,25 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d, GNUNET_assert (d->running == GNUNET_YES); GNUNET_assert (d->phase == SP_START_DONE); -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Starting service %s for peer `%4s'\n"), service, GNUNET_i2s (&d->id)); -#endif - d->phase = SP_SERVICE_START; d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout); /* Check if this is a local or remote process */ if (NULL != d->hostname) { -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting 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 + d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-q", -#endif arg, "gnunet-arm", -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-c", d->cfgfile, "-i", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -1026,14 +975,9 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d, } else { -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting 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 + d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-i", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -1143,10 +1087,8 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg, 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); @@ -1223,10 +1165,8 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg, /* 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] == '/') @@ -1244,29 +1184,23 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_free (baseservicehome); if (ret->ssh_port_str == NULL) { - ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", "-r", -#if !DEBUG_TESTING + ret->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", "-r", "-q", -#endif servicehome, arg, NULL); -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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->proc_arm_copying = + GNUNET_OS_start_process (GNUNET_NO, 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) + if (NULL == ret->proc_arm_copying) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ @@ -1296,10 +1230,8 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg, 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; /* FIXME: why add_cont? */ GNUNET_SCHEDULER_add_continuation (&start_fsm, ret, @@ -1357,35 +1289,24 @@ GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d, /* 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 + d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-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 */ @@ -1393,14 +1314,9 @@ GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d, } 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 + d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-e", "-r", NULL); } @@ -1440,10 +1356,8 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d, d->phase = SP_START_DONE; } -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id)); -#endif if (d->churned_services != NULL) { d->dead_cb (d->dead_cb_cls, "A service has already been turned off!!"); @@ -1455,25 +1369,17 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d, /* 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 + + d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-q", -#endif arg, "gnunet-arm", -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-c", d->cfgfile, "-k", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -1485,14 +1391,9 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d, } 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 + d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-k", service, "-q", "-T", GNUNET_TIME_relative_to_string (timeout), @@ -1504,6 +1405,20 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d, } +/** + * Forcefully terminate a process and clean up the child. + * + * @param proc handle to process to kill + */ +static void +kill_and_close_process (struct GNUNET_OS_Process *proc) +{ + (void) GNUNET_OS_process_kill (proc, SIGKILL); + GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc)); + GNUNET_OS_process_destroy (proc); +} + + /** * Stops a GNUnet daemon. * @@ -1530,17 +1445,40 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, 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! */ + if (NULL != d->proc_arm_start) + { + kill_and_close_process (d->proc_arm_start); + d->proc_arm_start = NULL; + } + if (NULL != d->proc_arm_srv_start) + { + kill_and_close_process (d->proc_arm_srv_start); + d->proc_arm_srv_start = NULL; + } + if (NULL != d->proc_arm_srv_stop) + { + kill_and_close_process (d->proc_arm_srv_stop); + d->proc_arm_srv_stop = NULL; + } + if (NULL != d->proc_arm_copying) + { + kill_and_close_process (d->proc_arm_copying); + d->proc_arm_copying = NULL; + } + if (NULL != d->proc_arm_peerinfo) + { + kill_and_close_process (d->proc_arm_peerinfo); + d->proc_arm_peerinfo = NULL; + } + if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) { - /* Free what was left from churning! */ + /* 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) @@ -1555,6 +1493,10 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, GNUNET_free_non_null (d->username); if (NULL != d->dead_cb) d->dead_cb (d->dead_cb_cls, NULL); + /* FIXME: this should be an assert and the test below + should not be required, but testing is broken... */ + GNUNET_break (NULL == d->proc_arm_stop); + if (NULL == d->proc_arm_stop) GNUNET_free (d); return; } @@ -1578,10 +1520,8 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, } */ /* shutdown ARM process (will terminate others) */ -#if DEBUG_TESTING - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Terminating peer `%4s'\n"), + 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) @@ -1594,27 +1534,21 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, 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 + d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-q", -#endif arg, "gnunet-arm", -#if DEBUG_TESTING - "-L", "DEBUG", -#endif "-c", d->cfgfile, "-e", "-q", "-T", GNUNET_TIME_relative_to_string (timeout), del_arg, NULL); @@ -1626,21 +1560,19 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, } 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 + d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, "-e", "-q", "-T", GNUNET_TIME_relative_to_string (timeout), del_arg, NULL); + GNUNET_assert (NULL != d->proc_arm_stop); } GNUNET_free_non_null (del_arg); d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout); + if (GNUNET_SCHEDULER_NO_TASK != d->task) + GNUNET_SCHEDULER_cancel(d->task); d->task = GNUNET_SCHEDULER_add_now (&start_fsm, d); } @@ -1686,23 +1618,19 @@ GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d, 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 + d->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", "-q", -#endif d->cfgfile, arg, NULL); GNUNET_free (arg); - if (NULL == d->proc) + if (NULL == d->proc_arm_copying) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not start `%s' process to copy configuration file.\n"), @@ -1830,18 +1758,6 @@ notify_connect_result (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK; } - if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) - { - if (ctx->d1th != NULL) - GNUNET_TRANSPORT_disconnect (ctx->d1th); - ctx->d1th = NULL; - if (ctx->d1core != NULL) - GNUNET_CORE_disconnect (ctx->d1core); - ctx->d1core = NULL; - GNUNET_free (ctx); - return; - } - if (ctx->d1th != NULL) GNUNET_TRANSPORT_disconnect (ctx->d1th); ctx->d1th = NULL; @@ -1849,6 +1765,12 @@ notify_connect_result (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CORE_disconnect (ctx->d1core); ctx->d1core = NULL; + if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) + { + GNUNET_free (ctx); + return; + } + if (ctx->connected == GNUNET_YES) { if (ctx->cb != NULL) @@ -1892,11 +1814,8 @@ connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, { struct GNUNET_TESTING_ConnectContext *ctx = cls; -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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))) return; ctx->connected = GNUNET_YES; @@ -1926,18 +1845,14 @@ send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { hello = GNUNET_HELLO_get_header (ctx->d2->hello); GNUNET_assert (hello != NULL); -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Offering hello of %s to %s\n", ctx->d2->shortname, ctx->d1->shortname); -#endif GNUNET_TRANSPORT_offer_hello (ctx->d1th, hello, NULL, NULL); GNUNET_assert (ctx->d1core != NULL); -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending connect request to TRANSPORT of %s for peer %s\n", GNUNET_i2s (&ctx->d1->id), GNUNET_h2s (&ctx->d2->id.hashPubKey)); -#endif GNUNET_TRANSPORT_try_connect (ctx->d1th, &ctx->d2->id); ctx->timeout_hello = GNUNET_TIME_relative_add (ctx->timeout_hello, @@ -1966,16 +1881,20 @@ core_init_notify (void *cls, struct GNUNET_CORE_Handle *server, if (connect_ctx->send_hello == GNUNET_NO) { GNUNET_TRANSPORT_try_connect (connect_ctx->d1th, &connect_ctx->d2->id); -#if DEBUG_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending connect request to TRANSPORT of %s for peer %s\n", connect_ctx->d1->shortname, connect_ctx->d2->shortname); -#endif } - } +/** + * Try to connect again some peers that failed in an earlier attempt. This will + * be tried as many times as connection_attempts in the configuration file. + * + * @param cls Closure (connection context between the two peers). + * @param tc TaskContext. + */ static void reattempt_daemons_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) @@ -1985,11 +1904,9 @@ reattempt_daemons_connect (void *cls, ctx->timeout_task = GNUNET_SCHEDULER_NO_TASK; if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) return; -#if DEBUG_TESTING_RECONNECT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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; @@ -2010,6 +1927,8 @@ reattempt_daemons_connect (void *cls, /* Don't know reason for initial connect failure, update the HELLO for the second peer */ if (NULL != ctx->d2->hello) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "updating %s's HELLO\n", + ctx->d2->shortname); GNUNET_free (ctx->d2->hello); ctx->d2->hello = NULL; if (NULL != ctx->d2->th) @@ -2025,13 +1944,21 @@ reattempt_daemons_connect (void *cls, ctx->d2->ghh = GNUNET_TRANSPORT_get_hello (ctx->d2->th, &process_hello, ctx->d2); } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "didn't have %s's HELLO\n", + ctx->d2->shortname); + } if ((NULL == ctx->d2->hello) && (ctx->d2->th == NULL)) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "didn't have %s's HELLO, trying to get it now\n", + ctx->d2->shortname); ctx->d2->th = GNUNET_TRANSPORT_connect (ctx->d2->cfg, &ctx->d2->id, NULL, NULL, NULL, NULL); - if (ctx->d2->th == NULL) + if (NULL == ctx->d2->th) { GNUNET_CORE_disconnect (ctx->d1core); GNUNET_free (ctx); @@ -2044,9 +1971,20 @@ reattempt_daemons_connect (void *cls, ctx->d2->ghh = GNUNET_TRANSPORT_get_hello (ctx->d2->th, &process_hello, ctx->d2); } + else + { + if (NULL == ctx->d2->hello) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "didn't have %s's HELLO but th wasn't NULL, not trying!!\n", + ctx->d2->shortname); + } + } if (ctx->send_hello == GNUNET_YES) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending %s's HELLO to %s\n", + ctx->d1->shortname, ctx->d2->shortname); ctx->d1th = GNUNET_TRANSPORT_connect (ctx->d1->cfg, &ctx->d1->id, ctx->d1, NULL, NULL, NULL); @@ -2065,6 +2003,8 @@ reattempt_daemons_connect (void *cls, } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to reconnect %s to %s\n", + ctx->d1->shortname, ctx->d2->shortname); GNUNET_TRANSPORT_try_connect (ctx->d1th, &ctx->d2->id); } ctx->timeout_task = @@ -2112,10 +2052,8 @@ core_initial_iteration (void *cls, const struct GNUNET_PeerIdentity *peer, /* 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, GNUNET_NO, NULL, @@ -2130,6 +2068,8 @@ core_initial_iteration (void *cls, const struct GNUNET_PeerIdentity *peer, if ((NULL == ctx->d2->hello) && (ctx->d2->th == NULL)) /* Do not yet have the second peer's hello, set up a task to get it */ { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Don't have d2's HELLO, trying to get it!\n"); ctx->d2->th = GNUNET_TRANSPORT_connect (ctx->d2->cfg, &ctx->d2->id, NULL, NULL, NULL, NULL); @@ -2219,13 +2159,10 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, 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_assert (NULL != GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx)); return ctx;