[GNUnet-SVN] r26529 - gnunet/src/consensus

[gnunet]

Author: dold
Date: 2013-03-21 02:53:58 +0100 (Thu, 21 Mar 2013)
New Revision: 26529

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
Log:
fix


Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2013-03-21 01:39:16 UTC 
(rev 26528)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2013-03-21 01:53:58 UTC 
(rev 26529)
@@ -851,13 +851,13 @@
   {
     case CONSENSUS_ROUND_EXCHANGE:
     case CONSENSUS_ROUND_STOCK:
-      /* the subround is only really over if *both* partners are done */
       if (cpi->session->current_round != cpi->apparent_round)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "P%d: FIN to SYNC from the 
past\n", cpi->session->local_peer_idx);
         break;
       }
       cpi->exp_subround_finished = GNUNET_YES;
+      /* the subround is only really over if *both* partners are done */
       if (GNUNET_YES == exp_subround_finished (cpi->session))
         subround_over (cpi->session, NULL);
       else
@@ -1087,6 +1087,8 @@
 
   /* FIXME: find out if we're still expecting the same ibf! */
 
+  cpi->apparent_round = cpi->session->current_round;
+
   num_buckets = (ntohs (digest->header.size) - (sizeof *digest)) / 
IBF_BUCKET_SIZE;
   switch (cpi->ibf_state)
   {
@@ -1352,6 +1354,7 @@
     digest->header.size = htons (msize);
     digest->header.type = htons 
(GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_DIFFERENCE_DIGEST);
     digest->order = cpi->ibf_order;
+    digest->round = cpi->apparent_round;
 
     buf = &digest[1];
     ibf_write_slice (cpi->ibf, cpi->ibf_bucket_counter, num_buckets, &buf, 
NULL);