[svn] Replace conaddr with socket_ip_address.

[wget] / src / host.h

diff --git a/src/host.h b/src/host.h
index c5e1fd7ec43d9b5912989fede5678dee6dd77794..1bb514ca13e5c56a69dcd6c2af8f09632bd9bb29 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -56,7 +56,7 @@ typedef struct {
   } type;
 
   /* Address data union: ipv6 contains IPv6-related data (address and
-     scope), and ipv4 contains IPv4 address.  */
+     scope), and ipv4 contains the IPv4 address.  */
   union {
 #ifdef ENABLE_IPV6
     struct {
@@ -73,14 +73,23 @@ typedef struct {
 } ip_address;
 
 /* Because C doesn't support anonymous unions, access to ip_address
-   elements is clunky.  Hence the accessors.  */
+   elements is unwieldy.  Hence the accessors.
+
+   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.s6_addr)
+#define ADDRESS_IPV6_DATA(x) ((void *)&(x)->u.ipv6.addr)
 #define ADDRESS_IPV6_SCOPE(x) ((x)->u.ipv6.scope_id)
 
-#define ADDRESS_IPV4_IN_ADDR(x) ((x)->u.ipv4.addr)
-#define ADDRESS_IPV4_DATA(x) ((void *)&(x)->u.ipv4.addr.s_addr)
 
 /* Flags for lookup_host */
 #define LH_SILENT    0x0001
@@ -99,8 +108,7 @@ void address_list_get_bounds PARAMS ((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_match_all PARAMS ((const struct address_list *,
-                                   const struct address_list *));
+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 *));