From 49fb611b2c5c7e438318356a675d8da99e52d739 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 23 Jul 2011 14:37:37 +0000 Subject: [PATCH] fixes --- src/arm/gnunet-arm.c | 2 +- src/nse/gnunet-service-nse.c | 5 +-- src/nse/test_nse_multipeer.c | 62 ++++++++++++++++++++++++------------ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 65417647b..0029e8a62 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -39,7 +39,7 @@ /** * Timeout for stopping ARM. Extra-long since ARM needs to stop everyone else. */ -#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) +#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) /** * Timeout for starting services, very short because of the strange way start works diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index f11c6e5f4..cb0216dc6 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -870,6 +870,7 @@ handle_p2p_size_estimate(void *cls, if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel (peer_entry->transmit_task); + peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK; peer_entry->previous_round = GNUNET_NO; } if (peer_entry->th != NULL) @@ -1019,7 +1020,7 @@ shutdown_task(void *cls, * @param identity the public identity of this peer * @param publicKey the public key of this peer */ -void +static void core_init (void *cls, struct GNUNET_CORE_Handle *server, const struct GNUNET_PeerIdentity *identity, const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) @@ -1046,7 +1047,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, for (i=0;idaemon->id), estimate, std_dev); + + fprintf (stderr, + "Received network size estimate from peer %s. logSize: %f std.dev. %f (%f/%u)\n", + GNUNET_i2s(&peer->daemon->id), + estimate, + std_dev, + GNUNET_NSE_log_estimate_to_n (estimate), + num_peers); } + static void connect_nse_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) @@ -135,13 +145,15 @@ connect_nse_service (void *cls, { current_peer = GNUNET_malloc(sizeof(struct NSEPeer)); current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i); - current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg, &handle_estimate, current_peer); + current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg, + &handle_estimate, + current_peer); GNUNET_assert(current_peer->nse_handle != NULL); - GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer); } } + static void my_cb (void *cls, const char *emsg) @@ -159,13 +171,15 @@ my_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer Group started successfully, connecting to NSE service for each peer!\n"); #endif - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n", total_connections); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Have %u connections\n", total_connections); GNUNET_SCHEDULER_add_now(&connect_nse_service, NULL); } + /** - * Prototype of a function that will be called whenever + * Function that will be called whenever * two daemons are connected by the testing library. * * @param cls closure @@ -178,15 +192,16 @@ my_cb (void *cls, * @param second_daemon handle for the second daemon * @param emsg error message (NULL on success) */ -void connect_cb (void *cls, - const struct GNUNET_PeerIdentity *first, - const struct GNUNET_PeerIdentity *second, - uint32_t distance, - const struct GNUNET_CONFIGURATION_Handle *first_cfg, - const struct GNUNET_CONFIGURATION_Handle *second_cfg, - struct GNUNET_TESTING_Daemon *first_daemon, - struct GNUNET_TESTING_Daemon *second_daemon, - const char *emsg) +static void +connect_cb (void *cls, + const struct GNUNET_PeerIdentity *first, + const struct GNUNET_PeerIdentity *second, + uint32_t distance, + const struct GNUNET_CONFIGURATION_Handle *first_cfg, + const struct GNUNET_CONFIGURATION_Handle *second_cfg, + struct GNUNET_TESTING_Daemon *first_daemon, + struct GNUNET_TESTING_Daemon *second_daemon, + const char *emsg) { char *second_id; @@ -207,16 +222,22 @@ run (void *cls, { struct GNUNET_CONFIGURATION_Handle *testing_cfg; unsigned long long total_peers; + ok = 1; testing_cfg = GNUNET_CONFIGURATION_create(); GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_load(testing_cfg, cfgfile)); + #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); - GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing", - "use_progressbars", - "YES"); + GNUNET_CONFIGURATION_set_value_string (testing_cfg, + "testing", + "use_progressbars", + "YES"); #endif - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", "num_peers", &total_peers)) + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg, + "testing", + "num_peers", + &total_peers)) total_peers = NUM_PEERS; peers_left = total_peers; @@ -231,6 +252,7 @@ run (void *cls, GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL); } + static int check () { -- 2.25.1