-fix leaks

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

diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index ca712e136b89e8f0eab6b87cd4a3fc8e64a1b02b..b95358fa445e3960ab6c604387054d48b1cfb0f2 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;
 };
 
 
@@ -58,14 +58,14 @@ struct GNUNET_NAMESTORE_Header
 struct LookupBlockMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
    * The query.
    */
-  struct GNUNET_HashCode query;
+  struct GNUNET_HashCode query GNUNET_PACKED;
 
 };
 
@@ -76,7 +76,7 @@ struct LookupBlockMessage
 struct LookupBlockResponseMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
@@ -88,14 +88,14 @@ struct LookupBlockResponseMessage
   /**
    * Signature.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicKey derived_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
 
-  /* follwed by encrypted block data */
+  /* followed by encrypted block data */
 };
 
 
@@ -105,7 +105,7 @@ struct LookupBlockResponseMessage
 struct BlockCacheMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
@@ -117,12 +117,12 @@ struct BlockCacheMessage
   /**
    * Signature.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Derived public key.
    */
-  struct GNUNET_CRYPTO_EccPublicKey derived_key;
+  struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
 
   /* follwed by encrypted block data */
 };
@@ -134,14 +134,14 @@ struct BlockCacheMessage
 struct BlockCacheResponseMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   *  name length: GNUNET_NO already exists, GNUNET_YES on success, GNUNET_SYSERR error
+   * #GNUNET_OK on success, #GNUNET_SYSERR error
    */
-  int32_t op_result;
+  int32_t op_result GNUNET_PACKED;
 };
 
 
@@ -151,7 +151,7 @@ struct BlockCacheResponseMessage
 struct RecordStoreMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_RECORD_STORE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
@@ -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
@@ -198,19 +198,44 @@ struct RecordStoreMessage
 struct RecordStoreResponseMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * result:
-   * GNUNET_SYSERR on failure
-   * GNUNET_OK on success
+   * #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_LABEL_LOOKUP
+   */
+  struct GNUNET_NAMESTORE_Header gns_header;
+
+  /**
+   * The private key of the zone to look up in
+   */
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
+
+  /**
+   * Length of the name
+   */
+  uint16_t label_len GNUNET_PACKED;
+
+  /* followed by:
+   * name with length name_len
+   */
+};
+
+
+
 
 /**
  * Lookup a name for a zone hash
@@ -218,19 +243,19 @@ struct RecordStoreResponseMessage
 struct ZoneToNameMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME
    */
   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_EccPublicKey value_zone;
+  struct GNUNET_CRYPTO_EcdsaPublicKey value_zone;
 };
 
 
@@ -240,35 +265,35 @@ struct ZoneToNameMessage
 struct ZoneToNameResponseMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
    * 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 
+   * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no
+   * 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
@@ -284,34 +309,34 @@ struct ZoneToNameResponseMessage
 struct RecordResultMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
    * 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,14 +351,14 @@ struct RecordResultMessage
 struct ZoneMonitorStartMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
    * Zone key.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
 };
 
@@ -344,14 +369,14 @@ struct ZoneMonitorStartMessage
 struct ZoneIterationStartMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * Zone key.
+   * Zone key.  All zeros for "all zones".
    */
-  struct GNUNET_CRYPTO_EccPrivateKey zone;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
 
 };
 
@@ -362,7 +387,7 @@ struct ZoneIterationStartMessage
 struct ZoneIterationNextMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 };
@@ -374,7 +399,7 @@ struct ZoneIterationNextMessage
 struct ZoneIterationStopMessage
 {
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP
    */
   struct GNUNET_NAMESTORE_Header gns_header;
 };