diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-08-13 01:12:55 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-08-13 01:12:55 +0000 |
commit | 5379138eb2686137d4d50bc32d2508ad56ede264 (patch) | |
tree | 2b3f9dac690bda09846ae1c1739ea37ada5dbe06 | |
parent | 84701f040c57bee43892fa0d079344c1a9e48dc3 (diff) | |
download | gnunet-5379138eb2686137d4d50bc32d2508ad56ede264.tar.gz gnunet-5379138eb2686137d4d50bc32d2508ad56ede264.zip |
- delayed requests correctly when in 'begin' round
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index a14eddebe..e9d7f05ea 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -494,8 +494,6 @@ find_partners (struct ConsensusSession *session) | |||
494 | largest_arc <<= 1; | 494 | largest_arc <<= 1; |
495 | num_ghosts = largest_arc - session->num_peers; | 495 | num_ghosts = largest_arc - session->num_peers; |
496 | 496 | ||
497 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "num ghosts: %d\n", num_ghosts); | ||
498 | |||
499 | if (0 == (my_idx & arc)) | 497 | if (0 == (my_idx & arc)) |
500 | { | 498 | { |
501 | /* we are outgoing */ | 499 | /* we are outgoing */ |
@@ -934,6 +932,9 @@ set_listen_cb (void *cls, | |||
934 | 932 | ||
935 | switch (session->current_round) | 933 | switch (session->current_round) |
936 | { | 934 | { |
935 | case CONSENSUS_ROUND_BEGIN: | ||
936 | /* we're in the begin round, so requests for the exchange round may | ||
937 | * come in, they will be delayed for now! */ | ||
937 | case CONSENSUS_ROUND_EXCHANGE: | 938 | case CONSENSUS_ROUND_EXCHANGE: |
938 | cmp = rounds_compare (session, &round_info); | 939 | cmp = rounds_compare (session, &round_info); |
939 | if (cmp > 0) | 940 | if (cmp > 0) |