moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Fix some IPv6-related problems.

Browse Source 
Submitted in <sxsg04w6zl6.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2002-01-23 22:19:35 -08:00
parent cb40034035
commit 853a1c9e35
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2002-01-24 Hrvoje Niksic <hniksic@arsdigita.com>
* host.c (lookup_host): Use sizeof(ip4_address) to calculate the
offset.
(address_list_new): Use map_ipv4_to_ip.
(wget_sockaddr_set_address): Convert ADDR to IPv4 before using it
in IPv4 context.
2002-01-24 Hrvoje Niksic <hniksic@arsdigita.com> 2002-01-24 Hrvoje Niksic <hniksic@arsdigita.com>
* source: Integrated IPv6 support by Thomas Lussnig. * source: Integrated IPv6 support by Thomas Lussnig.

21
src/host.c
View File

@ -205,7 +205,7 @@ address_list_new (char **h_addr_list)
al->refcount = 1; al->refcount = 1;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
memcpy (al->addresses + i, h_addr_list[i], sizeof (ip_address)); map_ipv4_to_ip ((ip4_address *)h_addr_list[i], al->addresses + i);
return al; return al;
} }
@ -267,12 +267,16 @@ wget_sockaddr_set_address (wget_sockaddr *sa,
{ {
if (ip_family == AF_INET) if (ip_family == AF_INET)
{ {
ip4_address addr4;
if (!map_ip_to_ipv4 (addr, &addr4))
/* should the callers have prevented this? */
abort ();
sa->sin.sin_family = ip_family; sa->sin.sin_family = ip_family;
sa->sin.sin_port = htons (port); sa->sin.sin_port = htons (port);
if (addr == NULL) if (addr == NULL)
memset ((unsigned char*)&sa->sin.sin_addr, 0, sizeof(ip_address)); memset (&sa->sin.sin_addr, 0, sizeof(ip4_address));
else else
memcpy ((unsigned char*)&sa->sin.sin_addr, addr, sizeof(ip_address)); memcpy (&sa->sin.sin_addr, &addr4, sizeof(ip4_address));
return; return;
} }
#ifdef INET6 #ifdef INET6
@ -281,9 +285,9 @@ wget_sockaddr_set_address (wget_sockaddr *sa,
sa->sin6.sin6_family = ip_family; sa->sin6.sin6_family = ip_family;
sa->sin6.sin6_port = htons (port); sa->sin6.sin6_port = htons (port);
if (addr == NULL) if (addr == NULL)
memset (&sa->sin6.sin6_addr, 0 , sizeof(ip_address)); memset (&sa->sin6.sin6_addr, 0 , 16);
else else
memcpy (&sa->sin6.sin6_addr, addr, sizeof(ip_address)); memcpy (&sa->sin6.sin6_addr, addr, 16);
return; return;
} }
#endif #endif
@ -521,7 +525,7 @@ lookup_host (const char *host, int silent)
we copy the correct four bytes. */ we copy the correct four bytes. */
int offset = 0; int offset = 0;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
offset = sizeof (unsigned long) - sizeof (ip_address); offset = sizeof (unsigned long) - sizeof (ip4_address);
#endif #endif
map_ipv4_to_ip ((ip4_address *)((char *)&addr_ipv4 + offset), &addr); map_ipv4_to_ip ((ip4_address *)((char *)&addr_ipv4 + offset), &addr);
return address_list_new_one (&addr); return address_list_new_one (&addr);
@ -548,7 +552,10 @@ lookup_host (const char *host, int silent)
int err; int err;
memset (&hints, 0, sizeof (hints)); memset (&hints, 0, sizeof (hints));
hints.ai_family = PF_UNSPEC; if (ip_default_family == AF_INET)
hints.ai_family = AF_INET;
else
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
err = getaddrinfo (host, NULL, &hints, &ai); err = getaddrinfo (host, NULL, &hints, &ai);