-fix NetworkRecord/GNSRecordBlock madness

diff --git a/src/include/block_gns.h b/src/include/block_gns.h
index ffdb294ae15900526a0da728c6a3ac90c5a97be1..61ffdd6b796673de5fbca7b76247243f61a7272d 100644 (file)
--- a/src/include/block_gns.h
+++ b/src/include/block_gns.h
@@ -35,26 +35,27 @@ GNUNET_NETWORK_STRUCT_BEGIN
  */
 struct GNSRecordBlock
 {
-  /**
-   * the record type
-   */
-  uint32_t type GNUNET_PACKED;
 
   /**
-   * expiration time of the record
+   * Expiration time for the DNS record; relative or absolute depends
+   * on 'flags', network byte order.
    */
-  struct GNUNET_TIME_AbsoluteNBO expiration;
+  uint64_t expiration_time GNUNET_PACKED;
 
   /**
    * length of the data
    */
-  uint32_t data_length GNUNET_PACKED;
+  uint32_t data_size GNUNET_PACKED;
+  
+  /**
+   * the record type
+   */
+  uint32_t record_type GNUNET_PACKED;
+
   
   /* record flags */
   uint32_t flags GNUNET_PACKED;
 
-  //Class of the record?
-
   /* followed by the record data */
 };