diff options
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r-- | src/testing/testing_group.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 04c2cfd00..171cf1c48 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2669,8 +2669,8 @@ create_from_file (struct GNUNET_TESTING_PeerGroup *pg, char *filename, | |||
2669 | return connect_attempts; | 2669 | return connect_attempts; |
2670 | } | 2670 | } |
2671 | #if DEBUG_TESTING | 2671 | #if DEBUG_TESTING |
2672 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2672 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u total peers in topology\n", |
2673 | "Found %u total peers in topology\n", total_peers); | 2673 | total_peers); |
2674 | #endif | 2674 | #endif |
2675 | GNUNET_assert (total_peers == pg->total); | 2675 | GNUNET_assert (total_peers == pg->total); |
2676 | curr_state = PEER_INDEX; | 2676 | curr_state = PEER_INDEX; |
@@ -3348,7 +3348,9 @@ send_core_connect_requests (void *cls, | |||
3348 | while (conn != NULL) | 3348 | while (conn != NULL) |
3349 | { | 3349 | { |
3350 | GNUNET_TRANSPORT_try_connect (send_hello_context->peer->daemon->th, | 3350 | GNUNET_TRANSPORT_try_connect (send_hello_context->peer->daemon->th, |
3351 | &send_hello_context->pg->peers[conn->index].daemon->id); | 3351 | &send_hello_context->pg->peers[conn-> |
3352 | index].daemon-> | ||
3353 | id); | ||
3352 | conn = conn->next; | 3354 | conn = conn->next; |
3353 | } | 3355 | } |
3354 | send_hello_context->core_connect_task = | 3356 | send_hello_context->core_connect_task = |
@@ -3486,7 +3488,7 @@ core_connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
3486 | */ | 3488 | */ |
3487 | void | 3489 | void |
3488 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 3490 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
3489 | struct GNUNET_PeerIdentity *my_identity) | 3491 | struct GNUNET_PeerIdentity *my_identity) |
3490 | { | 3492 | { |
3491 | struct SendHelloContext *send_hello_context = cls; | 3493 | struct SendHelloContext *send_hello_context = cls; |
3492 | 3494 | ||
@@ -4878,7 +4880,7 @@ perform_dfs (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num) | |||
4878 | static void | 4880 | static void |
4879 | internal_topology_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | 4881 | internal_topology_callback (void *cls, const struct GNUNET_PeerIdentity *peer, |
4880 | const struct GNUNET_ATS_Information *atsi, | 4882 | const struct GNUNET_ATS_Information *atsi, |
4881 | unsigned int atsi_count) | 4883 | unsigned int atsi_count) |
4882 | { | 4884 | { |
4883 | struct CoreContext *core_ctx = cls; | 4885 | struct CoreContext *core_ctx = cls; |
4884 | struct TopologyIterateContext *iter_ctx = core_ctx->iter_context; | 4886 | struct TopologyIterateContext *iter_ctx = core_ctx->iter_context; |
@@ -5835,9 +5837,8 @@ start_peer_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5835 | "peerStartHelper.pl", tempdir, NULL); | 5837 | "peerStartHelper.pl", tempdir, NULL); |
5836 | GNUNET_assert (helper->proc != NULL); | 5838 | GNUNET_assert (helper->proc != NULL); |
5837 | #if DEBUG_TESTING | 5839 | #if DEBUG_TESTING |
5838 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 5840 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting peers with cmd ssh %s %s %s\n", |
5839 | "starting peers with cmd ssh %s %s %s\n", arg, | 5841 | arg, "peerStartHelper.pl", tempdir); |
5840 | "peerStartHelper.pl", tempdir); | ||
5841 | #endif | 5842 | #endif |
5842 | GNUNET_SCHEDULER_add_now (&check_peers_started, helper); | 5843 | GNUNET_SCHEDULER_add_now (&check_peers_started, helper); |
5843 | GNUNET_free (tempdir); | 5844 | GNUNET_free (tempdir); |
@@ -6109,8 +6110,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6109 | fs = 0; | 6110 | fs = 0; |
6110 | #if DEBUG_TESTING | 6111 | #if DEBUG_TESTING |
6111 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 6112 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
6112 | "Found file size %llu for hostkeys\n", | 6113 | "Found file size %llu for hostkeys\n", fs); |
6113 | fs); | ||
6114 | #endif | 6114 | #endif |
6115 | if (0 != (fs % HOSTKEYFILESIZE)) | 6115 | if (0 != (fs % HOSTKEYFILESIZE)) |
6116 | { | 6116 | { |
@@ -6784,9 +6784,8 @@ GNUNET_TESTING_daemons_start_service (struct GNUNET_TESTING_PeerGroup *pg, | |||
6784 | for (i = 0; i < pg->total; i++) | 6784 | for (i = 0; i < pg->total; i++) |
6785 | { | 6785 | { |
6786 | #if DEBUG_START | 6786 | #if DEBUG_START |
6787 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 6787 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting up service %s on peer %d!\n", |
6788 | "Starting up service %s on peer %d!\n", service, | 6788 | service, stopped_arr[stopped_permute[i]]); |
6789 | stopped_arr[stopped_permute[i]]); | ||
6790 | #endif | 6789 | #endif |
6791 | peer_start_ctx = GNUNET_malloc (sizeof (struct PeerServiceStartContext)); | 6790 | peer_start_ctx = GNUNET_malloc (sizeof (struct PeerServiceStartContext)); |
6792 | peer_start_ctx->start_ctx = start_ctx; | 6791 | peer_start_ctx->start_ctx = start_ctx; |