Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / consensus / consensus_protocol.h

diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h
index 161c939cdd3e4bf8eccdb6578d9cf1d659ed19fb..e0002de5606b36bd2c2ff4ba45784f3ab6f3dd24 100644 (file)
--- a/src/consensus/consensus_protocol.h
+++ b/src/consensus/consensus_protocol.h
@@ -89,6 +89,12 @@ struct GNUNET_CONSENSUS_RoundContextMessage
 };
 
 
+enum {
+  CONSENSUS_MARKER_CONTESTED = 1,
+  CONSENSUS_MARKER_SIZE = 2,
+};
+
+
 /**
  * Consensus element, either marker or payload.
  */
@@ -103,12 +109,27 @@ struct ConsensusElement
   /**
    * Is this a marker element?
    */
-  uint8_t is_contested_marker;
+  uint8_t marker;
 
   /* rest: element data */
 };
 
 
+struct ConsensusSizeElement
+{
+  struct ConsensusElement ce GNUNET_PACKED;
+
+  uint64_t size GNUNET_PACKED;
+  uint8_t sender_index;
+};
+
+struct ConsensusStuffedElement
+{
+  struct ConsensusElement ce GNUNET_PACKED;
+  struct GNUNET_HashCode rand GNUNET_PACKED;
+};
+
+
 GNUNET_NETWORK_STRUCT_END
 
 #endif