[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index f99c636c2ae788a3bf374eddcf7c068cfcd7060a..03b88c8186f3969f1a12c4b34ca91d4c0b0ff3c1 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -1,12 +1,12 @@
 /* Declarations for host.c
-   Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,34 +14,86 @@ 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 Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef HOST_H
 #define HOST_H
 
+#ifdef WINDOWS
+# include <winsock.h>
+#else
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+#ifndef __BEOS__
+# include <arpa/inet.h>
+#endif
+#endif
+
 struct url;
 struct address_list;
 
-/* Function declarations */
-struct address_list *lookup_host PARAMS ((const char *, int));
-char *herrmsg PARAMS ((int));
+/* This struct defines an IP address, tagged with family type.  */
+
+typedef struct {
+  /* Address family, one of AF_INET or AF_INET6. */
+  int family;
+
+  /* The actual data, in the form of struct in_addr or in6_addr: */
+  union {
+    struct in_addr d4;         /* IPv4 address */
+#ifdef ENABLE_IPV6
+    struct in6_addr d6;                /* IPv6 address */
+#endif
+  } data;
+
+  /* Under IPv6 getaddrinfo also returns scope_id.  Since it's
+     IPv6-specific it strictly belongs in the above union, but we put
+     it here for simplicity.  */
+#if defined ENABLE_IPV6 && defined HAVE_SOCKADDR_IN6_SCOPE_ID
+  int ipv6_scope;
+#endif
+} ip_address;
+
+/* IP_INADDR_DATA macro returns a void pointer that can be interpreted
+   as a pointer to struct in_addr in IPv4 context or a pointer to
+   struct in6_addr in IPv4 context.  This pointer can be passed to
+   functions that work on either, such as inet_ntop.  */
+#define IP_INADDR_DATA(x) ((void *) &(x)->data)
+
+enum {
+  LH_SILENT  = 1,
+  LH_BIND    = 2,
+  LH_REFRESH = 4
+};
+struct address_list *lookup_host (const char *, int);
 
-void address_list_get_bounds PARAMS ((struct address_list *, int *, int *));
-void address_list_copy_one PARAMS ((struct address_list *, int,
-                                   unsigned char *));
-int address_list_match_all PARAMS ((struct address_list *,
-                                   struct address_list *));
-void address_list_set_faulty PARAMS ((struct address_list *, int));
-void address_list_release PARAMS ((struct address_list *));
+void address_list_get_bounds (const struct address_list *, int *, int *);
+const ip_address *address_list_address_at (const struct address_list *, int);
+bool address_list_contains (const struct address_list *, const ip_address *);
+void address_list_set_faulty (struct address_list *, int);
+void address_list_set_connected (struct address_list *);
+bool address_list_connected_p (const struct address_list *);
+void address_list_release (struct address_list *);
 
-/* This was originally going to be a macro, but then every caller
-   would have to #include the netinet stuff.  */
-char *pretty_print_address PARAMS ((const void *));
+const char *print_address (const ip_address *);
+#ifdef ENABLE_IPV6
+bool is_valid_ipv6_address (const char *, const char *);
+#endif
 
-int accept_domain PARAMS ((struct url *));
-int sufmatch PARAMS ((const char **, const char *));
+bool accept_domain (struct url *);
+bool sufmatch (const char **, const char *);
 
-void host_cleanup PARAMS ((void));
+void host_cleanup (void);
 
 #endif /* HOST_H */