You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
3.2 KiB
69 lines
3.2 KiB
From 4fbaa65aff7eda3b3965e9c482b08532f3491800 Mon Sep 17 00:00:00 2001 |
|
From: Marcin Bachry <hegel666@gmail.com> |
|
Date: Wed, 11 Nov 2015 15:45:26 +0100 |
|
Subject: [PATCH] test: fix failing test-socket-util when running with |
|
ipv6.disable=1 kernel param |
|
|
|
The ability to use inet_pton(AF_INET6, ...) doesn't depend on kernel |
|
ipv6 support (inet_pton is a pure libc function), so make ipv6 address |
|
parsing tests unconditional. |
|
|
|
(cherry picked from commit 4ebc62ec87162aaa11e077f8693316ecf2d5c58d) |
|
|
|
Resolves: #1497639 |
|
--- |
|
src/test/test-socket-util.c | 41 +++++++++++++++++-------------------- |
|
1 file changed, 19 insertions(+), 22 deletions(-) |
|
|
|
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c |
|
index 6fb4a40944..85f2229937 100644 |
|
--- a/src/test/test-socket-util.c |
|
+++ b/src/test/test-socket-util.c |
|
@@ -38,28 +38,25 @@ static void test_socket_address_parse(void) { |
|
|
|
assert_se(socket_address_parse(&a, "65535") >= 0); |
|
|
|
- if (socket_ipv6_is_supported()) { |
|
- assert_se(socket_address_parse(&a, "[::1]") < 0); |
|
- assert_se(socket_address_parse(&a, "[::1]8888") < 0); |
|
- assert_se(socket_address_parse(&a, "::1") < 0); |
|
- assert_se(socket_address_parse(&a, "[::1]:0") < 0); |
|
- assert_se(socket_address_parse(&a, "[::1]:65536") < 0); |
|
- assert_se(socket_address_parse(&a, "[a:b:1]:8888") < 0); |
|
- |
|
- assert_se(socket_address_parse(&a, "8888") >= 0); |
|
- assert_se(a.sockaddr.sa.sa_family == AF_INET6); |
|
- |
|
- assert_se(socket_address_parse(&a, "[2001:0db8:0000:85a3:0000:0000:ac1f:8001]:8888") >= 0); |
|
- assert_se(a.sockaddr.sa.sa_family == AF_INET6); |
|
- |
|
- assert_se(socket_address_parse(&a, "[::1]:8888") >= 0); |
|
- assert_se(a.sockaddr.sa.sa_family == AF_INET6); |
|
- } else { |
|
- assert_se(socket_address_parse(&a, "[::1]:8888") < 0); |
|
- |
|
- assert_se(socket_address_parse(&a, "8888") >= 0); |
|
- assert_se(a.sockaddr.sa.sa_family == AF_INET); |
|
- } |
|
+ /* The checks below will pass even if ipv6 is disabled in |
|
+ * kernel. The underlying glibc's inet_pton() is just a string |
|
+ * parser and doesn't make any syscalls. */ |
|
+ |
|
+ assert_se(socket_address_parse(&a, "[::1]") < 0); |
|
+ assert_se(socket_address_parse(&a, "[::1]8888") < 0); |
|
+ assert_se(socket_address_parse(&a, "::1") < 0); |
|
+ assert_se(socket_address_parse(&a, "[::1]:0") < 0); |
|
+ assert_se(socket_address_parse(&a, "[::1]:65536") < 0); |
|
+ assert_se(socket_address_parse(&a, "[a:b:1]:8888") < 0); |
|
+ |
|
+ assert_se(socket_address_parse(&a, "8888") >= 0); |
|
+ assert_se(a.sockaddr.sa.sa_family == (socket_ipv6_is_supported() ? AF_INET6 : AF_INET)); |
|
+ |
|
+ assert_se(socket_address_parse(&a, "[2001:0db8:0000:85a3:0000:0000:ac1f:8001]:8888") >= 0); |
|
+ assert_se(a.sockaddr.sa.sa_family == AF_INET6); |
|
+ |
|
+ assert_se(socket_address_parse(&a, "[::1]:8888") >= 0); |
|
+ assert_se(a.sockaddr.sa.sa_family == AF_INET6); |
|
|
|
assert_se(socket_address_parse(&a, "192.168.1.254:8888") >= 0); |
|
assert_se(a.sockaddr.sa.sa_family == AF_INET);
|
|
|