-do not run test without sqlite

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

diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 32ed0ac6c55568639bef02518ef7a9034b2eeab1..67104e8ad9bf238a88c07fb6af7eeb0aecc2ad6d 100644 (file)
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -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.
  */
 
 /**
@@ -441,35 +441,24 @@ struct StateModifyRequest
   struct GNUNET_MessageHeader header;
 
   /**
-   * Size of name, including NUL terminator.
-   */
-  uint16_t name_size GNUNET_PACKED;
-
-  /**
-   * OR'd StateOpFlags
+   * Operation ID.
    */
-  uint8_t flags;
+  uint64_t op_id GNUNET_PACKED;
 
   /**
-   * enum GNUNET_ENV_Operator
+   * ID of the message to apply the state changes in.
    */
-  uint8_t oper;
+  uint64_t message_id GNUNET_PACKED;
 
   /**
-   * Operation ID.
+   * State delta of the message with ID @a message_id.
    */
-  uint64_t op_id GNUNET_PACKED;
+  uint64_t state_delta GNUNET_PACKED;
 
   /**
    * Channel's public key.
    */
   struct GNUNET_CRYPTO_EddsaPublicKey channel_key;
-
-  uint64_t message_id GNUNET_PACKED;
-
-  uint64_t state_delta GNUNET_PACKED;
-
-  /* Followed by NUL-terminated name, then the value. */
 };
 
 
@@ -495,13 +484,21 @@ struct StateSyncRequest
 
   uint8_t reserved;
 
-  uint64_t message_id GNUNET_PACKED;
-
   /**
    * Operation ID.
    */
   uint64_t op_id GNUNET_PACKED;
 
+  /**
+   * ID of the message that contains the state_hash PSYC header variable.
+   */
+  uint64_t state_hash_message_id GNUNET_PACKED;
+
+  /**
+   * ID of the last stateful message before @a state_hash_message_id.
+   */
+  uint64_t max_state_message_id GNUNET_PACKED;
+
   /**
    * Channel's public key.
    */