romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-02 21:10:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

more transparant support for IPv6 name resolving

Browse source
This commit is contained in:
Daniel Stenberg 2001-09-28 07:05:26 +00:00
parent 888d39e083
commit 48dc74aecc
5 changed files with 51 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/url.c
View file

@ -1158,11 +1158,11 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
unsigned long in;
if(Curl_if2ip(data->set.device, myhost, sizeof(myhost))) {
h = Curl_gethost(data, myhost, &hostdataptr);
h = Curl_getaddrinfo(data, myhost, 0, &hostdataptr);
}
else {
if(strlen(data->set.device)>1) {
h = Curl_gethost(data, data->set.device, &hostdataptr);
h = Curl_getaddrinfo(data, data->set.device, 0, &hostdataptr);
}
if(h) {
/* we know data->set.device is shorter than the myhost array */
@ -2163,16 +2163,11 @@ static CURLcode Connect(struct SessionHandle *data,
/* Resolve target host right on */
if(!conn->hp) {
#ifdef ENABLE_IPV6
/* it might already be set if reusing a connection */
conn->hp = Curl_getaddrinfo(data, conn->name, conn->port);
#else
/* it might already be set if reusing a connection */
conn->hp = Curl_gethost(data, conn->name, &conn->hostent_buf);
#endif
conn->hp = Curl_getaddrinfo(data, conn->name, conn->port,
&conn->hostent_buf);
}
if(!conn->hp)
{
if(!conn->hp) {
failf(data, "Couldn't resolve host '%s'", conn->name);
return CURLE_COULDNT_RESOLVE_HOST;
}
@ -2182,12 +2177,10 @@ static CURLcode Connect(struct SessionHandle *data,
if we're reusing an existing connection. */
/* resolve proxy */
#ifdef ENABLE_IPV6
/* it might already be set if reusing a connection */
conn->hp = Curl_getaddrinfo(data, conn->proxyhost, conn->port);
#else
conn->hp = Curl_gethost(data, conn->proxyhost, &conn->hostent_buf);
#endif
/* it might already be set if reusing a connection */
conn->hp = Curl_getaddrinfo(data, conn->proxyhost, conn->port,
&conn->hostent_buf);
if(!conn->hp) {
failf(data, "Couldn't resolve proxy '%s'", conn->proxyhost);
return CURLE_COULDNT_RESOLVE_PROXY;