From 0cecd69f46bc4c1a2aec61e9b146bc26253a140d Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Sat, 16 Jul 2011 11:55:21 +0000 Subject: [PATCH] changes --- src/nse/gnunet-service-nse.c | 5 +++++ src/nse/test_nse.conf | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 90fc680d3..664b8062d 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -366,8 +366,13 @@ update_network_size_estimate(struct GNUNET_NSE_FloodMessage *message) = htons (sizeof(struct GNUNET_NSE_ClientMessage)); current_estimate_message.header.type = htons (GNUNET_MESSAGE_TYPE_NSE_ESTIMATE); +#if AVERAGE_SQUARE current_estimate_message.size_estimate = average; current_estimate_message.std_deviation = std_dev; +#else + current_estimate_message.size_estimate = pow(2, average); + current_estimate_message.std_deviation = pow(2, std_dev); +#endif /* Finally, broadcast the current estimate to all clients */ #if DEBUG_NSE GNUNET_log (GNUNET_ERROR_TYPE_WARNING, diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf index 32f7a3262..cbb2382a7 100644 --- a/src/nse/test_nse.conf +++ b/src/nse/test_nse.conf @@ -5,8 +5,9 @@ DEFAULTCONFIG = test_nse.conf [nse] PORT = 22353 UNIXPATH = /tmp/test-nse-service-nse.unix -BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse -PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p +BINARY = gnunet-service-nse +#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse +#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p AUTOSTART = YES DEBUG = YES @@ -38,7 +39,7 @@ AUTOSTART = YES AUTOSTART = NO [testing] -NUM_PEERS = 40 +NUM_PEERS = 20 WEAKRANDOM = YES TOPOLOGY = CLIQUE F2F = NO -- 2.25.1