commented out wrong message type

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

diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 807c3c3dac6414c5629d2b896580f1e6cb70e354..402d7d5eaa06c11606a5a1aec5e8b6b95fe84b05 100644 (file)
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of GNUnet
- * Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+ * Copyright (C) 2013 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
@@ -49,7 +49,7 @@ struct OperationResult
    */
   uint64_t op_id GNUNET_PACKED;
 
-  /**
+  /**lowed by
    * Status code for the operation.
    */
   uint64_t result_code GNUNET_PACKED;
@@ -344,11 +344,18 @@ struct MessageGetRequest
    */
   uint64_t message_limit GNUNET_PACKED;
 
+  /**
+   * Maximum number of fragments to retrieve.
+   */
+  uint64_t fragment_limit GNUNET_PACKED;
+
   /**
    * Do membership test with @a slave_key before returning fragment?
    * #GNUNET_YES or #GNUNET_NO
    */
   uint8_t do_membership_test;
+
+  /* Followed by method_prefix */
 };
 
 
@@ -441,35 +448,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 +491,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.
    */