qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* sysdeps/posix/getaddrinfo.c (gaih_inet): Minor optimizations in
	list generation.
This commit is contained in:
Ulrich Drepper 2004-08-19 22:56:27 +00:00
parent afd7b70333
commit a24c5ac462
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-08-19 Ulrich Drepper <drepper@redhat.com> 2004-08-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): Minor optimizations in
list generation.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use
getcanonname_r function if AI_CANONNAME flag is not set in getcanonname_r function if AI_CANONNAME flag is not set in
request. request.

31
sysdeps/posix/getaddrinfo.c
View File

@ -848,30 +848,31 @@ gaih_inet (const char *name, const struct gaih_service *service,
for (st2 = st; st2 != NULL; st2 = st2->next) for (st2 = st; st2 != NULL; st2 = st2->next)
{ {
*pai = malloc (sizeof (struct addrinfo) + socklen); struct addrinfo *ai;
if (*pai == NULL) ai = *pai = malloc (sizeof (struct addrinfo) + socklen);
if (ai == NULL)
return -EAI_MEMORY; return -EAI_MEMORY;
(*pai)->ai_flags = req->ai_flags; ai->ai_flags = req->ai_flags;
(*pai)->ai_family = family; ai->ai_family = family;
(*pai)->ai_socktype = st2->socktype; ai->ai_socktype = st2->socktype;
(*pai)->ai_protocol = st2->protocol; ai->ai_protocol = st2->protocol;
(*pai)->ai_addrlen = socklen; ai->ai_addrlen = socklen;
(*pai)->ai_addr = (void *) (*pai + 1); ai->ai_addr = (void *) (ai + 1);
/* We only add the canonical name once. */ /* We only add the canonical name once. */
(*pai)->ai_canonname = (char *) canon; ai->ai_canonname = (char *) canon;
canon = NULL; canon = NULL;
#if SALEN #if SALEN
(*pai)->ai_addr->sa_len = socklen; ai->ai_addr->sa_len = socklen;
#endif /* SALEN */ #endif /* SALEN */
(*pai)->ai_addr->sa_family = family; ai->ai_addr->sa_family = family;
if (family == AF_INET6) if (family == AF_INET6)
{ {
struct sockaddr_in6 *sin6p = struct sockaddr_in6 *sin6p =
(struct sockaddr_in6 *) (*pai)->ai_addr; (struct sockaddr_in6 *) ai->ai_addr;
sin6p->sin6_port = st2->port; sin6p->sin6_port = st2->port;
sin6p->sin6_flowinfo = 0; sin6p->sin6_flowinfo = 0;
@ -882,16 +883,16 @@ gaih_inet (const char *name, const struct gaih_service *service,
else else
{ {
struct sockaddr_in *sinp = struct sockaddr_in *sinp =
(struct sockaddr_in *) (*pai)->ai_addr; (struct sockaddr_in *) ai->ai_addr;
sinp->sin_port = st2->port; sinp->sin_port = st2->port;
memcpy (&sinp->sin_addr, memcpy (&sinp->sin_addr,
at2->addr, sizeof (struct in_addr)); at2->addr, sizeof (struct in_addr));
memset (sinp->sin_zero, '\0', sizeof (sinp->sin_zero)); memset (sinp->sin_zero, '\0', sizeof (sinp->sin_zero));
} }
(*pai)->ai_next = NULL; pai = &(ai->ai_next);
pai = &((*pai)->ai_next);
} }
*pai = NULL;
ignore: ignore:
at2 = at2->next; at2 = at2->next;