added lookup test + fix in test

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

diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index 6d22b5d994de6b25a7fa309428f5806f3f027bfa..d633f7393ed1c19286d04b7a82bd10aaff359ea5 100644 (file)
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -48,7 +48,7 @@ struct GNUNET_NAMESTORE_Header
   /**
    * Request ID in NBO
    */
-  uint32_t r_id;
+  uint32_t r_id GNUNET_PACKED;
 };
 
 
@@ -65,7 +65,7 @@ struct LookupBlockMessage
   /**
    * The query.
    */
-  struct GNUNET_HashCode query;
+  struct GNUNET_HashCode query GNUNET_PACKED;
 
 };
 
@@ -88,14 +88,14 @@ struct LookupBlockResponseMessage
   /**
    * Signature.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey derived_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
 
-  /* follwed by encrypted block data */
+  /* followed by encrypted block data */
 };
 
 
@@ -117,12 +117,12 @@ struct BlockCacheMessage
   /**
    * Signature.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey derived_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
 
   /* follwed by encrypted block data */
 };
@@ -141,7 +141,7 @@ struct BlockCacheResponseMessage
   /**
    * #GNUNET_OK on success, #GNUNET_SYSERR error
    */
-  int32_t op_result;
+  int32_t op_result GNUNET_PACKED;
 };
 
 
@@ -163,27 +163,27 @@ struct RecordStoreMessage
   /**
    * Name length
    */
-  uint16_t name_len;
+  uint16_t name_len GNUNET_PACKED;
 
   /**
    * Length of serialized record data
    */
-  uint16_t rd_len;
+  uint16_t rd_len GNUNET_PACKED;
 
   /**
-   * Number of records contained 
+   * Number of records contained
    */
-  uint16_t rd_count;
+  uint16_t rd_count GNUNET_PACKED;
 
   /**
    * always zero (for alignment)
    */
-  uint16_t reserved;
+  uint16_t reserved GNUNET_PACKED;
 
   /**
    * The private key of the authority.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey private_key;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey private_key;
 
   /* followed by:
    * name with length name_len
@@ -205,10 +205,37 @@ struct RecordStoreResponseMessage
   /**
    * #GNUNET_SYSERR on failure, #GNUNET_OK on success
    */
-  int32_t op_result;
+  int32_t op_result GNUNET_PACKED;
 };
 
 
+/**
+ * Lookup a label
+ */
+struct LabelLookupMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP
+   */
+  struct GNUNET_NAMESTORE_Header gns_header;
+
+  /**
+   * Length of the name
+   */
+  uint32_t label_len GNUNET_PACKED;
+
+  /**
+   * The private key of the zone to look up in
+   */
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
+
+  /* followed by:
+   * name with length name_len
+   */
+};
+
+
+
 
 /**
  * Lookup a name for a zone hash
@@ -221,14 +248,14 @@ struct ZoneToNameMessage
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * The private key of the zone to look up in 
+   * The private key of the zone to look up in
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
   /**
-   * The public key of the target zone  
+   * The public key of the target zone
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey value_zone;
+  struct GNUNET_CRYPTO_EcdsaPublicKey value_zone;
 };
 
 
@@ -245,28 +272,28 @@ struct ZoneToNameResponseMessage
   /**
    * Length of the name
    */
-  uint16_t name_len;
+  uint16_t name_len GNUNET_PACKED;
 
   /**
    * Length of serialized record data
    */
-  uint16_t rd_len;
+  uint16_t rd_len GNUNET_PACKED;
 
   /**
    * Number of records contained
    */
-  uint16_t rd_count;
+  uint16_t rd_count GNUNET_PACKED;
 
   /**
    * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no
-   * results, #GNUNET_SYSERR on error 
+   * results, #GNUNET_SYSERR on error
    */
-  int16_t res;
+  int16_t res GNUNET_PACKED;
 
   /**
    * The private key of the zone that contained the name.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
   /* followed by:
    * name with length name_len
@@ -289,27 +316,27 @@ struct RecordResultMessage
   /**
    * Name length
    */
-  uint16_t name_len;
+  uint16_t name_len GNUNET_PACKED;
 
   /**
    * Length of serialized record data
    */
-  uint16_t rd_len;
+  uint16_t rd_len GNUNET_PACKED;
 
   /**
-   * Number of records contained 
+   * Number of records contained
    */
-  uint16_t rd_count;
+  uint16_t rd_count GNUNET_PACKED;
 
   /**
    * always zero (for alignment)
    */
-  uint16_t reserved;
+  uint16_t reserved GNUNET_PACKED;
 
   /**
    * The private key of the authority.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey private_key;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey private_key;
 
   /* followed by:
    * name with length name_len
@@ -326,12 +353,18 @@ struct ZoneMonitorStartMessage
   /**
    * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START
    */
-  struct GNUNET_NAMESTORE_Header gns_header;
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * #GNUNET_YES to first iterate over all records,
+   * #GNUNET_NO to only monitor changes.o
+   */
+  uint32_t iterate_first GNUNET_PACKED;
 
   /**
    * Zone key.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
 };
 
@@ -349,7 +382,7 @@ struct ZoneIterationStartMessage
   /**
    * Zone key.  All zeros for "all zones".
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
 };