[svn] Replace conaddr with socket_ip_address.

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index 46acacb18dbca748e321521829df962a0f67ff40..1bb514ca13e5c56a69dcd6c2af8f09632bd9bb29 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -44,15 +44,19 @@ so, delete this exception statement from your version.  */
 struct url;
 struct address_list;
 
-extern int ip_default_family;  /* defined in host.c */
+/* This struct defines an IP address, tagged with family type.  */
 
 typedef struct {
+  /* Address type. */
   enum { 
-    IPv4_ADDRESS, 
+    IPV4_ADDRESS, 
 #ifdef ENABLE_IPV6
-    IPv6_ADDRESS 
+    IPV6_ADDRESS 
 #endif /* ENABLE_IPV6 */
   } type;
+
+  /* Address data union: ipv6 contains IPv6-related data (address and
+     scope), and ipv4 contains the IPv4 address.  */
   union {
 #ifdef ENABLE_IPV6
     struct {
@@ -65,35 +69,46 @@ typedef struct {
     struct {
       struct in_addr addr;
     } ipv4;
-  } addr;
+  } u;
 } ip_address;
 
-#ifndef ENABLE_IPV6
+/* Because C doesn't support anonymous unions, access to ip_address
+   elements is unwieldy.  Hence the accessors.
 
-#ifndef HAVE_SOCKADDR_STORAGE
-#define sockaddr_storage sockaddr_in
-#endif
+   The _ADDR accessors return the address as the struct in_addr or
+   in6_addr.  The _DATA accessor returns a pointer to the address data
+   -- pretty much the same as the above, but cast to void*.  The
+   _SCOPE accessor returns the address's scope_id, and makes sense
+   only when IPv6 and HAVE_SOCKADDR_IN6_SCOPE_ID are both defined.  */
+
+#define ADDRESS_IPV4_IN_ADDR(x) ((x)->u.ipv4.addr)
+/* Don't use &x->u.ipv4.addr.s_addr because it can be #defined to a
+   bitfield, which you can't take an address of.  */
+#define ADDRESS_IPV4_DATA(x) ((void *)&(x)->u.ipv4.addr)
+
+#define ADDRESS_IPV6_IN6_ADDR(x) ((x)->u.ipv6.addr)
+#define ADDRESS_IPV6_DATA(x) ((void *)&(x)->u.ipv6.addr)
+#define ADDRESS_IPV6_SCOPE(x) ((x)->u.ipv6.scope_id)
 
-#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 */
+#define LH_IPV4_ONLY 0x0004
+#define LH_IPV6_ONLY 0x0008
 
 /* Function declarations */
 struct address_list *lookup_host PARAMS ((const char *, int));
 char *herrmsg PARAMS ((int));
 
+void forget_host_lookup PARAMS ((const char *));
+
 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 ((const struct address_list *,
-                                   const struct address_list *));
+int address_list_cached_p PARAMS ((const struct address_list *));
+const ip_address *address_list_address_at PARAMS ((const struct address_list *,
+                                                  int));
+int address_list_find PARAMS ((const struct address_list *, const ip_address *));
 void address_list_set_faulty PARAMS ((struct address_list *, int));
 void address_list_release PARAMS ((struct address_list *));
 
@@ -102,13 +117,6 @@ const char *pretty_print_address PARAMS ((const ip_address *));
 int accept_domain PARAMS ((struct url *));
 int sufmatch PARAMS ((const char **, const char *));
 
-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 */