[PATCH bpf-next v3 7/8] selftests/bpf: Drop inetaddr_len in sk_lookup

[Geliang Tang]

From: Geliang Tang <tanggeli...@kylinos.cn>

This patch adds a new parameter "len" for make_socket() to get the length
of the address by make_sockaddr(), then local helper inetaddr_len() can be
dropped.

Signed-off-by: Geliang Tang <tanggeli...@kylinos.cn>
---
 .../testing/selftests/bpf/prog_tests/sk_lookup.c  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c 
b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
index ba386484f785..d3821bf350a1 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
@@ -108,20 +108,14 @@ static int attach_reuseport(int sock_fd, struct 
bpf_program *reuseport_prog)
        return 0;
 }
 
-static socklen_t inetaddr_len(const struct sockaddr_storage *addr)
-{
-       return (addr->ss_family == AF_INET ? sizeof(struct sockaddr_in) :
-               addr->ss_family == AF_INET6 ? sizeof(struct sockaddr_in6) : 0);
-}
-
 static int make_socket(int sotype, const char *ip, int port,
-                      struct sockaddr_storage *addr)
+                      struct sockaddr_storage *addr, socklen_t *len)
 {
        struct timeval timeo = { .tv_sec = IO_TIMEOUT_SEC };
        int err, family, fd;
 
        family = is_ipv6(ip) ? AF_INET6 : AF_INET;
-       err = make_sockaddr(family, ip, port, addr, NULL);
+       err = make_sockaddr(family, ip, port, addr, len);
        if (CHECK(err, "make_address", "failed\n"))
                return -1;
 
@@ -1220,6 +1214,7 @@ static void run_multi_prog_lookup(const struct 
test_multi_prog *t)
        int map_fd, server_fd, client_fd;
        struct bpf_link *link1, *link2;
        int prog_idx, done, err;
+       socklen_t len;
 
        map_fd = bpf_map__fd(t->run_map);
 
@@ -1249,11 +1244,11 @@ static void run_multi_prog_lookup(const struct 
test_multi_prog *t)
        if (err)
                goto out_close_server;
 
-       client_fd = make_socket(SOCK_STREAM, EXT_IP4, EXT_PORT, &dst);
+       client_fd = make_socket(SOCK_STREAM, EXT_IP4, EXT_PORT, &dst, &len);
        if (client_fd < 0)
                goto out_close_server;
 
-       err = connect(client_fd, (void *)&dst, inetaddr_len(&dst));
+       err = connect(client_fd, (void *)&dst, len);
        if (CHECK(err && !t->expect_errno, "connect",
                  "unexpected error %d\n", errno))
                goto out_close_client;
-- 
2.43.0