fixed consensus for two peers, added log-rounds, started implementing freeze, multiple peers still buggy

1 files changed, 14 insertions, 8 deletions

diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h
index e8b2c8a34..c0420d55c 100644
--- a/src/consensus/consensus_protocol.h
+++ b/src/consensus/consensus_protocol.h
@@ -38,14 +38,9 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct StrataMessage
 {
   struct GNUNET_MessageHeader header;
-  /**
-   * Number of elements the sender currently has.
-   */
-  uint16_t num_elements;
-  /**
-   * Number of strata in this estimator.
-   */
-  uint16_t num_strata;
+  uint8_t round;
+  uint8_t exp_round;
+  uint8_t exp_subround;
   /* struct GNUNET_HashCode hash_buckets[ibf_size*num_strata] */
   /* struct GNUNET_HashCode id_buckets[ibf_size*num_strata] */
   /* uint8_t count_buckets[ibf_size*num_strata] */
@@ -56,8 +51,12 @@ struct DifferenceDigest
   struct GNUNET_MessageHeader header;
   uint8_t order;
   uint8_t round;
+  uint8_t exp_round;
+  uint8_t exp_subround;
+  /* rest: IBF */
 };
 
+
 struct Element
 {
   struct GNUNET_MessageHeader header;
@@ -75,7 +74,14 @@ struct ConsensusHello
 {
   struct GNUNET_MessageHeader header;
   struct GNUNET_HashCode global_id;
+};
+
+struct ConsensusRoundHeader
+{
+  struct GNUNET_MessageHeader header;
   uint8_t round;
+  uint8_t exp_round;
+  uint8_t exp_subround;
 };