selftest: tcp: Make bind() selftest flexible.

Currently, bind_wildcard.c tests only (IPv4, IPv6) pairs, but we will
add more tests for the same protocol pairs.

This patch makes it possible by changing the address pointer to void.

No functional changes are intended.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240326204251.51301-4-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/bind_wildcard.c b/tools/testing/selftests/net/bind_wildcard.c
index a2662348cdb1a20753a043c44c7faae2b4603871..d65c3bb6ba138360a54cc646c80aab2fdc0c37e3 100644 (file)
--- a/tools/testing/selftests/net/bind_wildcard.c
+++ b/tools/testing/selftests/net/bind_wildcard.c
@@ -6,7 +6,9 @@
 
 #include "../kselftest_harness.h"
 
-struct in6_addr in6addr_v4mapped_any = {
+static const __u32 in4addr_any = INADDR_ANY;
+static const __u32 in4addr_loopback = INADDR_LOOPBACK;
+static const struct in6_addr in6addr_v4mapped_any = {
        .s6_addr = {
                0, 0, 0, 0,
                0, 0, 0, 0,
@@ -14,8 +16,7 @@ struct in6_addr in6addr_v4mapped_any = {
                0, 0, 0, 0
        }
 };
-
-struct in6_addr in6addr_v4mapped_loopback = {
+static const struct in6_addr in6addr_v4mapped_loopback = {
        .s6_addr = {
                0, 0, 0, 0,
                0, 0, 0, 0,
@@ -26,82 +27,105 @@ struct in6_addr in6addr_v4mapped_loopback = {
 
 FIXTURE(bind_wildcard)
 {
-       struct sockaddr_in addr4;
-       struct sockaddr_in6 addr6;
+       socklen_t addrlen[2];
+       union {
+               struct sockaddr addr;
+               struct sockaddr_in addr4;
+               struct sockaddr_in6 addr6;
+       } addr[2];
 };
 
 FIXTURE_VARIANT(bind_wildcard)
 {
-       const __u32 addr4_const;
-       const struct in6_addr *addr6_const;
+       sa_family_t family[2];
+       const void *addr[2];
        int expected_errno;
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_any_v6_any)
 {
-       .addr4_const = INADDR_ANY,
-       .addr6_const = &in6addr_any,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_any, &in6addr_any},
        .expected_errno = EADDRINUSE,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_any_v6_local)
 {
-       .addr4_const = INADDR_ANY,
-       .addr6_const = &in6addr_loopback,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_any, &in6addr_loopback},
        .expected_errno = 0,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_any_v6_v4mapped_any)
 {
-       .addr4_const = INADDR_ANY,
-       .addr6_const = &in6addr_v4mapped_any,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_any, &in6addr_v4mapped_any},
        .expected_errno = EADDRINUSE,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_any_v6_v4mapped_local)
 {
-       .addr4_const = INADDR_ANY,
-       .addr6_const = &in6addr_v4mapped_loopback,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_any, &in6addr_v4mapped_loopback},
        .expected_errno = EADDRINUSE,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_local_v6_any)
 {
-       .addr4_const = INADDR_LOOPBACK,
-       .addr6_const = &in6addr_any,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_loopback, &in6addr_any},
        .expected_errno = EADDRINUSE,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_local_v6_local)
 {
-       .addr4_const = INADDR_LOOPBACK,
-       .addr6_const = &in6addr_loopback,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_loopback, &in6addr_loopback},
        .expected_errno = 0,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_local_v6_v4mapped_any)
 {
-       .addr4_const = INADDR_LOOPBACK,
-       .addr6_const = &in6addr_v4mapped_any,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_loopback, &in6addr_v4mapped_any},
        .expected_errno = EADDRINUSE,
 };
 
 FIXTURE_VARIANT_ADD(bind_wildcard, v4_local_v6_v4mapped_local)
 {
-       .addr4_const = INADDR_LOOPBACK,
-       .addr6_const = &in6addr_v4mapped_loopback,
+       .family = {AF_INET, AF_INET6},
+       .addr = {&in4addr_loopback, &in6addr_v4mapped_loopback},
        .expected_errno = EADDRINUSE,
 };
 
-FIXTURE_SETUP(bind_wildcard)
+static void setup_addr(FIXTURE_DATA(bind_wildcard) *self, int i,
+                      int family, const void *addr_const)
 {
-       self->addr4.sin_family = AF_INET;
-       self->addr4.sin_port = htons(0);
-       self->addr4.sin_addr.s_addr = htonl(variant->addr4_const);
+       if (family == AF_INET) {
+               struct sockaddr_in *addr4 = &self->addr[i].addr4;
+               const __u32 *addr4_const = addr_const;
+
+               addr4->sin_family = AF_INET;
+               addr4->sin_port = htons(0);
+               addr4->sin_addr.s_addr = htonl(*addr4_const);
+
+               self->addrlen[i] = sizeof(struct sockaddr_in);
+       } else {
+               struct sockaddr_in6 *addr6 = &self->addr[i].addr6;
+               const struct in6_addr *addr6_const = addr_const;
+
+               addr6->sin6_family = AF_INET6;
+               addr6->sin6_port = htons(0);
+               addr6->sin6_addr = *addr6_const;
 
-       self->addr6.sin6_family = AF_INET6;
-       self->addr6.sin6_port = htons(0);
-       self->addr6.sin6_addr = *variant->addr6_const;
+               self->addrlen[i] = sizeof(struct sockaddr_in6);
+       }
+}
+
+FIXTURE_SETUP(bind_wildcard)
+{
+       setup_addr(self, 0, variant->family[0], variant->addr[0]);
+       setup_addr(self, 1, variant->family[1], variant->addr[1]);
 }
 
 FIXTURE_TEARDOWN(bind_wildcard)
@@ -146,15 +170,15 @@ void bind_sockets(struct __test_metadata *_metadata,
 TEST_F(bind_wildcard, v4_v6)
 {
        bind_sockets(_metadata, self, variant->expected_errno,
-                    (struct sockaddr *)&self->addr4, sizeof(self->addr4),
-                    (struct sockaddr *)&self->addr6, sizeof(self->addr6));
+                    &self->addr[0].addr, self->addrlen[0],
+                    &self->addr[1].addr, self->addrlen[1]);
 }
 
 TEST_F(bind_wildcard, v6_v4)
 {
        bind_sockets(_metadata, self, variant->expected_errno,
-                    (struct sockaddr *)&self->addr6, sizeof(self->addr6),
-                    (struct sockaddr *)&self->addr4, sizeof(self->addr4));
+                    &self->addr[1].addr, self->addrlen[1],
+                    &self->addr[0].addr, self->addrlen[0]);
 }
 
 TEST_HARNESS_MAIN