[svn] Imported Mauro's IPv6 changes.

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index 3b863aab66e18d0d997170128e240d5b6f19b764..46acacb18dbca748e321521829df962a0f67ff40 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -6,7 +6,7 @@ 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.
+ (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
@@ -44,64 +44,71 @@ so, delete this exception statement from your version.  */
 struct url;
 struct address_list;
 
-/* wget_sockaddr is used instead of sockaddr where an IPV6 address
-   must fit.  */
-
-typedef union {
-       struct sockaddr     sa;   /* Generic but too small */
-       struct sockaddr_in  sin;  /* IPv4 socket address */
-#ifdef ENABLE_IPV6
-       struct sockaddr_in6 sin6; /* IPv6 socket address */
-#endif
-} wget_sockaddr;
+extern int ip_default_family;  /* defined in host.c */
 
 typedef struct {
-  unsigned char bytes[4];
-} ip4_address;
+  enum { 
+    IPv4_ADDRESS, 
+#ifdef ENABLE_IPV6
+    IPv6_ADDRESS 
+#endif /* ENABLE_IPV6 */
+  } type;
+  union {
+#ifdef ENABLE_IPV6
+    struct {
+      struct in6_addr addr;
+#ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
+      unsigned int scope_id;
+#endif /* HAVE_SOCKADDR_IN6_SCOPE_ID */
+    } ipv6;
+#endif /* ENABLE_IPV6 */
+    struct {
+      struct in_addr addr;
+    } ipv4;
+  } addr;
+} ip_address;
 
-/* If compiled with IPv6 support, we internally represent all IP
-   addresses as IPv6 addresses.  IPv4 addresses are dynamically mapped
-   to IPv6, i.e. stored in the format ::ffff:<Ipv4>.  */
+#ifndef ENABLE_IPV6
 
-#ifdef ENABLE_IPV6
-# define MAX_IP_ADDRESS_SIZE 16
-#else
-# define MAX_IP_ADDRESS_SIZE 4
+#ifndef HAVE_SOCKADDR_STORAGE
+#define sockaddr_storage sockaddr_in
 #endif
 
-typedef struct {
-  unsigned char bytes[MAX_IP_ADDRESS_SIZE];
-} ip_address;
+#endif /* ENABLE_IPV6 */
+
+/* Flags for lookup_host */
+#define LH_SILENT    0x0001
+#define LH_PASSIVE   0x0002
+#define LH_IPv4_ONLY 0x0004
+#ifdef ENABLE_IPV6
+#define LH_IPv6_ONLY 0x0008
+#endif /* ENABLE_IPV6 */
 
 /* Function declarations */
 struct address_list *lookup_host PARAMS ((const char *, int));
 char *herrmsg PARAMS ((int));
 
-void address_list_get_bounds PARAMS ((struct address_list *, int *, int *));
-void address_list_copy_one PARAMS ((struct address_list *, int,
+void address_list_get_bounds PARAMS ((const struct address_list *,
+                                     int *, int *));
+void address_list_copy_one PARAMS ((const struct address_list *, int,
                                    ip_address *));
-int address_list_match_all PARAMS ((struct address_list *,
-                                   struct address_list *));
+int address_list_match_all PARAMS ((const struct address_list *,
+                                   const struct address_list *));
 void address_list_set_faulty PARAMS ((struct address_list *, int));
 void address_list_release PARAMS ((struct address_list *));
 
-char *pretty_print_address PARAMS ((ip_address *));
+const char *pretty_print_address PARAMS ((const ip_address *));
 
 int accept_domain PARAMS ((struct url *));
 int sufmatch PARAMS ((const char **, const char *));
 
-void host_cleanup PARAMS ((void));
-
-void wget_sockaddr_set_address PARAMS((wget_sockaddr *, int, 
-                                      unsigned short, ip_address *));
-void wget_sockaddr_set_port PARAMS((wget_sockaddr *, unsigned short));
-void *wget_sockaddr_get_addr PARAMS((wget_sockaddr *));
-unsigned short wget_sockaddr_get_port PARAMS((const wget_sockaddr *));
-socklen_t sockaddr_len PARAMS(());
-void map_ipv4_to_ip PARAMS((ip4_address *, ip_address *));
-int  map_ip_to_ipv4 PARAMS((ip_address *, ip4_address *));
- 
-extern int     ip_default_family;      /* defined in host.c */
+void sockaddr_set_address PARAMS ((struct sockaddr *, unsigned short,
+                                  const ip_address *));
+void sockaddr_get_address PARAMS ((const struct sockaddr *, unsigned short *,
+                                  ip_address *));
+unsigned short sockaddr_get_port PARAMS ((const struct sockaddr *));
+socklen_t sockaddr_len PARAMS ((const struct sockaddr *sa));
 
+void host_cleanup PARAMS ((void));
 
 #endif /* HOST_H */