tolerate additional IPv4 address now available for gnunet.org

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

diff --git a/src/util/resolver.h b/src/util/resolver.h
index 57cb68650786f5cb656d7733c1802624cecd98ad..0991ad39f779799888b70ce48c0e564edc96b876 100644 (file)
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -1,21 +1,21 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2012 GNUnet e.V.
 
-     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
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     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.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -27,23 +27,23 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_RESOLVER GNUNET_EXTRA_LOGGING
+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,41 @@ 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;
+
+  /**
+   * identifies the request and is contained in the response message. The
+   * client has to match response to request by this identifier.
+   */
+  uint32_t client_id GNUNET_PACKED;
+
+  /* followed by 0-terminated string for A/AAAA-lookup or
+     by 'struct in_addr' / 'struct in6_addr' for reverse lookup */
 
 };
 
+
+struct GNUNET_RESOLVER_ResponseMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * identifies the request this message responds to. The client
+   * has to match response to request by this identifier.
+   */
+  uint32_t client_id GNUNET_PACKED;
+
+  /* followed by 0-terminated string for response to a reverse lookup
+   * or by 'struct in_addr' / 'struct in6_addr' for response to
+   * A/AAAA-lookup
+   */
+};
+
+GNUNET_NETWORK_STRUCT_END
+
 #endif