summaryrefslogtreecommitdiff
path: root/src/rps/test_rps.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2015-07-31 11:20:05 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2015-07-31 11:20:05 +0000
commit2b70084dc824be72ecc4cc95e52490b5d0ec4d91 (patch)
treec1bd6452ca6278ad21b3a6dbd1cd6ba125f30a12 /src/rps/test_rps.c
parent0ae9cfdf1957653a915d41bffea9d1f4f8b3de2b (diff)
downloadgnunet-2b70084dc824be72ecc4cc95e52490b5d0ec4d91.tar.gz
gnunet-2b70084dc824be72ecc4cc95e52490b5d0ec4d91.zip
stop asking for random peers if we are shutting down
Diffstat (limited to 'src/rps/test_rps.c')
-rw-r--r--src/rps/test_rps.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 108c1bd34..01777bd90 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -46,7 +46,6 @@ uint32_t num_peers;
46//#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) 46//#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
47static struct GNUNET_TIME_Relative timeout; 47static struct GNUNET_TIME_Relative timeout;
48 48
49
50/** 49/**
51 * Portion of malicious peers 50 * Portion of malicious peers
52 */ 51 */
@@ -260,6 +259,10 @@ struct SingleTestRun
260 uint32_t num_requests; 259 uint32_t num_requests;
261} cur_test_run; 260} cur_test_run;
262 261
262/**
263 * Are we shutting down?
264 */
265static int in_shutdown;
263 266
264/** 267/**
265 * Append arguments to file 268 * Append arguments to file
@@ -476,6 +479,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
476{ 479{
477 unsigned int i; 480 unsigned int i;
478 481
482 in_shutdown = GNUNET_YES;
479 if (NULL != churn_task) 483 if (NULL != churn_task)
480 GNUNET_SCHEDULER_cancel (churn_task); 484 GNUNET_SCHEDULER_cancel (churn_task);
481 485
@@ -625,7 +629,7 @@ rps_connect_adapter (void *cls,
625 */ 629 */
626static void 630static void
627rps_disconnect_adapter (void *cls, 631rps_disconnect_adapter (void *cls,
628 void *op_result) 632 void *op_result)
629{ 633{
630 struct GNUNET_RPS_Handle *h = op_result; 634 struct GNUNET_RPS_Handle *h = op_result;
631 GNUNET_RPS_disconnect (h); 635 GNUNET_RPS_disconnect (h);
@@ -689,6 +693,8 @@ request_peers (void *cls,
689{ 693{
690 struct RPSPeer *rps_peer = (struct RPSPeer *) cls; 694 struct RPSPeer *rps_peer = (struct RPSPeer *) cls;
691 695
696 if (GNUNET_YES == in_shutdown)
697 return;
692 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 698 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
693 "Requesting one peer\n"); 699 "Requesting one peer\n");
694 700