ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Support IPv6 in netconn_resolve.

This commit is contained in:
Juan Lang 2009-07-08 10:41:17 -07:00 committed by Alexandre Julliard
parent d48eade7fb
commit 3d9809b129
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/winhttp/net.c
View File

@ -581,15 +581,25 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa,
#ifdef HAVE_GETADDRINFO #ifdef HAVE_GETADDRINFO
memset( &hints, 0, sizeof(struct addrinfo) ); memset( &hints, 0, sizeof(struct addrinfo) );
/* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on
* their IPv6 addresses even though they have IPv6 addresses in the DNS.
*/
hints.ai_family = AF_INET; hints.ai_family = AF_INET;
ret = getaddrinfo( hostname, NULL, &hints, &res ); ret = getaddrinfo( hostname, NULL, &hints, &res );
heap_free( hostname );
if (ret != 0) if (ret != 0)
{ {
TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret));
return FALSE; hints.ai_family = AF_INET6;
ret = getaddrinfo( hostname, NULL, &hints, &res );
if (ret != 0)
{
TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret));
heap_free( hostname );
return FALSE;
}
} }
heap_free( hostname );
if (*sa_len < res->ai_addrlen) if (*sa_len < res->ai_addrlen)
{ {
WARN("address too small\n"); WARN("address too small\n");
@ -604,9 +614,13 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa,
case AF_INET: case AF_INET:
((struct sockaddr_in *)sa)->sin_port = htons( port ); ((struct sockaddr_in *)sa)->sin_port = htons( port );
break; break;
case AF_INET6:
((struct sockaddr_in6 *)sa)->sin6_port = htons( port );
break;
} }
freeaddrinfo( res ); freeaddrinfo( res );
return TRUE;
#else #else
EnterCriticalSection( &cs_gethostbyname ); EnterCriticalSection( &cs_gethostbyname );
@ -631,8 +645,8 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa,
sin->sin_port = htons( port ); sin->sin_port = htons( port );
LeaveCriticalSection( &cs_gethostbyname ); LeaveCriticalSection( &cs_gethostbyname );
#endif
return TRUE; return TRUE;
#endif
} }
const void *netconn_get_certificate( netconn_t *conn ) const void *netconn_get_certificate( netconn_t *conn )