aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-07-25 11:58:33 +0000
committerNathan S. Evans <evans@in.tum.de>2011-07-25 11:58:33 +0000
commite71d9566d93393706db1d14945d3e559e3355454 (patch)
tree47d38a99fe35d45adc10f6f808496653b54fb85e
parentba0a9db2f66f92d903dacef52ee469faa68f17c5 (diff)
downloadgnunet-e71d9566d93393706db1d14945d3e559e3355454.tar.gz
gnunet-e71d9566d93393706db1d14945d3e559e3355454.zip
stuff
-rw-r--r--src/nse/gnunet-service-nse.c2
-rw-r--r--src/nse/nse-profiler.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 4c0dae0e1..10ecac026 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -984,7 +984,7 @@ handle_p2p_size_estimate(void *cls,
984 else if (ts.abs_value == next_timestamp.abs_value - gnunet_nse_interval.rel_value) 984 else if (ts.abs_value == next_timestamp.abs_value - gnunet_nse_interval.rel_value)
985 { 985 {
986 if (matching_bits <= ntohl (next_message.matching_bits)) 986 if (matching_bits <= ntohl (next_message.matching_bits))
987 return GNUNET_OK; /* ignore, simply too early */ 987 return GNUNET_OK; /* ignore, simply too early/late */
988 if (GNUNET_YES != 988 if (GNUNET_YES !=
989 verify_message_crypto (incoming_flood)) 989 verify_message_crypto (incoming_flood))
990 { 990 {
diff --git a/src/nse/nse-profiler.c b/src/nse/nse-profiler.c
index 5eeb13896..9760ba487 100644
--- a/src/nse/nse-profiler.c
+++ b/src/nse/nse-profiler.c
@@ -246,6 +246,7 @@ connect_nse_service (void *cls,
246 { 246 {
247 if ((connection_limit > 0) && (i % (num_peers / connection_limit) != 0)) 247 if ((connection_limit > 0) && (i % (num_peers / connection_limit) != 0))
248 continue; 248 continue;
249 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "TEST_NSE_MULTIPEER: connecting to nse service of peer %d\n", i);
249 current_peer = GNUNET_malloc(sizeof(struct NSEPeer)); 250 current_peer = GNUNET_malloc(sizeof(struct NSEPeer));
250 current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i); 251 current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i);
251 if (GNUNET_YES == GNUNET_TESTING_daemon_running(GNUNET_TESTING_daemon_get(pg, i))) 252 if (GNUNET_YES == GNUNET_TESTING_daemon_running(GNUNET_TESTING_daemon_get(pg, i)))
@@ -438,7 +439,7 @@ churn_callback (void *cls, const char *emsg)
438 current_round); 439 current_round);
439 GNUNET_assert(disconnect_task == GNUNET_SCHEDULER_NO_TASK); 440 GNUNET_assert(disconnect_task == GNUNET_SCHEDULER_NO_TASK);
440 GNUNET_asprintf(&temp_output_file, 441 GNUNET_asprintf(&temp_output_file,
441 "%s%lu.dot", 442 "%s_%lu.dot",
442 topology_file, 443 topology_file,
443 current_round); 444 current_round);
444 GNUNET_TESTING_peergroup_topology_to_file(pg, 445 GNUNET_TESTING_peergroup_topology_to_file(pg,