AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/posix/getaddrinfo.c (struct sort_result): Add

Browse Source 
service_order.
	(rfc3484_sort): Make sure that even of qsort doesn't support
	stable sorting it is stable by comparing service_order.
	(getaddrinfo): Initialize service_order.
This commit is contained in:
Ulrich Drepper 2007-10-14 17:58:03 +00:00
parent fa76dde2cf
commit 6f55ed8885
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2007-10-14 Ulrich Drepper <drepper@redhat.com> 2007-10-14 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (struct sort_result): Add
service_order.
(rfc3484_sort): Make sure that even of qsort doesn't support
stable sorting it is stable by comparing service_order.
(getaddrinfo): Initialize service_order.
* include/time.h: Declare __tzset_parse_tz and __tzset_compute. * include/time.h: Declare __tzset_parse_tz and __tzset_compute.
* time/tzset.c (tzset_internal): Break TZ string parsing out into * time/tzset.c (tzset_internal): Break TZ string parsing out into
__tzset_parse_tz and updating of daylight, timezone, tzname into __tzset_parse_tz and updating of daylight, timezone, tzname into

9
sysdeps/posix/getaddrinfo.c
View File

@ -1002,6 +1002,7 @@ struct sort_result
{ {
struct addrinfo *dest_addr; struct addrinfo *dest_addr;
struct sockaddr_storage source_addr; struct sockaddr_storage source_addr;
size_t service_order;
uint8_t source_addr_len; uint8_t source_addr_len;
bool got_source_addr; bool got_source_addr;
uint8_t source_addr_flags; uint8_t source_addr_flags;
@ -1403,8 +1404,11 @@ rfc3484_sort (const void *p1, const void *p2)
} }
/* Rule 10: Otherwise, leave the order unchanged. */ /* Rule 10: Otherwise, leave the order unchanged. To ensure this
return 0; compare with the value indicating the order in which the entries
have been received from the services. NB: no two entries can have
the same order so the test will never return zero. */
return a1->service_order < a2->service_order ? -1 : 1;
} }
@ -1951,6 +1955,7 @@ getaddrinfo (const char *name, const char *service,
{ {
results[i].dest_addr = q; results[i].dest_addr = q;
results[i].got_source_addr = false; results[i].got_source_addr = false;
results[i].service_order = i;
/* If we just looked up the address for a different /* If we just looked up the address for a different
protocol, reuse the result. */ protocol, reuse the result. */