aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-11-20 00:41:22 +0000
committerUlrich Drepper <drepper@redhat.com>2007-11-20 00:41:22 +0000
commitee72b97189983768c306bcd7a8b5a7bfdfbf8aae (patch)
tree544ddd351f8f8091d296697c4d403b7a84008e0b /posix
parentf4a797657875d920157b0a2fe087a60b6d7c8e0d (diff)
downloadglibc-ee72b97189983768c306bcd7a8b5a7bfdfbf8aae.zip
glibc-ee72b97189983768c306bcd7a8b5a7bfdfbf8aae.tar.gz
glibc-ee72b97189983768c306bcd7a8b5a7bfdfbf8aae.tar.bz2
* sysdeps/posix/getaddrinfo.c (defaults_scopes, scopes): New variables.
(get_scope): For IPv4 scope, use scopes table. (fini): Free scopes table if necessary. (free_scopelist): New function. (scopecmp): New function. (gaiconf_init): Also handle scopev4 entries. * posix/tst-rfc3484.c (do_test): Initialize scopes. * posix/tst-rfc3484-2.c (do_test): Likewise. * posix/gai.conf: Document scopev4 defaults. * posix/Makefile (tests): Add tst-rfc3484-3. * posix/tst-rfc3484-3.c: New file.
Diffstat (limited to 'posix')
-rw-r--r--posix/Makefile1
-rw-r--r--posix/gai.conf14
-rw-r--r--posix/tst-rfc3484-2.c1
-rw-r--r--posix/tst-rfc3484-3.c137
-rw-r--r--posix/tst-rfc3484.c1
5 files changed, 154 insertions, 0 deletions
diff --git a/posix/Makefile b/posix/Makefile
index 0025408b..c904636 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -90,6 +90,7 @@ tests := tstgetopt testfnm runtests runptests \
tst-execv1 tst-execv2 tst-execl1 tst-execl2 \
tst-execve1 tst-execve2 tst-execle1 tst-execle2 \
tst-execvp3 tst-execvp4 tst-rfc3484 tst-rfc3484-2 \
+ tst-rfc3484-3 \
tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset
xtests := bug-ga2
ifeq (yes,$(build-shared))
diff --git a/posix/gai.conf b/posix/gai.conf
index fe5774b..b4abfc1 100644
--- a/posix/gai.conf
+++ b/posix/gai.conf
@@ -52,3 +52,17 @@
# For sites which prefer IPv4 connections change the last line to
#
#precedence ::ffff:0:0/96 100
+
+#
+# scopev4 <mask> <value>
+# Add another rule to the RFC 3484 scope table for IPv4 addresses.
+# By default the scope IDs described in section 3.2 in RFC 3484 are
+# used. Changing these defaults should hardly ever be necessary.
+# The defaults are equivalent to:
+#
+#scopev4 ::ffff:169.254.0.0/112 2
+#scopev4 ::ffff:127.0.0.0/104 2
+#scopev4 ::ffff:10.0.0.0/104 5
+#scopev4 ::ffff:172.16.0.0/108 5
+#scopev4 ::ffff:192.168.0.0/112 5
+#scopev4 ::ffff:0.0.0.0 14
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index 6d60ccd..d29f072 100644
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -66,6 +66,7 @@ do_test (void)
{
labels = default_labels;
precedence = default_precedence;
+ scopes = default_scopes;
struct sockaddr_in so1;
so1.sin_family = AF_INET;
diff --git a/posix/tst-rfc3484-3.c b/posix/tst-rfc3484-3.c
new file mode 100644
index 0000000..4aede81
--- /dev/null
+++ b/posix/tst-rfc3484-3.c
@@ -0,0 +1,137 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <ifaddrs.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
+
+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
+__check_native (uint32_t a1_index, int *a1_native,
+ uint32_t a2_index, int *a2_native)
+{
+}
+int
+__idna_to_ascii_lz (const char *input, char **output, int flags)
+{
+ return 0;
+}
+int
+__idna_to_unicode_lzlz (const char *input, char **output, int flags)
+{
+ *output = NULL;
+ return 0;
+}
+
+#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
+
+struct sockaddr_in addrs[] =
+{
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a86d1d) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a85d03) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a82c3d) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a86002) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a802f3) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a80810) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xa0a85e02) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0xac162311) } },
+ { .sin_family = AF_INET, .sin_addr = { h (0x0a324572) } }
+};
+#define naddrs (sizeof (addrs) / sizeof (addrs[0]))
+static struct addrinfo ais[naddrs];
+static struct sort_result results[naddrs];
+
+static const int expected[naddrs] =
+ {
+ 8, 0, 1, 2, 3, 4, 5, 6, 7
+ };
+
+static const struct scopeentry new_scopes[] =
+ {
+ { { { 169, 254, 0, 0 } }, h (0xffff0000), 2 },
+ { { { 127, 0, 0, 0 } }, h (0xff000000), 2 },
+ { { { 10, 0, 0, 0 } }, h (0xff000000), 5 },
+ { { { 192, 168, 0, 0 } }, h(0xffff0000), 5 },
+ { { { 0, 0, 0, 0 } }, h (0x00000000), 14 }
+ };
+
+
+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= new_scopes;
+
+ struct sockaddr_in so;
+ so.sin_family = AF_INET;
+ so.sin_addr.s_addr = h (0x0aa85f19);
+
+ for (int i = 0; i < naddrs; ++i)
+ {
+ ais[i].ai_family = AF_INET;
+ ais[i].ai_addr = (struct sockaddr *) &addrs[i];
+ results[i].dest_addr = &ais[i];
+ results[i].got_source_addr = true;
+ memcpy(&results[i].source_addr, &so, sizeof (so));
+ results[i].source_addr_len = sizeof (so);
+ results[i].source_addr_flags = 0;
+ results[i].service_order = i;
+ results[i].prefixlen = 8;
+ results[i].index = 0;
+ }
+
+ struct sort_result_combo combo = { .results = results, .nresults = naddrs };
+ qsort_r (results, naddrs, sizeof (results[0]), rfc3484_sort, &combo);
+
+ int result = 0;
+ for (int i = 0; i < naddrs; ++i)
+ {
+ struct in_addr addr = ((struct sockaddr_in *) (results[i].dest_addr->ai_addr))->sin_addr;
+
+ int here = memcmp (&addr, &addrs[expected[i]].sin_addr,
+ sizeof (struct in_addr));
+ printf ("[%d] = %s: %s\n", i, inet_ntoa (addr), here ? "FAIL" : "OK");
+ result |= here;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index c4dd04e..fe06255 100644
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -85,6 +85,7 @@ do_test (void)
{
labels = default_labels;
precedence = default_precedence;
+ scopes= default_scopes;
struct sockaddr_in so;
so.sin_family = AF_INET;