generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Glen Nakamura's patch for Curl_getaddrinfo().

Browse Source
This commit is contained in:
Daniel Stenberg
2002-06-26 08:03:46 +00:00
parent e203ecebee
commit a33e89b44a
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/hostip.c
View File

@@ -526,23 +526,27 @@ Curl_addrinfo *Curl_getaddrinfo(struct SessionHandle *data,
if ( (in=inet_addr(hostname)) != INADDR_NONE ) { if ( (in=inet_addr(hostname)) != INADDR_NONE ) {
struct in_addr *addrentry; struct in_addr *addrentry;
long *buf = (long *)malloc(sizeof(struct hostent)+128); struct namebuf {
struct hostent hostentry;
char *h_addr_list[2];
struct in_addr addrentry;
char h_name[1];
} *buf = (struct namebuf *)malloc(sizeof(struct namebuf)+128);
if(!buf) if(!buf)
return NULL; /* major failure */ return NULL; /* major failure */
*bufp = (char *)buf; *bufp = (char *)buf;
h = (struct hostent*)buf; h = &buf->hostentry;
h->h_addr_list = (char**)(buf + sizeof(*h)); h->h_addr_list = &buf->h_addr_list[0];
addrentry = (struct in_addr*)(h->h_addr_list + 2); addrentry = &buf->addrentry;
addrentry->s_addr = in; addrentry->s_addr = in;
h->h_addr_list[0] = (char*)addrentry; h->h_addr_list[0] = (char*)addrentry;
h->h_addr_list[1] = NULL; h->h_addr_list[1] = NULL;
h->h_addrtype = AF_INET; h->h_addrtype = AF_INET;
h->h_length = sizeof(*addrentry); h->h_length = sizeof(*addrentry);
h->h_name = *(h->h_addr_list) + h->h_length; h->h_name = &buf->h_name[0];
/* bad one h->h_name = (char*)(h->h_addr_list + h->h_length); */ MakeIP(ntohl(in), h->h_name,
MakeIP(ntohl(in),h->h_name, sizeof(struct hostent)+128 - sizeof(struct namebuf)+128 - (long)(h->h_name) + (long)buf);
(long)(h->h_name) + (long)buf);
} }
#if defined(HAVE_GETHOSTBYNAME_R) #if defined(HAVE_GETHOSTBYNAME_R)
else { else {