bef8fd6013
qsort_r is defined in the same file as qsort, but is not an ISO C function, so should be a weak alias for __qsort_r. The uses in getaddrinfo should also call __qsort_r, since getaddrinfo is a POSIX function and qsort_r isn't. This patch implements this. Because nscd uses the getaddrinfo sources outside libc, as do the tst-rfc3484 tests, a #define of __qsort_r to qsort_r is added there alongside the similar defines for other libc-internal symbols used in getaddrinfo. Tested for x86_64 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). [BZ #17571] * stdlib/msort.c (qsort_r): Rename to __qsort_r and define as weak alias of __qsort_r. (qsort): Call __qsort_r instead of qsort_r. * include/stdlib.h (qsort_r): Do not call libc_hidden_proto. (__qsort_r): Declare. Call libc_hidden_proto. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Call __qsort_r instead of qsort_r. * nscd/gai.c (__qsort_r): Define to qsort_r. * posix/tst-rfc3484.c (__qsort_r): Likewise. * posix/tst-rfc3484-2.c (__qsort_r): Likewise. * posix/tst-rfc3484-3.c (__qsort_r): Likewise.
190 lines
4.1 KiB
C
190 lines
4.1 KiB
C
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <ifaddrs.h>
|
|
#include <stdint.h>
|
|
|
|
/* Internal definitions used in the libc code. */
|
|
#define __getservbyname_r getservbyname_r
|
|
#define __socket socket
|
|
#define __getsockname getsockname
|
|
#define __inet_aton inet_aton
|
|
#define __gethostbyaddr_r gethostbyaddr_r
|
|
#define __gethostbyname2_r gethostbyname2_r
|
|
#define __qsort_r qsort_r
|
|
|
|
void
|
|
attribute_hidden
|
|
__check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
|
|
{
|
|
*p1 = *p2 = true;
|
|
*in6ai = NULL;
|
|
*in6ailen = 0;
|
|
}
|
|
|
|
void
|
|
attribute_hidden
|
|
__free_in6ai (struct in6addrinfo *ai)
|
|
{
|
|
}
|
|
|
|
void
|
|
attribute_hidden
|
|
__check_native (uint32_t a1_index, int *a1_native,
|
|
uint32_t a2_index, int *a2_native)
|
|
{
|
|
}
|
|
|
|
int
|
|
attribute_hidden
|
|
__idna_to_ascii_lz (const char *input, char **output, int flags)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
attribute_hidden
|
|
__idna_to_unicode_lzlz (const char *input, char **output, int flags)
|
|
{
|
|
*output = NULL;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
attribute_hidden
|
|
_res_hconf_init (void)
|
|
{
|
|
}
|
|
|
|
#undef USE_NSCD
|
|
#include "../sysdeps/posix/getaddrinfo.c"
|
|
|
|
service_user *__nss_hosts_database attribute_hidden;
|
|
|
|
|
|
/* This is the beginning of the real test code. The above defines
|
|
(among other things) the function rfc3484_sort. */
|
|
|
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define h(n) n
|
|
#else
|
|
# define h(n) __bswap_constant_32 (n)
|
|
#endif
|
|
|
|
|
|
ssize_t
|
|
__getline (char **lineptr, size_t *n, FILE *s)
|
|
{
|
|
*lineptr = NULL;
|
|
*n = 0;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
labels = default_labels;
|
|
precedence = default_precedence;
|
|
scopes = default_scopes;
|
|
|
|
struct sockaddr_in so1;
|
|
so1.sin_family = AF_INET;
|
|
so1.sin_addr.s_addr = h (0xc0a85f19);
|
|
/* Clear the rest of the structure to avoid warnings. */
|
|
memset (so1.sin_zero, '\0', sizeof (so1.sin_zero));
|
|
|
|
struct sockaddr_in sa1;
|
|
sa1.sin_family = AF_INET;
|
|
sa1.sin_addr.s_addr = h (0xe0a85f19);
|
|
|
|
struct addrinfo ai1;
|
|
ai1.ai_family = AF_INET;
|
|
ai1.ai_addr = (struct sockaddr *) &sa1;
|
|
|
|
struct sockaddr_in6 so2;
|
|
so2.sin6_family = AF_INET6;
|
|
so2.sin6_addr.s6_addr32[0] = h (0xfec01234);
|
|
so2.sin6_addr.s6_addr32[1] = 1;
|
|
so2.sin6_addr.s6_addr32[2] = 1;
|
|
so2.sin6_addr.s6_addr32[3] = 1;
|
|
|
|
struct sockaddr_in6 sa2;
|
|
sa2.sin6_family = AF_INET6;
|
|
sa2.sin6_addr.s6_addr32[0] = h (0x07d10001);
|
|
sa2.sin6_addr.s6_addr32[1] = 1;
|
|
sa2.sin6_addr.s6_addr32[2] = 1;
|
|
sa2.sin6_addr.s6_addr32[3] = 1;
|
|
|
|
struct addrinfo ai2;
|
|
ai2.ai_family = AF_INET6;
|
|
ai2.ai_addr = (struct sockaddr *) &sa2;
|
|
|
|
|
|
struct sort_result results[2];
|
|
size_t order[2];
|
|
|
|
results[0].dest_addr = &ai1;
|
|
results[0].got_source_addr = true;
|
|
results[0].source_addr_len = sizeof (so1);
|
|
results[0].source_addr_flags = 0;
|
|
results[0].prefixlen = 16;
|
|
results[0].index = 0;
|
|
memcpy (&results[0].source_addr, &so1, sizeof (so1));
|
|
order[0] = 0;
|
|
|
|
results[1].dest_addr = &ai2;
|
|
results[1].got_source_addr = true;
|
|
results[1].source_addr_len = sizeof (so2);
|
|
results[1].source_addr_flags = 0;
|
|
results[1].prefixlen = 16;
|
|
results[1].index = 0;
|
|
memcpy (&results[1].source_addr, &so2, sizeof (so2));
|
|
order[1] = 1;
|
|
|
|
|
|
struct sort_result_combo combo = { .results = results, .nresults = 2 };
|
|
qsort_r (order, 2, sizeof (order[0]), rfc3484_sort, &combo);
|
|
|
|
int result = 0;
|
|
if (results[order[0]].dest_addr->ai_family == AF_INET6)
|
|
{
|
|
puts ("wrong order in first test");
|
|
result |= 1;
|
|
}
|
|
|
|
|
|
/* And again, this time with the reverse starting order. */
|
|
results[1].dest_addr = &ai1;
|
|
results[1].got_source_addr = true;
|
|
results[1].source_addr_len = sizeof (so1);
|
|
results[1].source_addr_flags = 0;
|
|
results[1].prefixlen = 16;
|
|
results[1].index = 0;
|
|
memcpy (&results[1].source_addr, &so1, sizeof (so1));
|
|
order[1] = 1;
|
|
|
|
results[0].dest_addr = &ai2;
|
|
results[0].got_source_addr = true;
|
|
results[0].source_addr_len = sizeof (so2);
|
|
results[0].source_addr_flags = 0;
|
|
results[0].prefixlen = 16;
|
|
results[0].index = 0;
|
|
memcpy (&results[0].source_addr, &so2, sizeof (so2));
|
|
order[0] = 0;
|
|
|
|
|
|
qsort_r (order, 2, sizeof (order[0]), rfc3484_sort, &combo);
|
|
|
|
if (results[order[0]].dest_addr->ai_family == AF_INET6)
|
|
{
|
|
puts ("wrong order in second test");
|
|
result |= 1;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|