-fix

[oweals/gnunet.git] / src / util / resolver.h

diff --git a/src/util/resolver.h b/src/util/resolver.h
index 31637f01dbfeb39ac52a19732fd70e2f9080b4a8..c7eda01250b60a7764ef21d49fcba7dd7d045d78 100644 (file)
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2012 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 2, or (at your
+     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
@@ -20,30 +20,30 @@
 
 /**
  * @author Christian Grothoff
- * @file resolver/resolver.h
+ * @file util/resolver.h
  */
 #ifndef RESOLVER_H
 #define RESOLVER_H
 
 #include "gnunet_common.h"
 
-#define DEBUG_RESOLVER GNUNET_NO
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * Request for the resolver.  Followed by either
- * the "struct sockaddr" or the 0-terminated hostname.
+ * Request for the resolver.  Followed by either the "struct sockaddr"
+ * or the 0-terminated hostname.
  *
  * The response will be one or more messages of type
- * RESOLVER_RESPONSE, each with the message header
- * immediately followed by the requested data
- * (hostname or struct sockaddr, depending on direction).
- * The last RESOLVER_RESPONSE will just be a header
- * without any data (used to indicate the end of the list).
+ * RESOLVER_RESPONSE, each with the message header immediately
+ * followed by the requested data (0-terminated hostname or struct
+ * in[6]_addr, depending on direction).  The last RESOLVER_RESPONSE
+ * will just be a header without any data (used to indicate the end of
+ * the list).
  */
 struct GNUNET_RESOLVER_GetMessage
 {
   /**
-   * Type:  GNUNET_MESSAGE_TYPE_STATISTICS_VALUE
+   * Type:  GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST
    */
   struct GNUNET_MessageHeader header;
 
@@ -54,10 +54,14 @@ struct GNUNET_RESOLVER_GetMessage
   int32_t direction GNUNET_PACKED;
 
   /**
-   * Domain to use (AF_INET, AF_INET6 or AF_UNSPEC).
+   * Address family to use (AF_INET, AF_INET6 or AF_UNSPEC).
    */
-  int32_t domain GNUNET_PACKED;
+  int32_t af GNUNET_PACKED;
+
+  /* followed by 0-terminated string for A/AAAA-lookup or
+     by 'struct in_addr' / 'struct in6_addr' for reverse lookup */
 
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif