d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure the head entry of addrinfo chain has non-NULL ai_canonname to be

Browse Source 
compliant with RFC3493.

PR: standards/114910
Approved by:   ume (mentor)
Approved by:   re
MFC after:     1 week
This commit is contained in:
JINMEI Tatuya 2007-09-05 18:08:14 +00:00
parent c0a6ac3ff0
commit e47c82ed72
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libc/net/getaddrinfo.c
View File

@ -575,11 +575,28 @@ good:
* If the returned entry is for an active connection,
* and the given name is not numeric, reorder the
* list, so that the application would try the list
* in the most efficient order.
* in the most efficient order. Since the head entry
* of the original list may contain ai_canonname and
* that entry may be moved elsewhere in the new list,
* we keep the pointer and will restore it in the new
* head entry. (Note that RFC3493 requires the head
* entry store it when requested by the caller).
*/
if (hints == NULL || !(hints->ai_flags & AI_PASSIVE)) {
if (!numeric)
if (!numeric) {
char *canonname;
canonname =
sentinel.ai_next->ai_canonname;
sentinel.ai_next->ai_canonname = NULL;
(void)reorder(&sentinel);
if (sentinel.ai_next->ai_canonname ==
NULL) {
sentinel.ai_next->ai_canonname
= canonname;
} else if (canonname != NULL)
free(canonname);
}
}
*res = sentinel.ai_next;
return SUCCESS;