missing changes to headers

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

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index d8f3fa50ec18b5d907c944fcdc0c1a7a6c22f3ae..459f4b2c0858c7dcfd66ceeaf6e40a241556beb3 100644 (file)
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -1,49 +1,61 @@
-#ifndef _GNVPN_BLOCKDNS_H_
-#define _GNVPN_BLOCKDNS_H_
-
-#include "gnunet_common.h"
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
+*/
 
 /**
- * Bitmask describing what ip-services are supported by services
- * It is 2 bytes long
+ * @file include/block_dns.h
+ * @author Christian Grothoff
  */
-struct GNUNET_ipservices {
-  unsigned UDP:1 GNUNET_PACKED;
-  unsigned TCP:1 GNUNET_PACKED;
-  unsigned RESERVED:14 GNUNET_PACKED;
-};
+#ifndef BLOCK_DNS_H
+#define BLOCK_DNS_H
+
+#include "gnunet_util_lib.h"
+
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * This is the structure describing an dns-record such as www.gnunet.
+ * This is the structure describing an DNS exit service.
  */
-struct GNUNET_DNS_Record
+struct GNUNET_DNS_Advertisement
 {
   /**
-   * The peer providing this service
+   * Signature of the peer affirming that he is offering the service.
    */
-  struct GNUNET_PeerIdentity peer;
+  struct GNUNET_CRYPTO_EddsaSignature signature;
 
   /**
-   * The descriptor for the service
-   * (a peer may provide more than one service)
+   * Beginning of signed portion of the record, signs everything until
+   * the end of the struct.
    */
-  GNUNET_HashCode service_descriptor;
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * What connection-types (UDP, TCP, ...) are supported by the service
+   * When does this signature expire?
    */
-  struct GNUNET_ipservices connectiontypes;
+  struct GNUNET_TIME_AbsoluteNBO expiration_time;
 
   /**
-   * The length of the name of the service
+   * The peer providing this service
    */
-  unsigned char namelen;
+  struct GNUNET_PeerIdentity peer;
 
-  /**
-   * The name of the service
-   * This is namelen bytes
-   */
-  char name[1];
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif