[PATCH bpf-next v8 9/9] selftests/bpf: Drop make_socket in sk_lookup

[Geliang Tang]

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

Use local helper make_client() instead of using make_socket() and
connect(). Then make_socket() and inetaddr_len() can be dropped now.

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

diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c 
b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
index a436ed8b34e0..c18bdcd1099e 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
@@ -108,46 +108,6 @@ 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 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);
-       if (CHECK(err, "make_address", "failed\n"))
-               return -1;
-
-       fd = socket(addr->ss_family, sotype, 0);
-       if (CHECK(fd < 0, "socket", "failed\n")) {
-               log_err("failed to make socket");
-               return -1;
-       }
-
-       err = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo));
-       if (CHECK(err, "setsockopt(SO_SNDTIMEO)", "failed\n")) {
-               log_err("failed to set SNDTIMEO");
-               close(fd);
-               return -1;
-       }
-
-       err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
-       if (CHECK(err, "setsockopt(SO_RCVTIMEO)", "failed\n")) {
-               log_err("failed to set RCVTIMEO");
-               close(fd);
-               return -1;
-       }
-
-       return fd;
-}
-
 static int setsockopts(int fd, void *opts)
 {
        struct cb_opts *co = (struct cb_opts *)opts;
@@ -1228,7 +1188,6 @@ struct test_multi_prog {
 
 static void run_multi_prog_lookup(const struct test_multi_prog *t)
 {
-       struct sockaddr_storage dst = {};
        int map_fd, server_fd, client_fd;
        struct bpf_link *link1, *link2;
        int prog_idx, done, err;
@@ -1261,11 +1220,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_client(SOCK_STREAM, EXT_IP4, EXT_PORT);
        if (client_fd < 0)
                goto out_close_server;
 
-       err = connect(client_fd, (void *)&dst, inetaddr_len(&dst));
+       err = 0;
        if (CHECK(err && !t->expect_errno, "connect",
                  "unexpected error %d\n", errno))
                goto out_close_client;
-- 
2.43.0