renaming and modifications to the shorten test

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

diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index ebbadb926d1e8a4a5d897a5f5049e98491f5293c..f1049e1cd20c7c4c11da081bf8a5978ce0a48a34 100644 (file)
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      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
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -30,6 +30,10 @@
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
 

+/**
+ * Sent by the client to the service,
+ * when the client wants the service to join a consensus session.
+ */

 struct GNUNET_CONSENSUS_JoinMessage
 {
   /**
 struct GNUNET_CONSENSUS_JoinMessage
 {
   /**


@@ -52,6 +56,8 @@ struct GNUNET_CONSENSUS_ConcludeMessage
    */
   struct GNUNET_MessageHeader header;
 
    */
   struct GNUNET_MessageHeader header;
 

+  // uint32_t reserved GNUNET_PACKED; // FIXME...
+

   /**
    * Timeout for conclude
    */
   /**
    * Timeout for conclude
    */


@@ -75,7 +81,7 @@ struct GNUNET_CONSENSUS_ElementMessage
   /**
    * Type: GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_NEW_ELEMENT
    */
   /**
    * Type: GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_NEW_ELEMENT
    */

-  uint16_t element_type GNUNET_PACKED; /* FIXME: alignment? */
+  uint16_t element_type GNUNET_PACKED; /* FIXME: alignment? => uint32_t */

 
   /* rest: element data */
 };
 
   /* rest: element data */
 };


@@ -90,7 +96,7 @@ struct GNUNET_CONSENSUS_AckMessage
   /**
    * Do we want to keep and propagate the element?
    */
   /**
    * Do we want to keep and propagate the element?
    */

-  uint8_t keep; /* FIXME: alignment!? */
+  uint8_t keep; /* FIXME: alignment!? => (u)int32_t */

 
   /* FIXME: add message hash? */
 };
 
   /* FIXME: add message hash? */
 };