modified the DNS_Record-block

1 files changed, 26 insertions, 14 deletions

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index d8f3fa50e..6be82b126 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -2,26 +2,38 @@
 #define _GNVPN_BLOCKDNS_H_
 
 #include "gnunet_common.h"
+#include "gnunet_crypto_lib.h"
 
 /**
- * Bitmask describing what ip-services are supported by services
- * It is 2 bytes long
+ * Bitmask describing what IP-protocols are supported by the service
  */
-struct GNUNET_ipservices {
-  unsigned UDP:1 GNUNET_PACKED;
-  unsigned TCP:1 GNUNET_PACKED;
-  unsigned RESERVED:14 GNUNET_PACKED;
+enum GNUNET_DNS_ServiceTypes
+{
+  GNUNET_DNS_SERVICE_TYPE_UDP = 1,
+  GNUNET_DNS_SERVICE_TYPE_TCP = 2
 };
 
+
 /**
  * This is the structure describing an dns-record such as www.gnunet.
  */
 struct GNUNET_DNS_Record
 {
   /**
+   * Signature of the peer affirming that he is offering the service.
+   */
+  struct GNUNET_CRYPTO_RsaSignature signature;
+
+  /**
+   * Beginning of signed portion of the record, signs everything until
+   * the end of the struct.
+   */
+  struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+
+  /**
    * The peer providing this service
    */
-  struct GNUNET_PeerIdentity peer;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer;
 
   /**
    * The descriptor for the service
@@ -30,20 +42,20 @@ struct GNUNET_DNS_Record
   GNUNET_HashCode service_descriptor;
 
   /**
-   * What connection-types (UDP, TCP, ...) are supported by the service
+   * When does this record expire?
    */
-  struct GNUNET_ipservices connectiontypes;
+  struct GNUNET_TIME_Absolute expiration_time;
 
   /**
-   * The length of the name of the service
+   * Four TCP and UDP-Ports that are used by this service, big endian format
    */
-  unsigned char namelen;
+  uint64_t ports;
 
   /**
-   * The name of the service
-   * This is namelen bytes
+   * What connection-types (UDP, TCP, ...) are supported by the service.
+   * Contains an 'enum GNUNET_DNS_ServiceTypes' in big endian format.
    */
-  char name[1];
+  uint32_t service_type;
 };
 
 #endif