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 e8b2c8a3433e172041f0e81d6971ba4fae4e572b..e0002de5606b36bd2c2ff4ba45784f3ab6f3dd24 100644 (file)
--- a/src/consensus/consensus_protocol.h
+++ b/src/consensus/consensus_protocol.h
@@ -1,10 +1,10 @@
 /*
       This file is part of GNUnet
-      (C) 2012 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2012 GNUnet e.V.
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2, or (at your
+      by the Free Software Foundation; either version 3, or (at your
       option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
@@ -14,8 +14,8 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
 */
 
 
@@ -29,53 +29,104 @@
 #define GNUNET_CONSENSUS_PROTOCOL_H
 
 #include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 #include "gnunet_protocols.h"
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
-struct StrataMessage
+/**
+ * Sent as context message for set reconciliation.
+ *
+ * Essentially contains all the fields
+ * from 'struct TaskKey', but in NBO.
+ */
+struct GNUNET_CONSENSUS_RoundContextMessage
 {
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT
+   */
   struct GNUNET_MessageHeader header;
+
+  /**
+   * A value from 'enum PhaseKind'.
+   */
+  uint16_t kind;
+
+  /**
+   * Number of the first peer
+   * in canonical order.
+   */
+  int16_t peer1;
+
+  /**
+   * Number of the second peer in canonical order.
+   */
+  int16_t peer2;
+
+  /**
+   * Repetition of the gradecast phase.
+   */
+  int16_t repetition;
+
   /**
-   * Number of elements the sender currently has.
+   * Leader in the gradecast phase.
+   *
+   * Can be different from both peer1 and peer2.
    */
-  uint16_t num_elements;
+  int16_t leader;
+
   /**
-   * Number of strata in this estimator.
+   * Non-zero if this set reconciliation
+   * had elements removed because they were contested.
+   *
+   * Will be considered when grading broadcasts.
+   *
+   * Ignored for set operations that are not within gradecasts.
    */
-  uint16_t num_strata;
-  /* 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] */
+  uint16_t is_contested;
 };
 
-struct DifferenceDigest
-{
-  struct GNUNET_MessageHeader header;
-  uint8_t order;
-  uint8_t round;
+
+enum {
+  CONSENSUS_MARKER_CONTESTED = 1,
+  CONSENSUS_MARKER_SIZE = 2,
 };
 
-struct Element
+
+/**
+ * Consensus element, either marker or payload.
+ */
+struct ConsensusElement
 {
-  struct GNUNET_MessageHeader header;
-  struct GNUNET_HashCode hash;
+  /**
+   * Payload element_type, only valid
+   * if this is not a marker element.
+   */
+  uint16_t payload_type;
+
+  /**
+   * Is this a marker element?
+   */
+  uint8_t marker;
+
+  /* rest: element data */
 };
 
 
-struct ElementRequest
+struct ConsensusSizeElement
 {
-  struct GNUNET_MessageHeader header;
-  /* struct GNUNET_HashCode[] rest */
+  struct ConsensusElement ce GNUNET_PACKED;
+
+  uint64_t size GNUNET_PACKED;
+  uint8_t sender_index;
 };
 
-struct ConsensusHello
+struct ConsensusStuffedElement
 {
-  struct GNUNET_MessageHeader header;
-  struct GNUNET_HashCode global_id;
-  uint8_t round;
+  struct ConsensusElement ce GNUNET_PACKED;
+  struct GNUNET_HashCode rand GNUNET_PACKED;
 };