messages for inter-controller overlay connect

[oweals/gnunet.git] / src / include / block_gns.h

diff --git a/src/include/block_gns.h b/src/include/block_gns.h
index 4514acf6b6e07e6544bd76e95bb304578c914df2..7b4ceed1827cc217f5f92372a4b20ba070c545e9 100644 (file)
--- a/src/include/block_gns.h
+++ b/src/include/block_gns.h
@@ -30,34 +30,6 @@
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
-/**
- * @brief a simgle record inside a record block
- */
-struct GNSRecordBlock
-{
-  /**
-   * the record type
-   */
-  uint32_t type GNUNET_PACKED;
-
-  /**
-   * expiration time of the record
-   */
-  struct GNUNET_TIME_AbsoluteNBO expiration;
-
-  /**
-   * length of the data
-   */
-  uint32_t data_length GNUNET_PACKED;
-  
-  /* record flags */
-  uint32_t flags GNUNET_PACKED;
-
-  //Class of the record?
-
-  /* followed by the record data */
-};
-
 /**
  * @brief a record block for a given name of a single authority
  */
@@ -65,27 +37,21 @@ struct GNSNameRecordBlock
 {
 
   /**
-   * GNUNET_RSA_Signature using RSA-key generated from the records.
-   */
-  struct GNUNET_CRYPTO_RsaSignature signature;
-
-  /**
-   * What is being signed and why?
+   * The public key of the authority
    */
-  struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
 
   /**
-   * The public key of the authority
+   * GNUNET_RSA_Signature using RSA-key generated from the records.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_RsaSignature signature;
 
   /* number of records that follow */
   uint32_t rd_count GNUNET_PACKED;
 
   /* 0-terminated name here */
 
-  /* variable-size GNSRecordBlocks follows here */
-
+  /* variable-size serialized namestore record data */
 
 };